Skip to contentSkip to conversation

ASoC: sgtl5000: Fix define for SGTL5000_BIAS_R_MASK

PATCH Applied Axel Lin 4 participants 5 messages Oct 19, 2011

Subsystems (3)
Sound ASoC NXP SGTL5000 driver
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/2 ASoC: sgtl5000: Fix define for SGTL5000_BIAS_R_MASK

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 <[email protected]>
---
 sound/soc/codecs/sgtl5000.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/codecs/sgtl5000.h +1 -1
index eec3ab3..8a9f435 100644
@@ -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
Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 2/2 ASoC: sgtl5000: Fix setting mic bias resistor

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 <[email protected]>
---
 sound/soc/codecs/sgtl5000.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)
sound/soc/codecs/sgtl5000.c +3 -6
index 91130fb..3637a62 100644
@@ -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;
Signature · 1 line
1.7.5.4
Acked-by on v1 1/2
#2 lore raw
In reply to Axel Lin
Quoted 30 lines · Axel Lin

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 <[email protected]>

---
 sound/soc/codecs/sgtl5000.h |    2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/codecs/sgtl5000.h +1 -2
index eec3ab3..8a9f435 100644
@@ -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
--
Quoted 5 lines

1.7.5.4

Both

Acked-by Liam Girdwood <[email protected]>
Acked-by
#3 lore raw
Quoted 39 lines · Liam
Quoted 30 lines · Axel Lin

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 <[email protected]>

---
 sound/soc/codecs/sgtl5000.h |    2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/codecs/sgtl5000.h +1 -2
index eec3ab3..8a9f435 100644
@@ -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
--
Quoted 5 lines

1.7.5.4

Both

Quoted 1 line
Acked-by Liam Girdwood <[email protected]>

And

Acked-by Wolfram Sang <[email protected]>
Signature · 2 lines
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |