asoc: codecs: Update WSA2 Macro to Match WSA Macro

Propagate all changes to lpass-cdc-wsa-macro to
lpass-cdc-wsa2-macro. Leave get_channel_map alone
because it is wsa macro specific.

Change-Id: I46733a759490d488f46eda24b4006a1dec63c7cc
Signed-off-by: Matthew Rice <quic_mrice@quicinc.com>
This commit is contained in:
Matthew Rice
2022-05-06 19:26:42 -07:00
parent 68469d7946
commit c3cddd0b43
2 changed files with 560 additions and 95 deletions

View File

@@ -1700,14 +1700,14 @@ static void lpass_cdc_macro_idle_detect_control(struct snd_soc_component *compon
if (reg && SND_SOC_DAPM_EVENT_ON(event)) {
snd_soc_component_update_bits(component, reg, mask, val);
dev_dbg(component->dev, "%s: Idle detect clks ON \n", __func__);
dev_dbg(component->dev, "%s: Idle detect clks ON\n", __func__);
}
if (reg && SND_SOC_DAPM_EVENT_OFF(event)) {
snd_soc_component_update_bits(component, reg, mask, 0x00);
snd_soc_component_write(component,
LPASS_CDC_WSA_IDLE_DETECT_CFG3, 0x0);
dev_dbg(component->dev, "%s: Idle detect clks OFF \n", __func__);
dev_dbg(component->dev, "%s: Idle detect clks OFF\n", __func__);
}
}
@@ -1786,7 +1786,7 @@ static int lpass_cdc_wsa_macro_enable_interpolator(struct snd_soc_dapm_widget *w
break;
case SND_SOC_DAPM_POST_PMD:
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_RX0_RX_PATH_CFG1, 0x08, 0x08);
LPASS_CDC_WSA_RX0_RX_PATH_CFG1, 0x08, 0x08);
lpass_cdc_wsa_macro_config_compander(component, w->shift, event);
lpass_cdc_macro_idle_detect_control(component, wsa_priv,
w->shift, event);
@@ -3752,7 +3752,7 @@ static int lpass_cdc_wsa_macro_probe(struct platform_device *pdev)
__func__, "qcom,noise-gate-mode");
wsa_priv->noise_gate_mode = IDLE_DETECT;
} else {
if (IDLE_DETECT <= noise_gate_mode && noise_gate_mode <= NG3)
if (noise_gate_mode >= IDLE_DETECT && noise_gate_mode <= NG3)
wsa_priv->noise_gate_mode = noise_gate_mode;
else
wsa_priv->noise_gate_mode = IDLE_DETECT;