projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'asoc/fix/da7213' into asoc-linus
[firefly-linux-kernel-4.4.55.git]
/
sound
/
soc
/
codecs
/
da7213.c
diff --git
a/sound/soc/codecs/da7213.c
b/sound/soc/codecs/da7213.c
index 41230ad1c3e038e8337c053f5948af2c60745eee..4a6f1daf911fc0685f16ea5f54fe774bc58581ac 100644
(file)
--- a/
sound/soc/codecs/da7213.c
+++ b/
sound/soc/codecs/da7213.c
@@
-1488,17
+1488,17
@@
static int da7213_probe(struct snd_soc_codec *codec)
DA7213_DMIC_DATA_SEL_SHIFT);
break;
}
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:
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;
}
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:
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;
}
DA7213_DMIC_CLK_RATE_SHIFT);
break;
}