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

audio-kernel: asoc : Upgrade asoc to support 5.10 kernel

Browse Source 
Change-Id: Ia54112cfbde418d66b9314d4ba731928aa057558
Signed-off-by: Jyotirmoi Sarma <jyosarma@codeaurora.org>
This commit is contained in:
Jyotirmoi Sarma
2020-11-26 14:43:13 +05:30
committed by Gerrit - the friendly Code Review server
parent 9fc4437cd8
commit a3d8911945
21 changed files with 166 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
asoc/codecs/wcd937x/wcd937x.c
View File

@@ -969,7 +969,7 @@ static int wcd937x_codec_enable_ear_pa(struct snd_soc_dapm_widget *w,
* depending on mux value
*/
wcd937x->ear_rx_path =
snd_soc_component_read32(
snd_soc_component_read(
component, WCD937X_DIGITAL_CDC_EAR_PATH_CTL);
if (wcd937x->ear_rx_path & EAR_RX_PATH_AUX)
snd_soc_component_update_bits(component,
@@ -1282,7 +1282,7 @@ int wcd937x_mbhc_micb_adjust_voltage(struct snd_soc_component *component,
* momentarily, change the micbias value and then re-enable
* micbias.
*/
micb_val = snd_soc_component_read32(component, micb_reg);
micb_val = snd_soc_component_read(component, micb_reg);
micb_en = (micb_val & 0xC0) >> 6;
cur_vout_ctl = micb_val & 0x3F;
@@ -1332,7 +1332,7 @@ static int wcd937x_tx_swr_ctrl(struct snd_soc_dapm_widget *w,
case SND_SOC_DAPM_PRE_PMU:
if (strnstr(w->name, "ADC", sizeof("ADC"))) {
/* Enable BCS for Headset mic */
if (w->shift == 1 && !(snd_soc_component_read32(component,
if (w->shift == 1 && !(snd_soc_component_read(component,
WCD937X_TX_NEW_TX_CH2_SEL) & 0x80)) {
wcd937x_tx_connect_port(component, MBHC, true);
set_bit(AMIC2_BCS_ENABLE, &wcd937x->status_mask);
@@ -1621,7 +1621,7 @@ static bool get_usbc_hs_status(struct snd_soc_component *component,
struct wcd_mbhc_config *mbhc_cfg)
{
if (mbhc_cfg->enable_usbc_analog) {
if (!(snd_soc_component_read32(component, WCD937X_ANA_MBHC_MECH)
if (!(snd_soc_component_read(component, WCD937X_ANA_MBHC_MECH)
& 0x20))
return true;
}
@@ -1868,7 +1868,7 @@ static int wcd937x_ear_pa_gain_get(struct snd_kcontrol *kcontrol,
struct snd_soc_component *component =
snd_soc_kcontrol_component(kcontrol);
ear_pa_gain = snd_soc_component_read32(component,
ear_pa_gain = snd_soc_component_read(component,
WCD937X_ANA_EAR_COMPANDER_CTL);
ear_pa_gain = (ear_pa_gain & 0x7C) >> 2;
@@ -2739,7 +2739,7 @@ static int wcd937x_soc_codec_probe(struct snd_soc_component *component)
wcd937x->component = component;
snd_soc_component_init_regmap(component, wcd937x->regmap);
variant = (snd_soc_component_read32(
variant = (snd_soc_component_read(
component, WCD937X_DIGITAL_EFUSE_REG_0) & 0x1E) >> 1;
wcd937x->variant = variant;