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

Merge "lpass-cdc: apply digital unmute after PA is enabled"

Browse Source
This commit is contained in:
qctecmdr
2022-07-12 16:14:47 -07:00
committed by Gerrit - the friendly Code Review server
parent aee4a55108 35ae7a451e
commit dd26499468
2 changed files with 203 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,6 +201,7 @@ static int lpass_cdc_wsa_macro_mute_stream(struct snd_soc_dai *dai, int mute, in
struct lpass_cdc_wsa_macro_swr_ctrl_data {
struct platform_device *wsa_swr_pdev;
};
static int lpass_cdc_wsa_macro_enable_vi_decimator(struct snd_soc_component *component);
#define LPASS_CDC_WSA_MACRO_SET_VOLUME_TLV(xname, xreg, xmin, xmax, tlv_array) \
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
@@ -871,6 +872,26 @@ static int lpass_cdc_wsa_macro_get_channel_map(struct snd_soc_dai *dai,
return 0;
}
static void lpass_cdc_wsa_unmute_interpolator(struct snd_soc_dai *dai)
{
struct snd_soc_component *component = dai->component;
uint16_t j = 0, reg = 0, mix_reg = 0;
switch (dai->id) {
case LPASS_CDC_WSA_MACRO_AIF1_PB:
case LPASS_CDC_WSA_MACRO_AIF_MIX1_PB:
for (j = 0; j < NUM_INTERPOLATORS; ++j) {
reg = LPASS_CDC_WSA_RX0_RX_PATH_CTL +
(j * LPASS_CDC_WSA_MACRO_RX_PATH_OFFSET);
mix_reg = LPASS_CDC_WSA_RX0_RX_PATH_MIX_CTL +
(j * LPASS_CDC_WSA_MACRO_RX_PATH_OFFSET);
snd_soc_component_update_bits(component, reg, 0x10, 0x00);
snd_soc_component_update_bits(component, mix_reg, 0x10, 0x00);
}
}
}
static int lpass_cdc_wsa_macro_mute_stream(struct snd_soc_dai *dai, int mute, int stream)
{
struct snd_soc_component *component = dai->component;
@@ -917,6 +938,8 @@ static int lpass_cdc_wsa_macro_mute_stream(struct snd_soc_dai *dai, int mute, in
}
}
lpass_cdc_wsa_pa_on(wsa_dev, adie_lb);
lpass_cdc_wsa_unmute_interpolator(dai);
lpass_cdc_wsa_macro_enable_vi_decimator(component);
break;
default:
break;
@@ -1081,12 +1104,8 @@ static int lpass_cdc_wsa_macro_event_handler(struct snd_soc_component *component
return 0;
}
static int lpass_cdc_wsa_macro_enable_vi_feedback(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol,
int event)
static int lpass_cdc_wsa_macro_enable_vi_decimator(struct snd_soc_component *component)
{
struct snd_soc_component *component =
snd_soc_dapm_to_component(w->dapm);
struct device *wsa_dev = NULL;
struct lpass_cdc_wsa_macro_priv *wsa_priv = NULL;
u8 val = 0x0;
@@ -1094,6 +1113,8 @@ static int lpass_cdc_wsa_macro_enable_vi_feedback(struct snd_soc_dapm_widget *w,
if (!lpass_cdc_wsa_macro_get_data(component, &wsa_dev, &wsa_priv, __func__))
return -EINVAL;
usleep_range(5000, 5500);
dev_dbg(wsa_dev, "%s: wsa_priv->pcm_rate_vi %d\n", __func__, wsa_priv->pcm_rate_vi);
switch (wsa_priv->pcm_rate_vi) {
case 48000:
val = 0x04;
@@ -1107,67 +1128,80 @@ static int lpass_cdc_wsa_macro_enable_vi_feedback(struct snd_soc_dapm_widget *w,
break;
}
if (test_bit(LPASS_CDC_WSA_MACRO_TX0,
&wsa_priv->active_ch_mask[LPASS_CDC_WSA_MACRO_AIF_VI])) {
dev_dbg(wsa_dev, "%s: spkr1 enabled\n", __func__);
/* Enable V&I sensing */
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX0_SPKR_PROT_PATH_CTL,
0x20, 0x20);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX1_SPKR_PROT_PATH_CTL,
0x20, 0x20);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX0_SPKR_PROT_PATH_CTL,
0x0F, val);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX1_SPKR_PROT_PATH_CTL,
0x0F, val);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX0_SPKR_PROT_PATH_CTL,
0x10, 0x10);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX1_SPKR_PROT_PATH_CTL,
0x10, 0x10);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX0_SPKR_PROT_PATH_CTL,
0x20, 0x00);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX1_SPKR_PROT_PATH_CTL,
0x20, 0x00);
}
if (test_bit(LPASS_CDC_WSA_MACRO_TX1,
&wsa_priv->active_ch_mask[LPASS_CDC_WSA_MACRO_AIF_VI])) {
dev_dbg(wsa_dev, "%s: spkr2 enabled\n", __func__);
/* Enable V&I sensing */
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX2_SPKR_PROT_PATH_CTL,
0x20, 0x20);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX3_SPKR_PROT_PATH_CTL,
0x20, 0x20);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX2_SPKR_PROT_PATH_CTL,
0x0F, val);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX3_SPKR_PROT_PATH_CTL,
0x0F, val);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX2_SPKR_PROT_PATH_CTL,
0x10, 0x10);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX3_SPKR_PROT_PATH_CTL,
0x10, 0x10);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX2_SPKR_PROT_PATH_CTL,
0x20, 0x00);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX3_SPKR_PROT_PATH_CTL,
0x20, 0x00);
}
return 0;
}
static int lpass_cdc_wsa_macro_disable_vi_feedback(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol,
int event)
{
struct snd_soc_component *component =
snd_soc_dapm_to_component(w->dapm);
struct device *wsa_dev = NULL;
struct lpass_cdc_wsa_macro_priv *wsa_priv = NULL;
if (!lpass_cdc_wsa_macro_get_data(component, &wsa_dev, &wsa_priv, __func__))
return -EINVAL;
switch (event) {
case SND_SOC_DAPM_POST_PMU:
if (test_bit(LPASS_CDC_WSA_MACRO_TX0,
&wsa_priv->active_ch_mask[LPASS_CDC_WSA_MACRO_AIF_VI])) {
dev_dbg(wsa_dev, "%s: spkr1 enabled\n", __func__);
/* Enable V&I sensing */
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX0_SPKR_PROT_PATH_CTL,
0x20, 0x20);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX1_SPKR_PROT_PATH_CTL,
0x20, 0x20);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX0_SPKR_PROT_PATH_CTL,
0x0F, val);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX1_SPKR_PROT_PATH_CTL,
0x0F, val);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX0_SPKR_PROT_PATH_CTL,
0x10, 0x10);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX1_SPKR_PROT_PATH_CTL,
0x10, 0x10);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX0_SPKR_PROT_PATH_CTL,
0x20, 0x00);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX1_SPKR_PROT_PATH_CTL,
0x20, 0x00);
}
if (test_bit(LPASS_CDC_WSA_MACRO_TX1,
&wsa_priv->active_ch_mask[LPASS_CDC_WSA_MACRO_AIF_VI])) {
dev_dbg(wsa_dev, "%s: spkr2 enabled\n", __func__);
/* Enable V&I sensing */
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX2_SPKR_PROT_PATH_CTL,
0x20, 0x20);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX3_SPKR_PROT_PATH_CTL,
0x20, 0x20);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX2_SPKR_PROT_PATH_CTL,
0x0F, val);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX3_SPKR_PROT_PATH_CTL,
0x0F, val);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX2_SPKR_PROT_PATH_CTL,
0x10, 0x10);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX3_SPKR_PROT_PATH_CTL,
0x10, 0x10);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX2_SPKR_PROT_PATH_CTL,
0x20, 0x00);
snd_soc_component_update_bits(component,
LPASS_CDC_WSA_TX3_SPKR_PROT_PATH_CTL,
0x20, 0x00);
}
break;
case SND_SOC_DAPM_POST_PMD:
if (test_bit(LPASS_CDC_WSA_MACRO_TX0,
&wsa_priv->active_ch_mask[LPASS_CDC_WSA_MACRO_AIF_VI])) {
@@ -1849,20 +1883,15 @@ static int lpass_cdc_wsa_macro_spk_boost_event(struct snd_soc_dapm_widget *w,
struct snd_soc_component *component =
snd_soc_dapm_to_component(w->dapm);
u16 boost_path_ctl, boost_path_cfg1;
u16 reg, reg_mix;
dev_dbg(component->dev, "%s %s %d\n", __func__, w->name, event);
if (!strcmp(w->name, "WSA_RX INT0 CHAIN")) {
boost_path_ctl = LPASS_CDC_WSA_BOOST0_BOOST_PATH_CTL;
boost_path_cfg1 = LPASS_CDC_WSA_RX0_RX_PATH_CFG1;
reg = LPASS_CDC_WSA_RX0_RX_PATH_CTL;
reg_mix = LPASS_CDC_WSA_RX0_RX_PATH_MIX_CTL;
} else if (!strcmp(w->name, "WSA_RX INT1 CHAIN")) {
boost_path_ctl = LPASS_CDC_WSA_BOOST1_BOOST_PATH_CTL;
boost_path_cfg1 = LPASS_CDC_WSA_RX1_RX_PATH_CFG1;
reg = LPASS_CDC_WSA_RX1_RX_PATH_CTL;
reg_mix = LPASS_CDC_WSA_RX1_RX_PATH_MIX_CTL;
} else {
dev_err_ratelimited(component->dev, "%s: unknown widget: %s\n",
__func__, w->name);
@@ -1875,12 +1904,8 @@ static int lpass_cdc_wsa_macro_spk_boost_event(struct snd_soc_dapm_widget *w,
0x01, 0x01);
snd_soc_component_update_bits(component, boost_path_ctl,
0x10, 0x10);
if ((snd_soc_component_read(component, reg_mix)) & 0x10)
snd_soc_component_update_bits(component, reg_mix,
0x10, 0x00);
break;
case SND_SOC_DAPM_POST_PMU:
snd_soc_component_update_bits(component, reg, 0x10, 0x00);
break;
case SND_SOC_DAPM_POST_PMD:
snd_soc_component_update_bits(component, boost_path_ctl,
@@ -2854,8 +2879,8 @@ static const struct snd_soc_dapm_widget lpass_cdc_wsa_macro_dapm_widgets[] = {
SND_SOC_DAPM_AIF_OUT_E("WSA AIF_VI", "WSA_AIF_VI Capture", 0,
SND_SOC_NOPM, LPASS_CDC_WSA_MACRO_AIF_VI, 0,
lpass_cdc_wsa_macro_enable_vi_feedback,
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
lpass_cdc_wsa_macro_disable_vi_feedback,
SND_SOC_DAPM_POST_PMD),
SND_SOC_DAPM_AIF_OUT("WSA AIF_ECHO", "WSA_AIF_ECHO Capture", 0,
SND_SOC_NOPM, 0, 0),