From 30fad2dc200153ade17ccb17301f2c4d42adb1ac Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Mon, 27 Apr 2020 09:18:27 +0800 Subject: [PATCH] asoc: codec: update SOC_SINGLE_SX_TLV to SOC_SINGLE_S8_TLV Update SOC_SINGLE_SX_TLV to SOC_SINGLE_S8_TLV to make codec driver compatiable with upstream driver. Change-Id: I4061b015d715978f3b294ad630f53b64bf66c2b7 Signed-off-by: Meng Wang --- asoc/codecs/bolero/rx-macro.c | 59 ++++++++-------- asoc/codecs/bolero/tx-macro.c | 64 ++++++++--------- asoc/codecs/bolero/va-macro.c | 48 ++++++------- asoc/codecs/bolero/wsa-macro.c | 8 +-- asoc/codecs/wcd9335.c | 122 ++++++++++++++++----------------- asoc/codecs/wcd934x/wcd934x.c | 106 ++++++++++++++-------------- 6 files changed, 205 insertions(+), 202 deletions(-) diff --git a/asoc/codecs/bolero/rx-macro.c b/asoc/codecs/bolero/rx-macro.c index 62da031f26..ce86f15506 100644 --- a/asoc/codecs/bolero/rx-macro.c +++ b/asoc/codecs/bolero/rx-macro.c @@ -2988,21 +2988,24 @@ static int rx_macro_set_iir_gain(struct snd_soc_dapm_widget *w, } static const struct snd_kcontrol_new rx_macro_snd_controls[] = { - SOC_SINGLE_SX_TLV("RX_RX0 Digital Volume", + SOC_SINGLE_S8_TLV("RX_RX0 Digital Volume", BOLERO_CDC_RX_RX0_RX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("RX_RX1 Digital Volume", + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("RX_RX1 Digital Volume", BOLERO_CDC_RX_RX1_RX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("RX_RX2 Digital Volume", + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("RX_RX2 Digital Volume", BOLERO_CDC_RX_RX2_RX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("RX_RX0 Mix Digital Volume", - BOLERO_CDC_RX_RX0_RX_VOL_MIX_CTL, 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("RX_RX1 Mix Digital Volume", - BOLERO_CDC_RX_RX1_RX_VOL_MIX_CTL, 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("RX_RX2 Mix Digital Volume", - BOLERO_CDC_RX_RX2_RX_VOL_MIX_CTL, 0, -84, 40, digital_gain), + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("RX_RX0 Mix Digital Volume", + BOLERO_CDC_RX_RX0_RX_VOL_MIX_CTL, + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("RX_RX1 Mix Digital Volume", + BOLERO_CDC_RX_RX1_RX_VOL_MIX_CTL, + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("RX_RX2 Mix Digital Volume", + BOLERO_CDC_RX_RX2_RX_VOL_MIX_CTL, + -84, 40, digital_gain), SOC_SINGLE_EXT("RX_COMP1 Switch", SND_SOC_NOPM, RX_MACRO_COMP1, 1, 0, rx_macro_get_compander, rx_macro_set_compander), @@ -3031,29 +3034,29 @@ static const struct snd_kcontrol_new rx_macro_snd_controls[] = { rx_macro_aux_hpf_mode_get, rx_macro_aux_hpf_mode_put), - SOC_SINGLE_SX_TLV("IIR0 INP0 Volume", - BOLERO_CDC_RX_SIDETONE_IIR0_IIR_GAIN_B1_CTL, 0, -84, 40, + SOC_SINGLE_S8_TLV("IIR0 INP0 Volume", + BOLERO_CDC_RX_SIDETONE_IIR0_IIR_GAIN_B1_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("IIR0 INP1 Volume", - BOLERO_CDC_RX_SIDETONE_IIR0_IIR_GAIN_B2_CTL, 0, -84, 40, + SOC_SINGLE_S8_TLV("IIR0 INP1 Volume", + BOLERO_CDC_RX_SIDETONE_IIR0_IIR_GAIN_B2_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("IIR0 INP2 Volume", - BOLERO_CDC_RX_SIDETONE_IIR0_IIR_GAIN_B3_CTL, 0, -84, 40, + SOC_SINGLE_S8_TLV("IIR0 INP2 Volume", + BOLERO_CDC_RX_SIDETONE_IIR0_IIR_GAIN_B3_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("IIR0 INP3 Volume", - BOLERO_CDC_RX_SIDETONE_IIR0_IIR_GAIN_B4_CTL, 0, -84, 40, + SOC_SINGLE_S8_TLV("IIR0 INP3 Volume", + BOLERO_CDC_RX_SIDETONE_IIR0_IIR_GAIN_B4_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("IIR1 INP0 Volume", - BOLERO_CDC_RX_SIDETONE_IIR1_IIR_GAIN_B1_CTL, 0, -84, 40, + SOC_SINGLE_S8_TLV("IIR1 INP0 Volume", + BOLERO_CDC_RX_SIDETONE_IIR1_IIR_GAIN_B1_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("IIR1 INP1 Volume", - BOLERO_CDC_RX_SIDETONE_IIR1_IIR_GAIN_B2_CTL, 0, -84, 40, + SOC_SINGLE_S8_TLV("IIR1 INP1 Volume", + BOLERO_CDC_RX_SIDETONE_IIR1_IIR_GAIN_B2_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("IIR1 INP2 Volume", - BOLERO_CDC_RX_SIDETONE_IIR1_IIR_GAIN_B3_CTL, 0, -84, 40, + SOC_SINGLE_S8_TLV("IIR1 INP2 Volume", + BOLERO_CDC_RX_SIDETONE_IIR1_IIR_GAIN_B3_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("IIR1 INP3 Volume", - BOLERO_CDC_RX_SIDETONE_IIR1_IIR_GAIN_B4_CTL, 0, -84, 40, + SOC_SINGLE_S8_TLV("IIR1 INP3 Volume", + BOLERO_CDC_RX_SIDETONE_IIR1_IIR_GAIN_B4_CTL, -84, 40, digital_gain), SOC_SINGLE_EXT("IIR0 Enable Band1", IIR0, BAND1, 1, 0, diff --git a/asoc/codecs/bolero/tx-macro.c b/asoc/codecs/bolero/tx-macro.c index 2539577678..1178df6c23 100644 --- a/asoc/codecs/bolero/tx-macro.c +++ b/asoc/codecs/bolero/tx-macro.c @@ -2362,18 +2362,18 @@ static const struct snd_soc_dapm_route tx_audio_map[] = { }; static const struct snd_kcontrol_new tx_macro_snd_controls_common[] = { - SOC_SINGLE_SX_TLV("TX_DEC0 Volume", + SOC_SINGLE_S8_TLV("TX_DEC0 Volume", BOLERO_CDC_TX0_TX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("TX_DEC1 Volume", + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("TX_DEC1 Volume", BOLERO_CDC_TX1_TX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("TX_DEC2 Volume", + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("TX_DEC2 Volume", BOLERO_CDC_TX2_TX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("TX_DEC3 Volume", + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("TX_DEC3 Volume", BOLERO_CDC_TX3_TX_VOL_CTL, - 0, -84, 40, digital_gain), + -84, 40, digital_gain), SOC_ENUM_EXT("DEC0 MODE", dec_mode_mux_enum, tx_macro_dec_mode_get, tx_macro_dec_mode_put), @@ -2398,18 +2398,18 @@ static const struct snd_kcontrol_new tx_macro_snd_controls_common[] = { }; static const struct snd_kcontrol_new tx_macro_snd_controls_v3[] = { - SOC_SINGLE_SX_TLV("TX_DEC4 Volume", + SOC_SINGLE_S8_TLV("TX_DEC4 Volume", BOLERO_CDC_TX4_TX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("TX_DEC5 Volume", + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("TX_DEC5 Volume", BOLERO_CDC_TX5_TX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("TX_DEC6 Volume", + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("TX_DEC6 Volume", BOLERO_CDC_TX6_TX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("TX_DEC7 Volume", + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("TX_DEC7 Volume", BOLERO_CDC_TX7_TX_VOL_CTL, - 0, -84, 40, digital_gain), + -84, 40, digital_gain), SOC_ENUM_EXT("DEC4 MODE", dec_mode_mux_enum, tx_macro_dec_mode_get, tx_macro_dec_mode_put), @@ -2425,30 +2425,30 @@ static const struct snd_kcontrol_new tx_macro_snd_controls_v3[] = { }; static const struct snd_kcontrol_new tx_macro_snd_controls[] = { - SOC_SINGLE_SX_TLV("TX_DEC0 Volume", + SOC_SINGLE_S8_TLV("TX_DEC0 Volume", BOLERO_CDC_TX0_TX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("TX_DEC1 Volume", + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("TX_DEC1 Volume", BOLERO_CDC_TX1_TX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("TX_DEC2 Volume", + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("TX_DEC2 Volume", BOLERO_CDC_TX2_TX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("TX_DEC3 Volume", + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("TX_DEC3 Volume", BOLERO_CDC_TX3_TX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("TX_DEC4 Volume", + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("TX_DEC4 Volume", BOLERO_CDC_TX4_TX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("TX_DEC5 Volume", + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("TX_DEC5 Volume", BOLERO_CDC_TX5_TX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("TX_DEC6 Volume", + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("TX_DEC6 Volume", BOLERO_CDC_TX6_TX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("TX_DEC7 Volume", + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("TX_DEC7 Volume", BOLERO_CDC_TX7_TX_VOL_CTL, - 0, -84, 40, digital_gain), + -84, 40, digital_gain), SOC_ENUM_EXT("DEC0 MODE", dec_mode_mux_enum, tx_macro_dec_mode_get, tx_macro_dec_mode_put), diff --git a/asoc/codecs/bolero/va-macro.c b/asoc/codecs/bolero/va-macro.c index a96f14efc1..e83e1139ea 100644 --- a/asoc/codecs/bolero/va-macro.c +++ b/asoc/codecs/bolero/va-macro.c @@ -2533,30 +2533,30 @@ static const struct soc_enum dec_mode_mux_enum = dec_mode_mux_text); static const struct snd_kcontrol_new va_macro_snd_controls[] = { - SOC_SINGLE_SX_TLV("VA_DEC0 Volume", + SOC_SINGLE_S8_TLV("VA_DEC0 Volume", BOLERO_CDC_VA_TX0_TX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("VA_DEC1 Volume", + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("VA_DEC1 Volume", BOLERO_CDC_VA_TX1_TX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("VA_DEC2 Volume", + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("VA_DEC2 Volume", BOLERO_CDC_VA_TX2_TX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("VA_DEC3 Volume", + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("VA_DEC3 Volume", BOLERO_CDC_VA_TX3_TX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("VA_DEC4 Volume", + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("VA_DEC4 Volume", BOLERO_CDC_VA_TX4_TX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("VA_DEC5 Volume", + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("VA_DEC5 Volume", BOLERO_CDC_VA_TX5_TX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("VA_DEC6 Volume", + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("VA_DEC6 Volume", BOLERO_CDC_VA_TX6_TX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("VA_DEC7 Volume", + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("VA_DEC7 Volume", BOLERO_CDC_VA_TX7_TX_VOL_CTL, - 0, -84, 40, digital_gain), + -84, 40, digital_gain), SOC_SINGLE_EXT("LPI Enable", 0, 0, 1, 0, va_macro_lpi_get, va_macro_lpi_put), @@ -2574,23 +2574,23 @@ static const struct snd_kcontrol_new va_macro_snd_controls[] = { }; static const struct snd_kcontrol_new va_macro_snd_controls_common[] = { - SOC_SINGLE_SX_TLV("VA_DEC0 Volume", + SOC_SINGLE_S8_TLV("VA_DEC0 Volume", BOLERO_CDC_VA_TX0_TX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("VA_DEC1 Volume", + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("VA_DEC1 Volume", BOLERO_CDC_VA_TX1_TX_VOL_CTL, - 0, -84, 40, digital_gain), + -84, 40, digital_gain), SOC_SINGLE_EXT("LPI Enable", 0, 0, 1, 0, va_macro_lpi_get, va_macro_lpi_put), }; static const struct snd_kcontrol_new va_macro_snd_controls_v3[] = { - SOC_SINGLE_SX_TLV("VA_DEC2 Volume", + SOC_SINGLE_S8_TLV("VA_DEC2 Volume", BOLERO_CDC_VA_TX2_TX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("VA_DEC3 Volume", + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("VA_DEC3 Volume", BOLERO_CDC_VA_TX3_TX_VOL_CTL, - 0, -84, 40, digital_gain), + -84, 40, digital_gain), }; static int va_macro_validate_dmic_sample_rate(u32 dmic_sample_rate, diff --git a/asoc/codecs/bolero/wsa-macro.c b/asoc/codecs/bolero/wsa-macro.c index 7579957aa4..024b303263 100644 --- a/asoc/codecs/bolero/wsa-macro.c +++ b/asoc/codecs/bolero/wsa-macro.c @@ -2370,12 +2370,12 @@ static const struct snd_kcontrol_new wsa_macro_snd_controls[] = { WSA_MACRO_SOFTCLIP1, 1, 0, wsa_macro_soft_clip_enable_get, wsa_macro_soft_clip_enable_put), - SOC_SINGLE_SX_TLV("WSA_RX0 Digital Volume", + SOC_SINGLE_S8_TLV("WSA_RX0 Digital Volume", BOLERO_CDC_WSA_RX0_RX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("WSA_RX1 Digital Volume", + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("WSA_RX1 Digital Volume", BOLERO_CDC_WSA_RX1_RX_VOL_CTL, - 0, -84, 40, digital_gain), + -84, 40, digital_gain), SOC_SINGLE_EXT("WSA_RX0 Digital Mute", SND_SOC_NOPM, WSA_MACRO_RX0, 1, 0, wsa_macro_get_rx_mute_status, wsa_macro_set_rx_mute_status), diff --git a/asoc/codecs/wcd9335.c b/asoc/codecs/wcd9335.c index 054a56dc3c..cfe328ba8b 100644 --- a/asoc/codecs/wcd9335.c +++ b/asoc/codecs/wcd9335.c @@ -8608,95 +8608,95 @@ static const struct soc_enum amic_pwr_lvl_enum = amic_pwr_lvl_text); static const struct snd_kcontrol_new tasha_snd_controls[] = { - SOC_SINGLE_SX_TLV("RX0 Digital Volume", WCD9335_CDC_RX0_RX_VOL_CTL, - 0, -84, 40, digital_gain), /* -84dB min - 40dB max */ - 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_S8_TLV("RX0 Digital Volume", WCD9335_CDC_RX0_RX_VOL_CTL, + -84, 40, digital_gain), /* -84dB min - 40dB max */ + 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_SX_TLV("RX0 Mix Digital Volume", + SOC_SINGLE_S8_TLV("RX0 Mix Digital Volume", WCD9335_CDC_RX0_RX_VOL_MIX_CTL, - 0, -84, 40, digital_gain), /* -84dB min - 40dB max */ - SOC_SINGLE_SX_TLV("RX1 Mix Digital Volume", + -84, 40, digital_gain), /* -84dB min - 40dB max */ + SOC_SINGLE_S8_TLV("RX1 Mix Digital Volume", WCD9335_CDC_RX1_RX_VOL_MIX_CTL, - 0, -84, 40, digital_gain), /* -84dB min - 40dB max */ - SOC_SINGLE_SX_TLV("RX2 Mix Digital Volume", + -84, 40, digital_gain), /* -84dB min - 40dB max */ + SOC_SINGLE_S8_TLV("RX2 Mix Digital Volume", WCD9335_CDC_RX2_RX_VOL_MIX_CTL, - 0, -84, 40, digital_gain), /* -84dB min - 40dB max */ - SOC_SINGLE_SX_TLV("RX3 Mix Digital Volume", + -84, 40, digital_gain), /* -84dB min - 40dB max */ + SOC_SINGLE_S8_TLV("RX3 Mix Digital Volume", WCD9335_CDC_RX3_RX_VOL_MIX_CTL, - 0, -84, 40, digital_gain), /* -84dB min - 40dB max */ - SOC_SINGLE_SX_TLV("RX4 Mix Digital Volume", + -84, 40, digital_gain), /* -84dB min - 40dB max */ + SOC_SINGLE_S8_TLV("RX4 Mix Digital Volume", WCD9335_CDC_RX4_RX_VOL_MIX_CTL, - 0, -84, 40, digital_gain), /* -84dB min - 40dB max */ - SOC_SINGLE_SX_TLV("RX5 Mix Digital Volume", + -84, 40, digital_gain), /* -84dB min - 40dB max */ + SOC_SINGLE_S8_TLV("RX5 Mix Digital Volume", WCD9335_CDC_RX5_RX_VOL_MIX_CTL, - 0, -84, 40, digital_gain), /* -84dB min - 40dB max */ - SOC_SINGLE_SX_TLV("RX6 Mix Digital Volume", + -84, 40, digital_gain), /* -84dB min - 40dB max */ + SOC_SINGLE_S8_TLV("RX6 Mix Digital Volume", WCD9335_CDC_RX6_RX_VOL_MIX_CTL, - 0, -84, 40, digital_gain), /* -84dB min - 40dB max */ - SOC_SINGLE_SX_TLV("RX7 Mix Digital Volume", + -84, 40, digital_gain), /* -84dB min - 40dB max */ + SOC_SINGLE_S8_TLV("RX7 Mix Digital Volume", WCD9335_CDC_RX7_RX_VOL_MIX_CTL, - 0, -84, 40, digital_gain), /* -84dB min - 40dB max */ - SOC_SINGLE_SX_TLV("RX8 Mix Digital Volume", + -84, 40, digital_gain), /* -84dB min - 40dB max */ + SOC_SINGLE_S8_TLV("RX8 Mix Digital Volume", WCD9335_CDC_RX8_RX_VOL_MIX_CTL, - 0, -84, 40, digital_gain), /* -84dB min - 40dB max */ + -84, 40, digital_gain), /* -84dB min - 40dB max */ - SOC_SINGLE_SX_TLV("DEC0 Volume", WCD9335_CDC_TX0_TX_VOL_CTL, 0, + SOC_SINGLE_S8_TLV("DEC0 Volume", WCD9335_CDC_TX0_TX_VOL_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("DEC1 Volume", WCD9335_CDC_TX1_TX_VOL_CTL, 0, + SOC_SINGLE_S8_TLV("DEC1 Volume", WCD9335_CDC_TX1_TX_VOL_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("DEC2 Volume", WCD9335_CDC_TX2_TX_VOL_CTL, 0, + SOC_SINGLE_S8_TLV("DEC2 Volume", WCD9335_CDC_TX2_TX_VOL_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("DEC3 Volume", WCD9335_CDC_TX3_TX_VOL_CTL, 0, + SOC_SINGLE_S8_TLV("DEC3 Volume", WCD9335_CDC_TX3_TX_VOL_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("DEC4 Volume", WCD9335_CDC_TX4_TX_VOL_CTL, 0, + SOC_SINGLE_S8_TLV("DEC4 Volume", WCD9335_CDC_TX4_TX_VOL_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("DEC5 Volume", WCD9335_CDC_TX5_TX_VOL_CTL, 0, + SOC_SINGLE_S8_TLV("DEC5 Volume", WCD9335_CDC_TX5_TX_VOL_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("DEC6 Volume", WCD9335_CDC_TX6_TX_VOL_CTL, 0, + SOC_SINGLE_S8_TLV("DEC6 Volume", WCD9335_CDC_TX6_TX_VOL_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("DEC7 Volume", WCD9335_CDC_TX7_TX_VOL_CTL, 0, + SOC_SINGLE_S8_TLV("DEC7 Volume", WCD9335_CDC_TX7_TX_VOL_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("DEC8 Volume", WCD9335_CDC_TX8_TX_VOL_CTL, 0, + SOC_SINGLE_S8_TLV("DEC8 Volume", WCD9335_CDC_TX8_TX_VOL_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("IIR0 INP0 Volume", - WCD9335_CDC_SIDETONE_IIR0_IIR_GAIN_B1_CTL, 0, -84, + SOC_SINGLE_S8_TLV("IIR0 INP0 Volume", + WCD9335_CDC_SIDETONE_IIR0_IIR_GAIN_B1_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("IIR0 INP1 Volume", - WCD9335_CDC_SIDETONE_IIR0_IIR_GAIN_B2_CTL, 0, -84, + SOC_SINGLE_S8_TLV("IIR0 INP1 Volume", + WCD9335_CDC_SIDETONE_IIR0_IIR_GAIN_B2_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("IIR0 INP2 Volume", - WCD9335_CDC_SIDETONE_IIR0_IIR_GAIN_B3_CTL, 0, -84, + SOC_SINGLE_S8_TLV("IIR0 INP2 Volume", + WCD9335_CDC_SIDETONE_IIR0_IIR_GAIN_B3_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("IIR0 INP3 Volume", - WCD9335_CDC_SIDETONE_IIR0_IIR_GAIN_B4_CTL, 0, -84, + SOC_SINGLE_S8_TLV("IIR0 INP3 Volume", + WCD9335_CDC_SIDETONE_IIR0_IIR_GAIN_B4_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("IIR1 INP0 Volume", - WCD9335_CDC_SIDETONE_IIR1_IIR_GAIN_B1_CTL, 0, -84, + SOC_SINGLE_S8_TLV("IIR1 INP0 Volume", + WCD9335_CDC_SIDETONE_IIR1_IIR_GAIN_B1_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("IIR1 INP1 Volume", - WCD9335_CDC_SIDETONE_IIR1_IIR_GAIN_B2_CTL, 0, -84, + SOC_SINGLE_S8_TLV("IIR1 INP1 Volume", + WCD9335_CDC_SIDETONE_IIR1_IIR_GAIN_B2_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("IIR1 INP2 Volume", - WCD9335_CDC_SIDETONE_IIR1_IIR_GAIN_B3_CTL, 0, -84, + SOC_SINGLE_S8_TLV("IIR1 INP2 Volume", + WCD9335_CDC_SIDETONE_IIR1_IIR_GAIN_B3_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("IIR1 INP3 Volume", - WCD9335_CDC_SIDETONE_IIR1_IIR_GAIN_B4_CTL, 0, -84, + SOC_SINGLE_S8_TLV("IIR1 INP3 Volume", + WCD9335_CDC_SIDETONE_IIR1_IIR_GAIN_B4_CTL, -84, 40, digital_gain), SOC_SINGLE_EXT("ANC Slot", SND_SOC_NOPM, 0, 100, 0, tasha_get_anc_slot, diff --git a/asoc/codecs/wcd934x/wcd934x.c b/asoc/codecs/wcd934x/wcd934x.c index 4fa5c3414c..3d7d39bb28 100644 --- a/asoc/codecs/wcd934x/wcd934x.c +++ b/asoc/codecs/wcd934x/wcd934x.c @@ -6548,77 +6548,77 @@ static const struct snd_kcontrol_new tavil_snd_controls[] = { SOC_SINGLE_TLV("ADC3 Volume", WCD934X_ANA_AMIC3, 0, 20, 0, analog_gain), SOC_SINGLE_TLV("ADC4 Volume", WCD934X_ANA_AMIC4, 0, 20, 0, analog_gain), - SOC_SINGLE_SX_TLV("RX0 Digital Volume", WCD934X_CDC_RX0_RX_VOL_CTL, - 0, -84, 40, digital_gain), /* -84dB min - 40dB max */ - SOC_SINGLE_SX_TLV("RX1 Digital Volume", WCD934X_CDC_RX1_RX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("RX2 Digital Volume", WCD934X_CDC_RX2_RX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("RX3 Digital Volume", WCD934X_CDC_RX3_RX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("RX4 Digital Volume", WCD934X_CDC_RX4_RX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("RX7 Digital Volume", WCD934X_CDC_RX7_RX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("RX8 Digital Volume", WCD934X_CDC_RX8_RX_VOL_CTL, - 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("RX0 Mix Digital Volume", - WCD934X_CDC_RX0_RX_VOL_MIX_CTL, 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("RX1 Mix Digital Volume", - WCD934X_CDC_RX1_RX_VOL_MIX_CTL, 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("RX2 Mix Digital Volume", - WCD934X_CDC_RX2_RX_VOL_MIX_CTL, 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("RX3 Mix Digital Volume", - WCD934X_CDC_RX3_RX_VOL_MIX_CTL, 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("RX4 Mix Digital Volume", - WCD934X_CDC_RX4_RX_VOL_MIX_CTL, 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("RX7 Mix Digital Volume", - WCD934X_CDC_RX7_RX_VOL_MIX_CTL, 0, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("RX8 Mix Digital Volume", - WCD934X_CDC_RX8_RX_VOL_MIX_CTL, 0, -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("RX0 Digital Volume", WCD934X_CDC_RX0_RX_VOL_CTL, + -84, 40, digital_gain), /* -84dB min - 40dB max */ + SOC_SINGLE_S8_TLV("RX1 Digital Volume", WCD934X_CDC_RX1_RX_VOL_CTL, + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("RX2 Digital Volume", WCD934X_CDC_RX2_RX_VOL_CTL, + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("RX3 Digital Volume", WCD934X_CDC_RX3_RX_VOL_CTL, + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("RX4 Digital Volume", WCD934X_CDC_RX4_RX_VOL_CTL, + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("RX7 Digital Volume", WCD934X_CDC_RX7_RX_VOL_CTL, + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("RX8 Digital Volume", WCD934X_CDC_RX8_RX_VOL_CTL, + -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("RX0 Mix Digital Volume", + WCD934X_CDC_RX0_RX_VOL_MIX_CTL, -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("RX1 Mix Digital Volume", + WCD934X_CDC_RX1_RX_VOL_MIX_CTL, -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("RX2 Mix Digital Volume", + WCD934X_CDC_RX2_RX_VOL_MIX_CTL, -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("RX3 Mix Digital Volume", + WCD934X_CDC_RX3_RX_VOL_MIX_CTL, -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("RX4 Mix Digital Volume", + WCD934X_CDC_RX4_RX_VOL_MIX_CTL, -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("RX7 Mix Digital Volume", + WCD934X_CDC_RX7_RX_VOL_MIX_CTL, -84, 40, digital_gain), + SOC_SINGLE_S8_TLV("RX8 Mix Digital Volume", + WCD934X_CDC_RX8_RX_VOL_MIX_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("DEC0 Volume", WCD934X_CDC_TX0_TX_VOL_CTL, 0, + SOC_SINGLE_S8_TLV("DEC0 Volume", WCD934X_CDC_TX0_TX_VOL_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("DEC1 Volume", WCD934X_CDC_TX1_TX_VOL_CTL, 0, + SOC_SINGLE_S8_TLV("DEC1 Volume", WCD934X_CDC_TX1_TX_VOL_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("DEC2 Volume", WCD934X_CDC_TX2_TX_VOL_CTL, 0, + SOC_SINGLE_S8_TLV("DEC2 Volume", WCD934X_CDC_TX2_TX_VOL_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("DEC3 Volume", WCD934X_CDC_TX3_TX_VOL_CTL, 0, + SOC_SINGLE_S8_TLV("DEC3 Volume", WCD934X_CDC_TX3_TX_VOL_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("DEC4 Volume", WCD934X_CDC_TX4_TX_VOL_CTL, 0, + SOC_SINGLE_S8_TLV("DEC4 Volume", WCD934X_CDC_TX4_TX_VOL_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("DEC5 Volume", WCD934X_CDC_TX5_TX_VOL_CTL, 0, + SOC_SINGLE_S8_TLV("DEC5 Volume", WCD934X_CDC_TX5_TX_VOL_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("DEC6 Volume", WCD934X_CDC_TX6_TX_VOL_CTL, 0, + SOC_SINGLE_S8_TLV("DEC6 Volume", WCD934X_CDC_TX6_TX_VOL_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("DEC7 Volume", WCD934X_CDC_TX7_TX_VOL_CTL, 0, + SOC_SINGLE_S8_TLV("DEC7 Volume", WCD934X_CDC_TX7_TX_VOL_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("DEC8 Volume", WCD934X_CDC_TX8_TX_VOL_CTL, 0, + SOC_SINGLE_S8_TLV("DEC8 Volume", WCD934X_CDC_TX8_TX_VOL_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("IIR0 INP0 Volume", - WCD934X_CDC_SIDETONE_IIR0_IIR_GAIN_B1_CTL, 0, -84, 40, + SOC_SINGLE_S8_TLV("IIR0 INP0 Volume", + WCD934X_CDC_SIDETONE_IIR0_IIR_GAIN_B1_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("IIR0 INP1 Volume", - WCD934X_CDC_SIDETONE_IIR0_IIR_GAIN_B2_CTL, 0, -84, 40, + SOC_SINGLE_S8_TLV("IIR0 INP1 Volume", + WCD934X_CDC_SIDETONE_IIR0_IIR_GAIN_B2_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("IIR0 INP2 Volume", - WCD934X_CDC_SIDETONE_IIR0_IIR_GAIN_B3_CTL, 0, -84, 40, + SOC_SINGLE_S8_TLV("IIR0 INP2 Volume", + WCD934X_CDC_SIDETONE_IIR0_IIR_GAIN_B3_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("IIR0 INP3 Volume", - WCD934X_CDC_SIDETONE_IIR0_IIR_GAIN_B4_CTL, 0, -84, 40, + SOC_SINGLE_S8_TLV("IIR0 INP3 Volume", + WCD934X_CDC_SIDETONE_IIR0_IIR_GAIN_B4_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("IIR1 INP0 Volume", - WCD934X_CDC_SIDETONE_IIR1_IIR_GAIN_B1_CTL, 0, -84, 40, + SOC_SINGLE_S8_TLV("IIR1 INP0 Volume", + WCD934X_CDC_SIDETONE_IIR1_IIR_GAIN_B1_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("IIR1 INP1 Volume", - WCD934X_CDC_SIDETONE_IIR1_IIR_GAIN_B2_CTL, 0, -84, 40, + SOC_SINGLE_S8_TLV("IIR1 INP1 Volume", + WCD934X_CDC_SIDETONE_IIR1_IIR_GAIN_B2_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("IIR1 INP2 Volume", - WCD934X_CDC_SIDETONE_IIR1_IIR_GAIN_B3_CTL, 0, -84, 40, + SOC_SINGLE_S8_TLV("IIR1 INP2 Volume", + WCD934X_CDC_SIDETONE_IIR1_IIR_GAIN_B3_CTL, -84, 40, digital_gain), - SOC_SINGLE_SX_TLV("IIR1 INP3 Volume", - WCD934X_CDC_SIDETONE_IIR1_IIR_GAIN_B4_CTL, 0, -84, 40, + SOC_SINGLE_S8_TLV("IIR1 INP3 Volume", + WCD934X_CDC_SIDETONE_IIR1_IIR_GAIN_B4_CTL, -84, 40, digital_gain), SOC_SINGLE_EXT("ANC Slot", SND_SOC_NOPM, 0, 100, 0, tavil_get_anc_slot,