diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-14 08:53:19 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-14 08:53:19 -0400 |
| commit | 0335cd6c4f7e8d8d6f2644f5dc8a1028182055de (patch) | |
| tree | 60d143bf2161461e8c81ae8a91cce084d46200bc /sound/soc | |
| parent | f722406faae2d073cc1d01063d1123c35425939e (diff) | |
| parent | 61559af111e41761f5f4f20ce0897345eb59076e (diff) | |
Merge remote-tracking branch 'asoc/fix/da7213' into asoc-linus
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/da7213.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c index 41230ad1c3e0..4a6f1daf911f 100644 --- 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) | |||
| 1488 | DA7213_DMIC_DATA_SEL_SHIFT); | 1488 | DA7213_DMIC_DATA_SEL_SHIFT); |
| 1489 | break; | 1489 | break; |
| 1490 | } | 1490 | } |
| 1491 | switch (pdata->dmic_data_sel) { | 1491 | switch (pdata->dmic_samplephase) { |
| 1492 | case DA7213_DMIC_SAMPLE_ON_CLKEDGE: | 1492 | case DA7213_DMIC_SAMPLE_ON_CLKEDGE: |
| 1493 | case DA7213_DMIC_SAMPLE_BETWEEN_CLKEDGE: | 1493 | case DA7213_DMIC_SAMPLE_BETWEEN_CLKEDGE: |
| 1494 | dmic_cfg |= (pdata->dmic_data_sel << | 1494 | dmic_cfg |= (pdata->dmic_samplephase << |
| 1495 | DA7213_DMIC_SAMPLEPHASE_SHIFT); | 1495 | DA7213_DMIC_SAMPLEPHASE_SHIFT); |
| 1496 | break; | 1496 | break; |
| 1497 | } | 1497 | } |
| 1498 | switch (pdata->dmic_data_sel) { | 1498 | switch (pdata->dmic_clk_rate) { |
| 1499 | case DA7213_DMIC_CLK_3_0MHZ: | 1499 | case DA7213_DMIC_CLK_3_0MHZ: |
| 1500 | case DA7213_DMIC_CLK_1_5MHZ: | 1500 | case DA7213_DMIC_CLK_1_5MHZ: |
| 1501 | dmic_cfg |= (pdata->dmic_data_sel << | 1501 | dmic_cfg |= (pdata->dmic_clk_rate << |
| 1502 | DA7213_DMIC_CLK_RATE_SHIFT); | 1502 | DA7213_DMIC_CLK_RATE_SHIFT); |
| 1503 | break; | 1503 | break; |
| 1504 | } | 1504 | } |