[alsa-devel] [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
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, }, };
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, };
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 ?
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
On Tue, Jan 18, 2011 at 03:09:30PM +0000, Liam Girdwood wrote:
Both
Acked-by: Liam Girdwood lrg@slimlogic.co.uk
Applied, thanks.
participants (4)
-
Liam Girdwood -
Marek Vasut -
Mark Brown -
Vasily Khoruzhick