[PATCH 2.6.27?] ASoC: Correct inverted Mic PGA Switch control in wm8510 driver

[PATCH 2.6.27?] ASoC: Correct inverted Mic PGA Switch control in wm8510 driver

[Mark Brown]

Mic PGA Switch should be inverted in the WM8510 driver but isn't.

Reported-by: ext-jukka.hynninen@vaisala.com
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

This bugfix applies to 2.6.27 but the issue is not very severe - it'd be
good to get it in but it's not critical.

 sound/soc/codecs/wm8510.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c
index 75ed041..f644da6 100644
--- a/sound/soc/codecs/wm8510.c
+++ b/sound/soc/codecs/wm8510.c
@@ -199,7 +199,7 @@ SOC_DAPM_SINGLE("PCM Playback Switch", WM8510_MONOMIX, 0, 1, 0),
 };
 
 static const struct snd_kcontrol_new wm8510_boost_controls[] = {
-SOC_DAPM_SINGLE("Mic PGA Switch", WM8510_INPPGA,  6, 1, 0),
+SOC_DAPM_SINGLE("Mic PGA Switch", WM8509_INPPGA,  6, 1, 1),
 SOC_DAPM_SINGLE("Aux Volume", WM8510_ADCBOOST, 0, 7, 0),
 SOC_DAPM_SINGLE("Mic Volume", WM8510_ADCBOOST, 4, 7, 0),
 };
-- 
1.5.6.5

Re: [PATCH 2.6.27?] ASoC: Correct inverted Mic PGA Switch control in wm8510 driver

[Troy Kisky]

Mark Brown wrote:
> Mic PGA Switch should be inverted in the WM8510 driver but isn't.
> 
> Reported-by: ext-jukka.hynninen@vaisala.com
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
> 
> This bugfix applies to 2.6.27 but the issue is not very severe - it'd be
> good to get it in but it's not critical.
> 
>  sound/soc/codecs/wm8510.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c
> index 75ed041..f644da6 100644
> --- a/sound/soc/codecs/wm8510.c
> +++ b/sound/soc/codecs/wm8510.c
> @@ -199,7 +199,7 @@ SOC_DAPM_SINGLE("PCM Playback Switch", WM8510_MONOMIX, 0, 1, 0),
>  };
>  
>  static const struct snd_kcontrol_new wm8510_boost_controls[] = {
> -SOC_DAPM_SINGLE("Mic PGA Switch", WM8510_INPPGA,  6, 1, 0),
> +SOC_DAPM_SINGLE("Mic PGA Switch", WM8509_INPPGA,  6, 1, 1),
>  SOC_DAPM_SINGLE("Aux Volume", WM8510_ADCBOOST, 0, 7, 0),
>  SOC_DAPM_SINGLE("Mic Volume", WM8510_ADCBOOST, 4, 7, 0),
>  };

Why the WM509 prefix instead of WM8510?

Re: [PATCH 2.6.27?] ASoC: Correct inverted Mic PGA Switch control in wm8510 driver

[Mark Brown]

On Fri, Oct 03, 2008 at 10:20:53AM -0700, Troy Kisky wrote:

> Why the WM509 prefix instead of WM8510?

Gah.  Because I sent an incorrect, buggy, version of the patch.  Trying
to do too many things at once :/

Takashi, please don't apply.

Re: [PATCH 2.6.27?] ASoC: Correct inverted Mic PGA Switch control in wm8510 driver

[Takashi Iwai]

At Fri, 3 Oct 2008 18:47:14 +0100,
Mark Brown wrote:
> 
> On Fri, Oct 03, 2008 at 10:20:53AM -0700, Troy Kisky wrote:
> 
> > Why the WM509 prefix instead of WM8510?
> 
> Gah.  Because I sent an incorrect, buggy, version of the patch.  Trying
> to do too many things at once :/
> 
> Takashi, please don't apply.

OK.

Will you send a correct one later, or is the fix totally bogus?


Takashi

Re: [PATCH 2.6.27?] ASoC: Correct inverted Mic PGA Switch control in wm8510 driver

[Mark Brown]

On Sat, Oct 04, 2008 at 06:35:00PM +0200, Takashi Iwai wrote:

> Will you send a correct one later, or is the fix totally bogus?

I'll send an updated patch - the fix is fine.

[PATCH 2.6.27?] ASoC: Correct inverted Mic PGA Switch control in wm8510 driver

[Mark Brown]

Mic PGA Switch should be inverted in the WM8510 driver but isn't.

Reported-by: ext-jukka.hynninen@vaisala.com
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 sound/soc/codecs/wm8510.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c
index 75ed041..9a37c8d 100644
--- a/sound/soc/codecs/wm8510.c
+++ b/sound/soc/codecs/wm8510.c
@@ -199,7 +199,7 @@ SOC_DAPM_SINGLE("PCM Playback Switch", WM8510_MONOMIX, 0, 1, 0),
 };
 
 static const struct snd_kcontrol_new wm8510_boost_controls[] = {
-SOC_DAPM_SINGLE("Mic PGA Switch", WM8510_INPPGA,  6, 1, 0),
+SOC_DAPM_SINGLE("Mic PGA Switch", WM8510_INPPGA,  6, 1, 1),
 SOC_DAPM_SINGLE("Aux Volume", WM8510_ADCBOOST, 0, 7, 0),
 SOC_DAPM_SINGLE("Mic Volume", WM8510_ADCBOOST, 4, 7, 0),
 };
-- 
1.5.6.5

Re: [PATCH 2.6.27?] ASoC: Correct inverted Mic PGA Switch control in wm8510 driver

[Takashi Iwai]

At Mon,  6 Oct 2008 11:33:21 +0100,
Mark Brown wrote:
> 
> Mic PGA Switch should be inverted in the WM8510 driver but isn't.
> 
> Reported-by: ext-jukka.hynninen@vaisala.com
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

Applied now to asoc-fixes branch.
Not sure whether I'll send more push request at this stage, though...


thanks,

Takashi

> ---
>  sound/soc/codecs/wm8510.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c
> index 75ed041..9a37c8d 100644
> --- a/sound/soc/codecs/wm8510.c
> +++ b/sound/soc/codecs/wm8510.c
> @@ -199,7 +199,7 @@ SOC_DAPM_SINGLE("PCM Playback Switch", WM8510_MONOMIX, 0, 1, 0),
>  };
>  
>  static const struct snd_kcontrol_new wm8510_boost_controls[] = {
> -SOC_DAPM_SINGLE("Mic PGA Switch", WM8510_INPPGA,  6, 1, 0),
> +SOC_DAPM_SINGLE("Mic PGA Switch", WM8510_INPPGA,  6, 1, 1),
>  SOC_DAPM_SINGLE("Aux Volume", WM8510_ADCBOOST, 0, 7, 0),
>  SOC_DAPM_SINGLE("Mic Volume", WM8510_ADCBOOST, 4, 7, 0),
>  };
> -- 
> 1.5.6.5
> 

Re: [PATCH 2.6.27?] ASoC: Correct inverted Mic PGA Switch control in wm8510 driver

[Mark Brown]

On Tue, Oct 07, 2008 at 10:04:47AM +0200, Takashi Iwai wrote:

> Applied now to asoc-fixes branch.
> Not sure whether I'll send more push request at this stage, though...

It's not the end of the world if it doesn't go - it's trivial to work
around in user space or backport.