Skip to content

L
linux
Commit 0335cd6c authored by Mark Brown's avatar Mark Brown
Browse files
Options

Merge remote-tracking branch 'asoc/fix/da7213' into asoc-linus

parents f722406f 61559af1
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
sound/soc/codecs/da7213.c
View file @ 0335cd6c
...@@ -1488,17 +1488,17 @@ static int da7213_probe(struct snd_soc_codec *codec) ...@@ -1488,17 +1488,17 @@ static int da7213_probe(struct snd_soc_codec *codec)
DA7213_DMIC_DATA_SEL_SHIFT); DA7213_DMIC_DATA_SEL_SHIFT);
break; break;
} }
switch (pdata->dmic_data_sel) { switch (pdata->dmic_samplephase) {
case DA7213_DMIC_SAMPLE_ON_CLKEDGE: case DA7213_DMIC_SAMPLE_ON_CLKEDGE:
case DA7213_DMIC_SAMPLE_BETWEEN_CLKEDGE: case DA7213_DMIC_SAMPLE_BETWEEN_CLKEDGE:
dmic_cfg |= (pdata->dmic_data_sel << dmic_cfg |= (pdata->dmic_samplephase <<
DA7213_DMIC_SAMPLEPHASE_SHIFT); DA7213_DMIC_SAMPLEPHASE_SHIFT);
break; break;
} }
switch (pdata->dmic_data_sel) { switch (pdata->dmic_clk_rate) {
case DA7213_DMIC_CLK_3_0MHZ: case DA7213_DMIC_CLK_3_0MHZ:
case DA7213_DMIC_CLK_1_5MHZ: case DA7213_DMIC_CLK_1_5MHZ:
dmic_cfg |= (pdata->dmic_data_sel << dmic_cfg |= (pdata->dmic_clk_rate <<
DA7213_DMIC_CLK_RATE_SHIFT); DA7213_DMIC_CLK_RATE_SHIFT);
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7