Skip to contentSkip to conversation

ASoC: PXA: z2: Mute internal speaker when headphones are connected

PATCH Applied Vasily Khoruzhick 3 participants 4 messages Mar 11, 2011

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ASoC: PXA: z2: Mute internal speaker when headphones are connected

---
 sound/soc/pxa/z2.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
sound/soc/pxa/z2.c +5 -0
index 3ceaef6..b0b6c8d 100644
@@ -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 */
Signature · 1 line
1.7.4.1
#1 lore raw

PATCH 2/2 ASoC: PXA: Z2: Fix codec pin name

MONO was renamed to MONO1.

---
 sound/soc/pxa/z2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/pxa/z2.c +1 -1
index b0b6c8d..d69d9fc 100644
@@ -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,
Signature · 1 line
1.7.4.1
Acked-by on v1 1/2
#2 lore raw
In reply to Vasily Khoruzhick
Quoted 11 lines · Vasily Khoruzhick
---
 sound/soc/pxa/z2.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
sound/soc/pxa/z2.c +0 -0
index 3ceaef6..b0b6c8d 100644
@@ -95,6 +95,11 @@ static struct snd_soc_jack_pin hs_jack_pins[] = {
 		.pin	= "Headphone Jack",

sound/soc/pxa/z2.c static struct snd_soc_jack_pin hs_jack_pins[] = { · line 105

Quoted 10 lines
sound/soc/pxa/z2.c +5 -0
 		.mask	= SND_JACK_HEADPHONE,
 	},
+	{
+		.pin    = "Ext Spk",
+		.mask   = SND_JACK_HEADPHONE,
+		.invert = 1
+	},
 };
 
 /* Headset jack detection gpios */

Both