ASoC: codecs: wcd9335: move gains from SX_TLV to S8_TLV

[ Upstream commit 2fbe0953732e06b471cdedbf6f615b84235580d8 ]

move all the digital gains form using SX_TLV to S8_TLV, these gains are
actually 8 bit gains with 7th signed bit and ranges from -84dB to +40dB

rest of the Qualcomm wcd codecs uses these properly.

Fixes: 8c4f021d806a ("ASoC: wcd9335: add basic controls")
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20220609111901.318047-3-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c
index bc5d68c..3a13afb 100644 (file)
--- a/sound/soc/codecs/wcd9335.c
+++ b/sound/soc/codecs/wcd9335.c
@@ -2252,51 +2252,42 @@ static int wcd9335_rx_hph_mode_put(struct snd_kcontrol *kc,
 
 static const struct snd_kcontrol_new wcd9335_snd_controls[] = {
        /* -84dB min - 40dB max */
-       SOC_SINGLE_SX_TLV("RX0 Digital Volume", WCD9335_CDC_RX0_RX_VOL_CTL,
-               0, -84, 40, digital_gain),
-       SOC_SINGLE_SX_TLV("RX1 Digital Volume", WCD9335_CDC_RX1_RX_VOL_CTL,
-               0, -84, 40, digital_gain),
-       SOC_SINGLE_SX_TLV("RX2 Digital Volume", WCD9335_CDC_RX2_RX_VOL_CTL,
-               0, -84, 40, digital_gain),
-       SOC_SINGLE_SX_TLV("RX3 Digital Volume", WCD9335_CDC_RX3_RX_VOL_CTL,
-               0, -84, 40, digital_gain),
-       SOC_SINGLE_SX_TLV("RX4 Digital Volume", WCD9335_CDC_RX4_RX_VOL_CTL,
-               0, -84, 40, digital_gain),
-       SOC_SINGLE_SX_TLV("RX5 Digital Volume", WCD9335_CDC_RX5_RX_VOL_CTL,
-               0, -84, 40, digital_gain),
-       SOC_SINGLE_SX_TLV("RX6 Digital Volume", WCD9335_CDC_RX6_RX_VOL_CTL,
-               0, -84, 40, digital_gain),
-       SOC_SINGLE_SX_TLV("RX7 Digital Volume", WCD9335_CDC_RX7_RX_VOL_CTL,
-               0, -84, 40, digital_gain),
-       SOC_SINGLE_SX_TLV("RX8 Digital Volume", WCD9335_CDC_RX8_RX_VOL_CTL,
-               0, -84, 40, digital_gain),
-       SOC_SINGLE_SX_TLV("RX0 Mix Digital Volume",
-                         WCD9335_CDC_RX0_RX_VOL_MIX_CTL,
-                         0, -84, 40, digital_gain),
-       SOC_SINGLE_SX_TLV("RX1 Mix Digital Volume",
-                         WCD9335_CDC_RX1_RX_VOL_MIX_CTL,
-                         0, -84, 40, digital_gain),
-       SOC_SINGLE_SX_TLV("RX2 Mix Digital Volume",
-                         WCD9335_CDC_RX2_RX_VOL_MIX_CTL,
-                         0, -84, 40, digital_gain),
-       SOC_SINGLE_SX_TLV("RX3 Mix Digital Volume",
-                         WCD9335_CDC_RX3_RX_VOL_MIX_CTL,
-                         0, -84, 40, digital_gain),
-       SOC_SINGLE_SX_TLV("RX4 Mix Digital Volume",
-                         WCD9335_CDC_RX4_RX_VOL_MIX_CTL,
-                         0, -84, 40, digital_gain),
-       SOC_SINGLE_SX_TLV("RX5 Mix Digital Volume",
-                         WCD9335_CDC_RX5_RX_VOL_MIX_CTL,
-                         0, -84, 40, digital_gain),
-       SOC_SINGLE_SX_TLV("RX6 Mix Digital Volume",
-                         WCD9335_CDC_RX6_RX_VOL_MIX_CTL,
-                         0, -84, 40, digital_gain),
-       SOC_SINGLE_SX_TLV("RX7 Mix Digital Volume",
-                         WCD9335_CDC_RX7_RX_VOL_MIX_CTL,
-                         0, -84, 40, digital_gain),
-       SOC_SINGLE_SX_TLV("RX8 Mix Digital Volume",
-                         WCD9335_CDC_RX8_RX_VOL_MIX_CTL,
-                         0, -84, 40, digital_gain),
+       SOC_SINGLE_S8_TLV("RX0 Digital Volume", WCD9335_CDC_RX0_RX_VOL_CTL,
+                       -84, 40, digital_gain),
+       SOC_SINGLE_S8_TLV("RX1 Digital Volume", WCD9335_CDC_RX1_RX_VOL_CTL,
+                       -84, 40, digital_gain),
+       SOC_SINGLE_S8_TLV("RX2 Digital Volume", WCD9335_CDC_RX2_RX_VOL_CTL,
+                       -84, 40, digital_gain),
+       SOC_SINGLE_S8_TLV("RX3 Digital Volume", WCD9335_CDC_RX3_RX_VOL_CTL,
+                       -84, 40, digital_gain),
+       SOC_SINGLE_S8_TLV("RX4 Digital Volume", WCD9335_CDC_RX4_RX_VOL_CTL,
+                       -84, 40, digital_gain),
+       SOC_SINGLE_S8_TLV("RX5 Digital Volume", WCD9335_CDC_RX5_RX_VOL_CTL,
+                       -84, 40, digital_gain),
+       SOC_SINGLE_S8_TLV("RX6 Digital Volume", WCD9335_CDC_RX6_RX_VOL_CTL,
+                       -84, 40, digital_gain),
+       SOC_SINGLE_S8_TLV("RX7 Digital Volume", WCD9335_CDC_RX7_RX_VOL_CTL,
+                       -84, 40, digital_gain),
+       SOC_SINGLE_S8_TLV("RX8 Digital Volume", WCD9335_CDC_RX8_RX_VOL_CTL,
+                       -84, 40, digital_gain),
+       SOC_SINGLE_S8_TLV("RX0 Mix Digital Volume", WCD9335_CDC_RX0_RX_VOL_MIX_CTL,
+                       -84, 40, digital_gain),
+       SOC_SINGLE_S8_TLV("RX1 Mix Digital Volume", WCD9335_CDC_RX1_RX_VOL_MIX_CTL,
+                       -84, 40, digital_gain),
+       SOC_SINGLE_S8_TLV("RX2 Mix Digital Volume", WCD9335_CDC_RX2_RX_VOL_MIX_CTL,
+                       -84, 40, digital_gain),
+       SOC_SINGLE_S8_TLV("RX3 Mix Digital Volume", WCD9335_CDC_RX3_RX_VOL_MIX_CTL,
+                       -84, 40, digital_gain),
+       SOC_SINGLE_S8_TLV("RX4 Mix Digital Volume", WCD9335_CDC_RX4_RX_VOL_MIX_CTL,
+                       -84, 40, digital_gain),
+       SOC_SINGLE_S8_TLV("RX5 Mix Digital Volume", WCD9335_CDC_RX5_RX_VOL_MIX_CTL,
+                       -84, 40, digital_gain),
+       SOC_SINGLE_S8_TLV("RX6 Mix Digital Volume", WCD9335_CDC_RX6_RX_VOL_MIX_CTL,
+                       -84, 40, digital_gain),
+       SOC_SINGLE_S8_TLV("RX7 Mix Digital Volume", WCD9335_CDC_RX7_RX_VOL_MIX_CTL,
+                       -84, 40, digital_gain),
+       SOC_SINGLE_S8_TLV("RX8 Mix Digital Volume", WCD9335_CDC_RX8_RX_VOL_MIX_CTL,
+                       -84, 40, digital_gain),
        SOC_ENUM("RX INT0_1 HPF cut off", cf_int0_1_enum),
        SOC_ENUM("RX INT0_2 HPF cut off", cf_int0_2_enum),
        SOC_ENUM("RX INT1_1 HPF cut off", cf_int1_1_enum),