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

Merge "asoc: wcd937x: Fix register names and properties"

Browse Source
This commit is contained in:
Linux Build Service Account
2019-01-06 20:27:03 -08:00
committed by Gerrit - the friendly Code Review server
parent becc3cca8d 46ec0f2835
commit 4c11ba0a0f
4 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1063,17 +1063,17 @@ static int wcd937x_codec_enable_dmic(struct snd_soc_dapm_widget *w,
case 0:
case 1:
dmic_clk_cnt = &(wcd937x->dmic_0_1_clk_cnt);
dmic_clk_reg = WCD937X_DIGITAL_CDC_DMIC0_CTL;
dmic_clk_reg = WCD937X_DIGITAL_CDC_DMIC1_CTL;
break;
case 2:
case 3:
dmic_clk_cnt = &(wcd937x->dmic_2_3_clk_cnt);
dmic_clk_reg = WCD937X_DIGITAL_CDC_DMIC1_CTL;
dmic_clk_reg = WCD937X_DIGITAL_CDC_DMIC2_CTL;
break;
case 4:
case 5:
dmic_clk_cnt = &(wcd937x->dmic_4_5_clk_cnt);
dmic_clk_reg = WCD937X_DIGITAL_CDC_DMIC2_CTL;
dmic_clk_reg = WCD937X_DIGITAL_CDC_DMIC3_CTL;
break;
default:
dev_err(component->dev, "%s: Invalid DMIC Selection\n",
@@ -2167,7 +2167,7 @@ static int wcd937x_soc_codec_probe(struct snd_soc_component *component)
wcd937x->component = component;
variant = (snd_soc_component_read32(
component, WCD937X_DIGITAL_EFUSE_REG_0) & 0x0E) >> 1;
component, WCD937X_DIGITAL_EFUSE_REG_0) & 0x1E) >> 1;
wcd937x->variant = variant;
wcd937x->fw_data = devm_kzalloc(component->dev,