samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asoc: codecs: Add RX 6,7,8 to WSA Macro

Browse Source 
Add new lpass RX paths. Needed to fix
WSA ADIE Loopback.
Update DAPM enum length to include these RXs.

Change-Id: Ie174cfab20b8beb103eefa94636e76ad756c7345
Signed-off-by: Matthew Rice <quic_mrice@quicinc.com>
This commit is contained in:
Matthew Rice
2022-03-09 21:26:28 -08:00
committed by Gerrit - the friendly Code Review server
parent cb778a4ecd
commit f5d8dd3262
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
asoc/codecs/lpass-cdc/lpass-cdc-wsa-macro.c
View File

@@ -72,6 +72,9 @@ enum {
LPASS_CDC_WSA_MACRO_RX_MIX1,
LPASS_CDC_WSA_MACRO_RX4,
LPASS_CDC_WSA_MACRO_RX5,
LPASS_CDC_WSA_MACRO_RX6,
LPASS_CDC_WSA_MACRO_RX7,
LPASS_CDC_WSA_MACRO_RX8,
LPASS_CDC_WSA_MACRO_RX_MAX,
};
@@ -342,11 +345,12 @@ static struct snd_soc_dai_driver lpass_cdc_wsa_macro_dai[];
static const DECLARE_TLV_DB_SCALE(digital_gain, 0, 1, 0);
static const char *const rx_text[] = {
"ZERO", "RX0", "RX1", "RX_MIX0", "RX_MIX1", "RX4", "RX5", "DEC0", "DEC1"
"ZERO", "RX0", "RX1", "RX_MIX0", "RX_MIX1", "RX4",
"RX5", "RX6", "RX7", "RX8", "DEC0", "DEC1"
};
static const char *const rx_mix_text[] = {
"ZERO", "RX0", "RX1", "RX_MIX0", "RX_MIX1", "RX4", "RX5",
"ZERO", "RX0", "RX1", "RX_MIX0", "RX_MIX1", "RX4", "RX5", "RX6", "RX7", "RX8"
};
static const char *const rx_mix_ec_text[] = {
@@ -397,19 +401,19 @@ static SOC_ENUM_SINGLE_EXT_DECL(idle_detect_enum, idle_detect_text);
/* RX INT0 */
static const struct soc_enum rx0_prim_inp0_chain_enum =
SOC_ENUM_SINGLE(LPASS_CDC_WSA_RX_INP_MUX_RX_INT0_CFG0,
0, 9, rx_text);
0, 12, rx_text);
static const struct soc_enum rx0_prim_inp1_chain_enum =
SOC_ENUM_SINGLE(LPASS_CDC_WSA_RX_INP_MUX_RX_INT0_CFG0,
3, 9, rx_text);
3, 12, rx_text);
static const struct soc_enum rx0_prim_inp2_chain_enum =
SOC_ENUM_SINGLE(LPASS_CDC_WSA_RX_INP_MUX_RX_INT0_CFG1,
3, 9, rx_text);
3, 12, rx_text);
static const struct soc_enum rx0_mix_chain_enum =
SOC_ENUM_SINGLE(LPASS_CDC_WSA_RX_INP_MUX_RX_INT0_CFG1,
0, 7, rx_mix_text);
0, 10, rx_mix_text);
static const struct soc_enum rx0_sidetone_mix_enum =
SOC_ENUM_SINGLE(SND_SOC_NOPM, 0, 2, rx_sidetone_mix_text);
@@ -432,19 +436,19 @@ static const struct snd_kcontrol_new rx0_sidetone_mix_mux =
/* RX INT1 */
static const struct soc_enum rx1_prim_inp0_chain_enum =
SOC_ENUM_SINGLE(LPASS_CDC_WSA_RX_INP_MUX_RX_INT1_CFG0,
0, 9, rx_text);
0, 12, rx_text);
static const struct soc_enum rx1_prim_inp1_chain_enum =
SOC_ENUM_SINGLE(LPASS_CDC_WSA_RX_INP_MUX_RX_INT1_CFG0,
3, 9, rx_text);
3, 12, rx_text);
static const struct soc_enum rx1_prim_inp2_chain_enum =
SOC_ENUM_SINGLE(LPASS_CDC_WSA_RX_INP_MUX_RX_INT1_CFG1,
3, 9, rx_text);
3, 12, rx_text);
static const struct soc_enum rx1_mix_chain_enum =
SOC_ENUM_SINGLE(LPASS_CDC_WSA_RX_INP_MUX_RX_INT1_CFG1,
0, 7, rx_mix_text);
0, 10, rx_mix_text);
static const struct snd_kcontrol_new rx1_prim_inp0_mux =
SOC_DAPM_ENUM("WSA_RX1 INP0 Mux", rx1_prim_inp0_chain_enum);