ASoC: PXA: Fix jack detection on Zipit Z2
Subsystems (3)
PATCH 1/2 ASoC: PXA: Fix jack detection on Zipit Z2
Fix jack detection on Zipit Z2, otherwise it
disables headphones output when jack is connected
--- sound/soc/pxa/z2.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
sound/soc/pxa/z2.c +1 -0
@@ -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, }, };
Signature · 1 line
1.7.4.rc1
PATCH 2/2 ASoC: PXA: Fix codec address on Zipit Z2
WM8750 address is 0x1b, not 0x1a. Without this fix ALSA detects no sound cards on Zipit
--- sound/soc/pxa/z2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/pxa/z2.c +1 -1
@@ -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, };
Signature · 1 line
1.7.4.rc1
Re: [PATCH 2/2] ASoC: PXA: Fix codec address on Zipit Z2
Quoted 13 lines · On Tuesday 18 January 2011 15:54:25 Vasily Khoruzhick wrote:
WM8750 address is
0x1b, not0x1a. Without this fix ALSA detects no sound cards on ZipitSigned-off-by Vasily Khoruzhick <[email protected]>--- sound/soc/pxa/z2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)sound/soc/pxa/z2.c +0
-0
sound/soc/pxa/z2.c static struct snd_soc_dai_link z2_dai = { · line 199
Quoted 8 lines
sound/soc/pxa/z2.c +1
-1@@ -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, };
Mark, shall I/Eric pick it via pxa-linux-2.6 or are you taking care of these two ?
Re: [PATCH 2/2] ASoC: PXA: Fix codec address on Zipit Z2
Quoted 2 lines · Marek Vasut
Mark, shall I/Eric pick it via pxa-linux-2.6 or are you taking care of these two ?
I'll apply them, just need Liam to review them too.
Quoted 13 lines · Vasily Khoruzhick
Fix jack detection on Zipit Z2, otherwise it
disables headphones output when jack is connectedSigned-off-by Vasily Khoruzhick <[email protected]>--- sound/soc/pxa/z2.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)sound/soc/pxa/z2.c +0
-0
sound/soc/pxa/z2.c static struct snd_soc_jack_gpio hs_jack_gpios[] = { · line 110
Quoted 6 lines
sound/soc/pxa/z2.c +1
-0@@ -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
Signature · 3 lines
Freelance Developer, SlimLogic Ltd ASoC and Voltage Regulator Maintainer. http://www.slimlogic.co.uk
Mark Brown
AppliedQuoted 3 lines · Liam Girdwood
Both
Acked-by Liam Girdwood <[email protected]>
Applied, thanks.