* [PATCH 1/2] ASoC: sgtl5000: Fix define for SGTL5000_BIAS_R_MASK
@ 2011-10-19 2:54 ` Axel Lin
0 siblings, 0 replies; 7+ messages in thread
From: Axel Lin @ 2011-10-19 2:54 UTC (permalink / raw)
To: linux-kernel
Cc: Zeng Zhaoming, Wolfram Sang, Liam Girdwood, Mark Brown,
alsa-devel
According to the datasheet:
CHIP_MIC_CTRL 0x002A
BITS[9:8] BIAS_RESISTOR
0x0 = Powerd off
0x1 = 2.0 kohm
0x2 = 4.0 kohm
0x3 = 8.0 kohm
Thus SGTL5000_BIAS_R_MASK should be defined as 0x0300 instead of 0x0200.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
sound/soc/codecs/sgtl5000.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/soc/codecs/sgtl5000.h b/sound/soc/codecs/sgtl5000.h
index eec3ab3..8a9f435 100644
--- a/sound/soc/codecs/sgtl5000.h
+++ b/sound/soc/codecs/sgtl5000.h
@@ -280,7 +280,7 @@
/*
* SGTL5000_CHIP_MIC_CTRL
*/
-#define SGTL5000_BIAS_R_MASK 0x0200
+#define SGTL5000_BIAS_R_MASK 0x0300
#define SGTL5000_BIAS_R_SHIFT 8
#define SGTL5000_BIAS_R_WIDTH 2
#define SGTL5000_BIAS_R_off 0x0
--
1.7.5.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/2] ASoC: sgtl5000: Fix setting mic bias resistor
2011-10-19 2:54 ` Axel Lin
(?)
@ 2011-10-19 3:00 ` Axel Lin
-1 siblings, 0 replies; 7+ messages in thread
From: Axel Lin @ 2011-10-19 3:00 UTC (permalink / raw)
To: linux-kernel; +Cc: Wolfram Sang, Liam Girdwood, Mark Brown, alsa-devel
According to the datasheet:
CHIP_MIC_CTRL 0x002A
BITS[9:8] BIAS_RESISTOR
0x0 = Powerd off
0x1 = 2.0 kohm
0x2 = 4.0 kohm
0x3 = 8.0 kohm
To set mic bias resistor, we need to update bits[9:8] of
SGTL5000_CHIP_MIC_CTRL register.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
sound/soc/codecs/sgtl5000.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index 91130fb..3637a62 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -131,16 +131,13 @@ static int mic_bias_event(struct snd_soc_dapm_widget *w,
case SND_SOC_DAPM_POST_PMU:
/* change mic bias resistor to 4Kohm */
snd_soc_update_bits(w->codec, SGTL5000_CHIP_MIC_CTRL,
- SGTL5000_BIAS_R_4k, SGTL5000_BIAS_R_4k);
+ SGTL5000_BIAS_R_MASK,
+ SGTL5000_BIAS_R_4k << SGTL5000_BIAS_R_SHIFT);
break;
case SND_SOC_DAPM_PRE_PMD:
- /*
- * SGTL5000_BIAS_R_8k as mask to clean the two bits
- * of mic bias and output impedance
- */
snd_soc_update_bits(w->codec, SGTL5000_CHIP_MIC_CTRL,
- SGTL5000_BIAS_R_8k, 0);
+ SGTL5000_BIAS_R_MASK, 0);
break;
}
return 0;
--
1.7.5.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 1/2] ASoC: sgtl5000: Fix define for SGTL5000_BIAS_R_MASK
2011-10-19 2:54 ` Axel Lin
(?)
(?)
@ 2011-10-19 8:06 ` Girdwood, Liam
2011-10-19 10:05 ` Wolfram Sang
-1 siblings, 1 reply; 7+ messages in thread
From: Girdwood, Liam @ 2011-10-19 8:06 UTC (permalink / raw)
To: Axel Lin
Cc: linux-kernel, Zeng Zhaoming, Wolfram Sang, Mark Brown, alsa-devel
On 19 October 2011 03:54, Axel Lin <axel.lin@gmail.com> wrote:
> According to the datasheet:
> CHIP_MIC_CTRL 0x002A
>
> BITS[9:8] BIAS_RESISTOR
> 0x0 = Powerd off
> 0x1 = 2.0 kohm
> 0x2 = 4.0 kohm
> 0x3 = 8.0 kohm
>
> Thus SGTL5000_BIAS_R_MASK should be defined as 0x0300 instead of 0x0200.
>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> sound/soc/codecs/sgtl5000.h | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/sound/soc/codecs/sgtl5000.h b/sound/soc/codecs/sgtl5000.h
> index eec3ab3..8a9f435 100644
> --- a/sound/soc/codecs/sgtl5000.h
> +++ b/sound/soc/codecs/sgtl5000.h
> @@ -280,7 +280,7 @@
> /*
> * SGTL5000_CHIP_MIC_CTRL
> */
> -#define SGTL5000_BIAS_R_MASK 0x0200
> +#define SGTL5000_BIAS_R_MASK 0x0300
> #define SGTL5000_BIAS_R_SHIFT 8
> #define SGTL5000_BIAS_R_WIDTH 2
> #define SGTL5000_BIAS_R_off 0x0
> --
> 1.7.5.4
>
>
>
>
Both
Acked-by: Liam Girdwood <lrg@ti.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] ASoC: sgtl5000: Fix define for SGTL5000_BIAS_R_MASK
2011-10-19 8:06 ` [PATCH 1/2] ASoC: sgtl5000: Fix define for SGTL5000_BIAS_R_MASK Girdwood, Liam
@ 2011-10-19 10:05 ` Wolfram Sang
0 siblings, 0 replies; 7+ messages in thread
From: Wolfram Sang @ 2011-10-19 10:05 UTC (permalink / raw)
To: Girdwood, Liam
Cc: Axel Lin, linux-kernel, Zeng Zhaoming, Mark Brown, alsa-devel
[-- Attachment #1: Type: text/plain, Size: 1448 bytes --]
On Wed, Oct 19, 2011 at 09:06:57AM +0100, Girdwood, Liam wrote:
> On 19 October 2011 03:54, Axel Lin <axel.lin@gmail.com> wrote:
> > According to the datasheet:
> > CHIP_MIC_CTRL 0x002A
> >
> > BITS[9:8] BIAS_RESISTOR
> > 0x0 = Powerd off
> > 0x1 = 2.0 kohm
> > 0x2 = 4.0 kohm
> > 0x3 = 8.0 kohm
> >
> > Thus SGTL5000_BIAS_R_MASK should be defined as 0x0300 instead of 0x0200.
> >
> > Signed-off-by: Axel Lin <axel.lin@gmail.com>
> > ---
> > sound/soc/codecs/sgtl5000.h | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/sound/soc/codecs/sgtl5000.h b/sound/soc/codecs/sgtl5000.h
> > index eec3ab3..8a9f435 100644
> > --- a/sound/soc/codecs/sgtl5000.h
> > +++ b/sound/soc/codecs/sgtl5000.h
> > @@ -280,7 +280,7 @@
> > /*
> > * SGTL5000_CHIP_MIC_CTRL
> > */
> > -#define SGTL5000_BIAS_R_MASK 0x0200
> > +#define SGTL5000_BIAS_R_MASK 0x0300
> > #define SGTL5000_BIAS_R_SHIFT 8
> > #define SGTL5000_BIAS_R_WIDTH 2
> > #define SGTL5000_BIAS_R_off 0x0
> > --
> > 1.7.5.4
> >
> >
> >
> >
>
> Both
>
> Acked-by: Liam Girdwood <lrg@ti.com>
And
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] ASoC: sgtl5000: Fix define for SGTL5000_BIAS_R_MASK
2011-10-19 2:54 ` Axel Lin
@ 2011-10-19 12:09 ` Mark Brown
-1 siblings, 0 replies; 7+ messages in thread
From: Mark Brown @ 2011-10-19 12:09 UTC (permalink / raw)
To: Axel Lin
Cc: Zeng Zhaoming, alsa-devel, Liam Girdwood, linux-kernel,
Wolfram Sang
On Wed, Oct 19, 2011 at 10:54:56AM +0800, Axel Lin wrote:
> According to the datasheet:
> CHIP_MIC_CTRL 0x002A
Applied both, thanks.
^ permalink raw reply [flat|nested] 7+ messages in thread