* [PATCH 1/2] ASoC: PXA: Fix jack detection on Zipit Z2
@ 2011-01-18 14:54 Vasily Khoruzhick
2011-01-18 14:54 ` [PATCH 2/2] ASoC: PXA: Fix codec address " Vasily Khoruzhick
2011-01-18 15:09 ` [PATCH 1/2] ASoC: PXA: Fix jack detection " Liam Girdwood
0 siblings, 2 replies; 6+ messages in thread
From: Vasily Khoruzhick @ 2011-01-18 14:54 UTC (permalink / raw)
To: alsa-devel, Liam Girdwood, Mark Brown, Marek Vasut, anarsoul
Fix jack detection on Zipit Z2, otherwise it
disables headphones output when jack is connected
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
sound/soc/pxa/z2.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c
index 4cc841b..0da889d 100644
--- a/sound/soc/pxa/z2.c
+++ b/sound/soc/pxa/z2.c
@@ -105,6 +105,7 @@ static struct snd_soc_jack_gpio hs_jack_gpios[] = {
.name = "hsdet-gpio",
.report = SND_JACK_HEADSET,
.debounce_time = 200,
+ .invert = 1,
},
};
--
1.7.4.rc1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] ASoC: PXA: Fix codec address on Zipit Z2
2011-01-18 14:54 [PATCH 1/2] ASoC: PXA: Fix jack detection on Zipit Z2 Vasily Khoruzhick
@ 2011-01-18 14:54 ` Vasily Khoruzhick
2011-01-18 15:05 ` Marek Vasut
2011-01-18 15:09 ` [PATCH 1/2] ASoC: PXA: Fix jack detection " Liam Girdwood
1 sibling, 1 reply; 6+ messages in thread
From: Vasily Khoruzhick @ 2011-01-18 14:54 UTC (permalink / raw)
To: alsa-devel, Liam Girdwood, Mark Brown, Marek Vasut, anarsoul
WM8750 address is 0x1b, not 0x1a. Without this fix
ALSA detects no sound cards on Zipit
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 0da889d..62c77dc 100644
--- a/sound/soc/pxa/z2.c
+++ b/sound/soc/pxa/z2.c
@@ -193,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,
};
--
1.7.4.rc1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] ASoC: PXA: Fix codec address on Zipit Z2
2011-01-18 14:54 ` [PATCH 2/2] ASoC: PXA: Fix codec address " Vasily Khoruzhick
@ 2011-01-18 15:05 ` Marek Vasut
2011-01-18 15:07 ` Mark Brown
0 siblings, 1 reply; 6+ messages in thread
From: Marek Vasut @ 2011-01-18 15:05 UTC (permalink / raw)
To: Vasily Khoruzhick; +Cc: alsa-devel, Mark Brown, Liam Girdwood
On Tuesday 18 January 2011 15:54:25 Vasily Khoruzhick wrote:
> WM8750 address is 0x1b, not 0x1a. Without this fix
> ALSA detects no sound cards on Zipit
>
> 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 0da889d..62c77dc 100644
> --- a/sound/soc/pxa/z2.c
> +++ b/sound/soc/pxa/z2.c
> @@ -193,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,
> };
Acked-by: Marek Vasut <marek.vasut@gmail.com>
Mark, shall I/Eric pick it via pxa-linux-2.6 or are you taking care of these two
?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] ASoC: PXA: Fix jack detection on Zipit Z2
2011-01-18 14:54 [PATCH 1/2] ASoC: PXA: Fix jack detection on Zipit Z2 Vasily Khoruzhick
2011-01-18 14:54 ` [PATCH 2/2] ASoC: PXA: Fix codec address " Vasily Khoruzhick
@ 2011-01-18 15:09 ` Liam Girdwood
2011-01-18 19:01 ` Mark Brown
1 sibling, 1 reply; 6+ messages in thread
From: Liam Girdwood @ 2011-01-18 15:09 UTC (permalink / raw)
To: Vasily Khoruzhick; +Cc: Marek Vasut, alsa-devel, Mark Brown
On Tue, 2011-01-18 at 16:54 +0200, Vasily Khoruzhick wrote:
> Fix jack detection on Zipit Z2, otherwise it
> disables headphones output when jack is connected
>
> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
> ---
> sound/soc/pxa/z2.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c
> index 4cc841b..0da889d 100644
> --- a/sound/soc/pxa/z2.c
> +++ b/sound/soc/pxa/z2.c
> @@ -105,6 +105,7 @@ static struct snd_soc_jack_gpio hs_jack_gpios[] = {
> .name = "hsdet-gpio",
> .report = SND_JACK_HEADSET,
> .debounce_time = 200,
> + .invert = 1,
> },
> };
Both
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-01-18 19:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-18 14:54 [PATCH 1/2] ASoC: PXA: Fix jack detection on Zipit Z2 Vasily Khoruzhick
2011-01-18 14:54 ` [PATCH 2/2] ASoC: PXA: Fix codec address " Vasily Khoruzhick
2011-01-18 15:05 ` Marek Vasut
2011-01-18 15:07 ` Mark Brown
2011-01-18 15:09 ` [PATCH 1/2] ASoC: PXA: Fix jack detection " Liam Girdwood
2011-01-18 19:01 ` 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).