A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-13 00:00:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "ASoC: rx-macro: Update rx droop based on sampling rate" into audio-drivers.lnx.4.0

Browse source
This commit is contained in:
Linux Build Service Account 2019-11-24 23:58:15 -08:00 • committed by Gerrit - the friendly Code Review server
commit 1e4e99502b
1 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
asoc/codecs/bolero/rx-macro.c
View file

@ -1665,7 +1665,9 @@ static int rx_macro_config_compander(struct snd_soc_component *component,
int interp_n, int event)
{
int comp = 0;
u16 comp_ctl0_reg = 0, rx_path_cfg0_reg = 0;
u16 comp_ctl0_reg = 0, rx_path_cfg0_reg = 0, rx_path_cfg3_reg = 0;
u16 rx0_path_ctl_reg = 0;
u8 pcm_rate = 0, val = 0;
/* AUX does not have compander */
if (interp_n == INTERP_AUX)
@ -1682,6 +1684,20 @@ static int rx_macro_config_compander(struct snd_soc_component *component,
(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 +
(comp * RX_MACRO_RX_PATH_OFFSET);
pcm_rate = (snd_soc_component_read32(component, rx0_path_ctl_reg)
& 0x0F);
if (pcm_rate < 0x06)
val = 0x03;
else if (pcm_rate < 0x08)
val = 0x01;
else if (pcm_rate < 0x0B)
val = 0x02;
else
val = 0x00;
if (SND_SOC_DAPM_EVENT_ON(event)) {
/* Enable Compander Clock */
@ -1693,6 +1709,8 @@ 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)) {
@ -1704,6 +1722,8 @@ 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;