Skip to content

Commit c81935d

Browse files
Srinivas-Kandagatlagregkh
authored andcommitted
ASoC: codecs: wcd9335: move gains from SX_TLV to S8_TLV
[ Upstream commit 2fbe095 ] 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: 8c4f021 ("ASoC: wcd9335: add basic controls") Signed-off-by: Srinivas Kandagatla <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent a24bb7f commit c81935d

File tree

1 file changed

+36
-45
lines changed

1 file changed

+36
-45
lines changed

sound/soc/codecs/wcd9335.c

+36-45
Original file line numberDiff line numberDiff line change
@@ -2252,51 +2252,42 @@ static int wcd9335_rx_hph_mode_put(struct snd_kcontrol *kc,
22522252

22532253
static const struct snd_kcontrol_new wcd9335_snd_controls[] = {
22542254
/* -84dB min - 40dB max */
2255-
SOC_SINGLE_SX_TLV("RX0 Digital Volume", WCD9335_CDC_RX0_RX_VOL_CTL,
2256-
0, -84, 40, digital_gain),
2257-
SOC_SINGLE_SX_TLV("RX1 Digital Volume", WCD9335_CDC_RX1_RX_VOL_CTL,
2258-
0, -84, 40, digital_gain),
2259-
SOC_SINGLE_SX_TLV("RX2 Digital Volume", WCD9335_CDC_RX2_RX_VOL_CTL,
2260-
0, -84, 40, digital_gain),
2261-
SOC_SINGLE_SX_TLV("RX3 Digital Volume", WCD9335_CDC_RX3_RX_VOL_CTL,
2262-
0, -84, 40, digital_gain),
2263-
SOC_SINGLE_SX_TLV("RX4 Digital Volume", WCD9335_CDC_RX4_RX_VOL_CTL,
2264-
0, -84, 40, digital_gain),
2265-
SOC_SINGLE_SX_TLV("RX5 Digital Volume", WCD9335_CDC_RX5_RX_VOL_CTL,
2266-
0, -84, 40, digital_gain),
2267-
SOC_SINGLE_SX_TLV("RX6 Digital Volume", WCD9335_CDC_RX6_RX_VOL_CTL,
2268-
0, -84, 40, digital_gain),
2269-
SOC_SINGLE_SX_TLV("RX7 Digital Volume", WCD9335_CDC_RX7_RX_VOL_CTL,
2270-
0, -84, 40, digital_gain),
2271-
SOC_SINGLE_SX_TLV("RX8 Digital Volume", WCD9335_CDC_RX8_RX_VOL_CTL,
2272-
0, -84, 40, digital_gain),
2273-
SOC_SINGLE_SX_TLV("RX0 Mix Digital Volume",
2274-
WCD9335_CDC_RX0_RX_VOL_MIX_CTL,
2275-
0, -84, 40, digital_gain),
2276-
SOC_SINGLE_SX_TLV("RX1 Mix Digital Volume",
2277-
WCD9335_CDC_RX1_RX_VOL_MIX_CTL,
2278-
0, -84, 40, digital_gain),
2279-
SOC_SINGLE_SX_TLV("RX2 Mix Digital Volume",
2280-
WCD9335_CDC_RX2_RX_VOL_MIX_CTL,
2281-
0, -84, 40, digital_gain),
2282-
SOC_SINGLE_SX_TLV("RX3 Mix Digital Volume",
2283-
WCD9335_CDC_RX3_RX_VOL_MIX_CTL,
2284-
0, -84, 40, digital_gain),
2285-
SOC_SINGLE_SX_TLV("RX4 Mix Digital Volume",
2286-
WCD9335_CDC_RX4_RX_VOL_MIX_CTL,
2287-
0, -84, 40, digital_gain),
2288-
SOC_SINGLE_SX_TLV("RX5 Mix Digital Volume",
2289-
WCD9335_CDC_RX5_RX_VOL_MIX_CTL,
2290-
0, -84, 40, digital_gain),
2291-
SOC_SINGLE_SX_TLV("RX6 Mix Digital Volume",
2292-
WCD9335_CDC_RX6_RX_VOL_MIX_CTL,
2293-
0, -84, 40, digital_gain),
2294-
SOC_SINGLE_SX_TLV("RX7 Mix Digital Volume",
2295-
WCD9335_CDC_RX7_RX_VOL_MIX_CTL,
2296-
0, -84, 40, digital_gain),
2297-
SOC_SINGLE_SX_TLV("RX8 Mix Digital Volume",
2298-
WCD9335_CDC_RX8_RX_VOL_MIX_CTL,
2299-
0, -84, 40, digital_gain),
2255+
SOC_SINGLE_S8_TLV("RX0 Digital Volume", WCD9335_CDC_RX0_RX_VOL_CTL,
2256+
-84, 40, digital_gain),
2257+
SOC_SINGLE_S8_TLV("RX1 Digital Volume", WCD9335_CDC_RX1_RX_VOL_CTL,
2258+
-84, 40, digital_gain),
2259+
SOC_SINGLE_S8_TLV("RX2 Digital Volume", WCD9335_CDC_RX2_RX_VOL_CTL,
2260+
-84, 40, digital_gain),
2261+
SOC_SINGLE_S8_TLV("RX3 Digital Volume", WCD9335_CDC_RX3_RX_VOL_CTL,
2262+
-84, 40, digital_gain),
2263+
SOC_SINGLE_S8_TLV("RX4 Digital Volume", WCD9335_CDC_RX4_RX_VOL_CTL,
2264+
-84, 40, digital_gain),
2265+
SOC_SINGLE_S8_TLV("RX5 Digital Volume", WCD9335_CDC_RX5_RX_VOL_CTL,
2266+
-84, 40, digital_gain),
2267+
SOC_SINGLE_S8_TLV("RX6 Digital Volume", WCD9335_CDC_RX6_RX_VOL_CTL,
2268+
-84, 40, digital_gain),
2269+
SOC_SINGLE_S8_TLV("RX7 Digital Volume", WCD9335_CDC_RX7_RX_VOL_CTL,
2270+
-84, 40, digital_gain),
2271+
SOC_SINGLE_S8_TLV("RX8 Digital Volume", WCD9335_CDC_RX8_RX_VOL_CTL,
2272+
-84, 40, digital_gain),
2273+
SOC_SINGLE_S8_TLV("RX0 Mix Digital Volume", WCD9335_CDC_RX0_RX_VOL_MIX_CTL,
2274+
-84, 40, digital_gain),
2275+
SOC_SINGLE_S8_TLV("RX1 Mix Digital Volume", WCD9335_CDC_RX1_RX_VOL_MIX_CTL,
2276+
-84, 40, digital_gain),
2277+
SOC_SINGLE_S8_TLV("RX2 Mix Digital Volume", WCD9335_CDC_RX2_RX_VOL_MIX_CTL,
2278+
-84, 40, digital_gain),
2279+
SOC_SINGLE_S8_TLV("RX3 Mix Digital Volume", WCD9335_CDC_RX3_RX_VOL_MIX_CTL,
2280+
-84, 40, digital_gain),
2281+
SOC_SINGLE_S8_TLV("RX4 Mix Digital Volume", WCD9335_CDC_RX4_RX_VOL_MIX_CTL,
2282+
-84, 40, digital_gain),
2283+
SOC_SINGLE_S8_TLV("RX5 Mix Digital Volume", WCD9335_CDC_RX5_RX_VOL_MIX_CTL,
2284+
-84, 40, digital_gain),
2285+
SOC_SINGLE_S8_TLV("RX6 Mix Digital Volume", WCD9335_CDC_RX6_RX_VOL_MIX_CTL,
2286+
-84, 40, digital_gain),
2287+
SOC_SINGLE_S8_TLV("RX7 Mix Digital Volume", WCD9335_CDC_RX7_RX_VOL_MIX_CTL,
2288+
-84, 40, digital_gain),
2289+
SOC_SINGLE_S8_TLV("RX8 Mix Digital Volume", WCD9335_CDC_RX8_RX_VOL_MIX_CTL,
2290+
-84, 40, digital_gain),
23002291
SOC_ENUM("RX INT0_1 HPF cut off", cf_int0_1_enum),
23012292
SOC_ENUM("RX INT0_2 HPF cut off", cf_int0_2_enum),
23022293
SOC_ENUM("RX INT1_1 HPF cut off", cf_int1_1_enum),

0 commit comments

Comments
 (0)