diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-19 12:17:12 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-19 12:17:12 +0100 |
| commit | 52fc43f7c1c416b114e88ff39635c36e67ef15b6 (patch) | |
| tree | 206b527da51b6628b51a6094d4107fe0db613a31 /sound/soc/pxa | |
| parent | Linux 2.6.38-rc1 (diff) | |
| parent | ASoC: PXA: Fix codec address on Zipit Z2 (diff) | |
| download | linux-52fc43f7c1c416b114e88ff39635c36e67ef15b6.tar.xz linux-52fc43f7c1c416b114e88ff39635c36e67ef15b6.zip | |
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into for-2.6.38
Diffstat (limited to 'sound/soc/pxa')
| -rw-r--r-- | sound/soc/pxa/z2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c index 2d4f896d7fec..3ceaef68e01d 100644 --- a/sound/soc/pxa/z2.c +++ b/sound/soc/pxa/z2.c @@ -104,6 +104,7 @@ static struct snd_soc_jack_gpio hs_jack_gpios[] = { .name = "hsdet-gpio", .report = SND_JACK_HEADSET, .debounce_time = 200, + .invert = 1, }, }; @@ -192,7 +193,7 @@ static struct snd_soc_dai_link z2_dai = { .cpu_dai_name = "pxa2xx-i2s", .codec_dai_name = "wm8750-hifi", .platform_name = "pxa-pcm-audio", - .codec_name = "wm8750-codec.0-001a", + .codec_name = "wm8750-codec.0-001b", .init = z2_wm8750_init, .ops = &z2_ops, }; |