mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-15 16:24:13 +08:00
Merge remote-tracking branch 'asoc/fix/da7213' into asoc-linus
This commit is contained in:
commit
0335cd6c4f
@ -1488,17 +1488,17 @@ static int da7213_probe(struct snd_soc_codec *codec)
|
||||
DA7213_DMIC_DATA_SEL_SHIFT);
|
||||
break;
|
||||
}
|
||||
switch (pdata->dmic_data_sel) {
|
||||
switch (pdata->dmic_samplephase) {
|
||||
case DA7213_DMIC_SAMPLE_ON_CLKEDGE:
|
||||
case DA7213_DMIC_SAMPLE_BETWEEN_CLKEDGE:
|
||||
dmic_cfg |= (pdata->dmic_data_sel <<
|
||||
dmic_cfg |= (pdata->dmic_samplephase <<
|
||||
DA7213_DMIC_SAMPLEPHASE_SHIFT);
|
||||
break;
|
||||
}
|
||||
switch (pdata->dmic_data_sel) {
|
||||
switch (pdata->dmic_clk_rate) {
|
||||
case DA7213_DMIC_CLK_3_0MHZ:
|
||||
case DA7213_DMIC_CLK_1_5MHZ:
|
||||
dmic_cfg |= (pdata->dmic_data_sel <<
|
||||
dmic_cfg |= (pdata->dmic_clk_rate <<
|
||||
DA7213_DMIC_CLK_RATE_SHIFT);
|
||||
break;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user