* [PATCH 1/2] ASoC: PXA: z2: Mute internal speaker when headphones are connected
@ 2011-03-11 9:05 Vasily Khoruzhick
2011-03-11 9:05 ` [PATCH 2/2] ASoC: PXA: Z2: Fix codec pin name Vasily Khoruzhick
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Vasily Khoruzhick @ 2011-03-11 9:05 UTC (permalink / raw)
To: alsa-devel, Liam Girdwood, Mark Brown, Marek Vasut; +Cc: Vasily Khoruzhick
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 */
--
1.7.4.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] ASoC: PXA: Z2: Fix codec pin name
2011-03-11 9:05 [PATCH 1/2] ASoC: PXA: z2: Mute internal speaker when headphones are connected Vasily Khoruzhick
@ 2011-03-11 9:05 ` Vasily Khoruzhick
2011-03-11 11:15 ` [PATCH 1/2] ASoC: PXA: z2: Mute internal speaker when headphones are connected Liam Girdwood
2011-03-11 12:06 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Vasily Khoruzhick @ 2011-03-11 9:05 UTC (permalink / raw)
To: alsa-devel, Liam Girdwood, Mark Brown, Marek Vasut; +Cc: Vasily Khoruzhick
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,
--
1.7.4.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] ASoC: PXA: z2: Mute internal speaker when headphones are connected
2011-03-11 9:05 [PATCH 1/2] ASoC: PXA: z2: Mute internal speaker when headphones are connected Vasily Khoruzhick
2011-03-11 9:05 ` [PATCH 2/2] ASoC: PXA: Z2: Fix codec pin name Vasily Khoruzhick
@ 2011-03-11 11:15 ` Liam Girdwood
2011-03-11 12:06 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Liam Girdwood @ 2011-03-11 11:15 UTC (permalink / raw)
To: Vasily Khoruzhick; +Cc: Marek Vasut, alsa-devel, Mark Brown
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>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 1/2] ASoC: PXA: z2: Mute internal speaker when headphones are connected
2011-03-11 9:05 [PATCH 1/2] ASoC: PXA: z2: Mute internal speaker when headphones are connected Vasily Khoruzhick
2011-03-11 9:05 ` [PATCH 2/2] ASoC: PXA: Z2: Fix codec pin name Vasily Khoruzhick
2011-03-11 11:15 ` [PATCH 1/2] ASoC: PXA: z2: Mute internal speaker when headphones are connected Liam Girdwood
@ 2011-03-11 12:06 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2011-03-11 12:06 UTC (permalink / raw)
To: Vasily Khoruzhick; +Cc: Marek Vasut, alsa-devel, Liam Girdwood
On Fri, Mar 11, 2011 at 11:05:37AM +0200, Vasily Khoruzhick wrote:
> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-03-11 12:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-11 9:05 [PATCH 1/2] ASoC: PXA: z2: Mute internal speaker when headphones are connected Vasily Khoruzhick
2011-03-11 9:05 ` [PATCH 2/2] ASoC: PXA: Z2: Fix codec pin name Vasily Khoruzhick
2011-03-11 11:15 ` [PATCH 1/2] ASoC: PXA: z2: Mute internal speaker when headphones are connected Liam Girdwood
2011-03-11 12:06 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).