Skip to contentSkip to conversation

ASoC: codecs: pcm186x: fix wrong usage of DECLARE_TLV_DB_LINEAR()

PATCH Superseded [email protected] 1 participant 3 messages Feb 19, 2019

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ASoC: codecs: pcm186x: fix wrong usage of DECLARE_TLV_DB_LINEAR()

From: Codrin Ciubotariu <[email protected]>

According to DS, the gain is between -12 dB and 40 dB, with a 0.5 dB step. Tested on pcm1863.

---
 sound/soc/codecs/pcm186x.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/codecs/pcm186x.c +1 -2
index 809b7e9f03ca..7947279243f9 100644
@@ -6,7 +6,6 @@
  *	Andreas Dannenberg <[email protected]>
  *	Andrew F. Davis <[email protected]>
  */
-
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
@@ -42,7 +41,7 @@ struct pcm186x_priv {
 	bool is_master_mode;
 };
 
-static const DECLARE_TLV_DB_SCALE(pcm186x_pga_tlv, -1200, 4000, 50);
+static const DECLARE_TLV_DB_SCALE(pcm186x_pga_tlv, -1200, 50, 0);
 
 static const struct snd_kcontrol_new pcm1863_snd_controls[] = {
 	SOC_DOUBLE_R_S_TLV("ADC Capture Volume", PCM186X_PGA_VAL_CH1_L,
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 ASoC: codecs: pcm186x: Fix energysense SLEEP bit

From: Codrin Ciubotariu <[email protected]>

The ADCs are sleeping when the SLEEP bit is set and running when it's cleared, so the bit should be inverted.
Tested on pcm1863.

---
 sound/soc/codecs/pcm186x.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/codecs/pcm186x.c +3 -3
index 7947279243f9..4477d678797f 100644
@@ -157,7 +157,7 @@ static const struct snd_soc_dapm_widget pcm1863_dapm_widgets[] = {
 	 * Put the codec into SLEEP mode when not in use, allowing the
 	 * Energysense mechanism to operate.
 	 */
-	SND_SOC_DAPM_ADC("ADC", "HiFi Capture", PCM186X_POWER_CTRL, 1,  0),
+	SND_SOC_DAPM_ADC("ADC", "HiFi Capture", PCM186X_POWER_CTRL, 1,  1),
 };
 
 static const struct snd_soc_dapm_widget pcm1865_dapm_widgets[] = {
@@ -183,8 +183,8 @@ static const struct snd_soc_dapm_widget pcm1865_dapm_widgets[] = {
 	 * Put the codec into SLEEP mode when not in use, allowing the
 	 * Energysense mechanism to operate.
 	 */
-	SND_SOC_DAPM_ADC("ADC1", "HiFi Capture 1", PCM186X_POWER_CTRL, 1,  0),
-	SND_SOC_DAPM_ADC("ADC2", "HiFi Capture 2", PCM186X_POWER_CTRL, 1,  0),
+	SND_SOC_DAPM_ADC("ADC1", "HiFi Capture 1", PCM186X_POWER_CTRL, 1,  1),
+	SND_SOC_DAPM_ADC("ADC2", "HiFi Capture 2", PCM186X_POWER_CTRL, 1,  1),
 };
 
 static const struct snd_soc_dapm_route pcm1863_dapm_routes[] = {
Signature · 1 line
2.17.1
#2 lore raw
In reply to [email protected]
Quoted 24 lines · On 19.02.2019 18:15, Codrin Ciubotariu - M19940 wrote:

From: Codrin Ciubotariu <[email protected]>

According to DS, the gain is between -12 dB and 40 dB, with a 0.5 dB step. Tested on pcm1863.

---
  sound/soc/codecs/pcm186x.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/codecs/pcm186x.c +0 -1
index 809b7e9f03ca..7947279243f9 100644
@@ -6,7 +6,6 @@
   *	Andreas Dannenberg <[email protected]>
   *	Andrew F. Davis <[email protected]>
   */
-
  #include <linux/module.h>
  #include <linux/moduleparam.h>
  #include <linux/init.h>

sound/soc/codecs/pcm186x.c struct pcm186x_priv { · line 47

Quoted 8 lines
sound/soc/codecs/pcm186x.c +1 -1
@@ -42,7 +41,7 @@ struct pcm186x_priv {
  	bool is_master_mode;
  };
 
-static const DECLARE_TLV_DB_SCALE(pcm186x_pga_tlv, -1200, 4000, 50);
+static const DECLARE_TLV_DB_SCALE(pcm186x_pga_tlv, -1200, 50, 0);
 
  static const struct snd_kcontrol_new pcm1863_snd_controls[] = {
  	SOC_DOUBLE_R_S_TLV("ADC Capture Volume", PCM186X_PGA_VAL_CH1_L,

the title is wrong, there is no DECLARE_TLV_DB_LINEAR()present. Will send v2.

Best regards,
Codrin