summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorVasily Khoruzhick <anarsoul@gmail.com>2011-03-11 11:05:37 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-03-11 12:03:03 +0000
commit5f3822c48a96e50ee4183b38e72581428eff8308 (patch)
treeecacb4daeb327b70f17cfba13d73840c1161db8f /sound/soc
parent0e45cab64449660fe83bb71208ab43b8d22a5648 (diff)
downloadlinux-5f3822c48a96e50ee4183b38e72581428eff8308.tar.bz2
ASoC: PXA: z2: Mute internal speaker when headphones are connected
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/pxa/z2.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c
index 3ceaef68e01d..b0b6c8d7c2f3 100644
--- a/sound/soc/pxa/z2.c
+++ b/sound/soc/pxa/z2.c
@@ -95,6 +95,11 @@ static struct snd_soc_jack_pin hs_jack_pins[] = {
.pin = "Headphone Jack",
.mask = SND_JACK_HEADPHONE,
},
+ {
+ .pin = "Ext Spk",
+ .mask = SND_JACK_HEADPHONE,
+ .invert = 1
+ },
};
/* Headset jack detection gpios */