summaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-19 11:17:12 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-19 11:17:12 +0000
commit52fc43f7c1c416b114e88ff39635c36e67ef15b6 (patch)
tree206b527da51b6628b51a6094d4107fe0db613a31 /sound/soc/pxa
parentc56eb8fb6dccb83d9fe62fd4dc00c834de9bc470 (diff)
parentc88c2823e87dd6f8214b8b8cdc36d45f205a8077 (diff)
downloadop-kernel-dev-52fc43f7c1c416b114e88ff39635c36e67ef15b6.zip
op-kernel-dev-52fc43f7c1c416b114e88ff39635c36e67ef15b6.tar.gz
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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c
index 2d4f896..3ceaef6 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,
};
OpenPOWER on IntegriCloud