[alsa-devel] [PATCH 1/2] ASoC: PXA: z2: Mute internal speaker when headphones are connected
Signed-off-by: Vasily Khoruzhick anarsoul@gmail.com --- sound/soc/pxa/z2.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c index 3ceaef6..b0b6c8d 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 */
MONO was renamed to MONO1.
Signed-off-by: Vasily Khoruzhick anarsoul@gmail.com --- sound/soc/pxa/z2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c index b0b6c8d..d69d9fc 100644 --- a/sound/soc/pxa/z2.c +++ b/sound/soc/pxa/z2.c @@ -152,7 +152,7 @@ static int z2_wm8750_init(struct snd_soc_pcm_runtime *rtd) snd_soc_dapm_disable_pin(dapm, "LINPUT3"); snd_soc_dapm_disable_pin(dapm, "RINPUT3"); snd_soc_dapm_disable_pin(dapm, "OUT3"); - snd_soc_dapm_disable_pin(dapm, "MONO"); + snd_soc_dapm_disable_pin(dapm, "MONO1");
/* Add z2 specific widgets */ snd_soc_dapm_new_controls(dapm, wm8750_dapm_widgets,
On Fri, 2011-03-11 at 11:05 +0200, Vasily Khoruzhick wrote:
Signed-off-by: Vasily Khoruzhick anarsoul@gmail.com
sound/soc/pxa/z2.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c index 3ceaef6..b0b6c8d 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 */
Both
Acked-by: Liam Girdwood lrg@ti.com
On Fri, Mar 11, 2011 at 11:05:37AM +0200, Vasily Khoruzhick wrote:
Signed-off-by: Vasily Khoruzhick anarsoul@gmail.com
Applied, thanks.
participants (3)
-
Liam Girdwood -
Mark Brown -
Vasily Khoruzhick