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

Merge "asoc: bolero: Update rx dc droop register setting"

Browse Source
This commit is contained in:
qctecmdr
2020-06-01 10:27:01 -07:00
committed by Gerrit - the friendly Code Review server
parent 623f781597 06f7fcd942
commit 9255140167
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
asoc/codecs/bolero/rx-macro.c
View File

@@ -1709,13 +1709,6 @@ static int rx_macro_config_compander(struct snd_soc_component *component,
dev_dbg(component->dev, "%s: event %d compander %d, enabled %d\n",
__func__, event, comp + 1, rx_priv->comp_enabled[comp]);
if (!rx_priv->comp_enabled[comp])
return 0;
comp_ctl0_reg = BOLERO_CDC_RX_COMPANDER0_CTL0 +
(comp * RX_MACRO_COMP_OFFSET);
rx_path_cfg0_reg = BOLERO_CDC_RX_RX0_RX_PATH_CFG0 +
(comp * RX_MACRO_RX_PATH_OFFSET);
rx_path_cfg3_reg = BOLERO_CDC_RX_RX0_RX_PATH_CFG3 +
(comp * RX_MACRO_RX_PATH_OFFSET);
rx0_path_ctl_reg = BOLERO_CDC_RX_RX0_RX_PATH_CTL +
@@ -1731,6 +1724,19 @@ static int rx_macro_config_compander(struct snd_soc_component *component,
else
val = 0x00;
if (SND_SOC_DAPM_EVENT_ON(event))
snd_soc_component_update_bits(component, rx_path_cfg3_reg,
0x03, val);
if (SND_SOC_DAPM_EVENT_OFF(event))
snd_soc_component_update_bits(component, rx_path_cfg3_reg,
0x03, 0x03);
if (!rx_priv->comp_enabled[comp])
return 0;
comp_ctl0_reg = BOLERO_CDC_RX_COMPANDER0_CTL0 +
(comp * RX_MACRO_COMP_OFFSET);
rx_path_cfg0_reg = BOLERO_CDC_RX_RX0_RX_PATH_CFG0 +
(comp * RX_MACRO_RX_PATH_OFFSET);
if (SND_SOC_DAPM_EVENT_ON(event)) {
/* Enable Compander Clock */
snd_soc_component_update_bits(component, comp_ctl0_reg,
@@ -1741,8 +1747,6 @@ static int rx_macro_config_compander(struct snd_soc_component *component,
0x02, 0x00);
snd_soc_component_update_bits(component, rx_path_cfg0_reg,
0x02, 0x02);
snd_soc_component_update_bits(component, rx_path_cfg3_reg,
0x03, val);
}
if (SND_SOC_DAPM_EVENT_OFF(event)) {
@@ -1754,8 +1758,6 @@ static int rx_macro_config_compander(struct snd_soc_component *component,
0x01, 0x00);
snd_soc_component_update_bits(component, comp_ctl0_reg,
0x04, 0x00);
snd_soc_component_update_bits(component, rx_path_cfg3_reg,
0x03, 0x03);
}
return 0;