diff options
| author | Axel Lin <axel.lin@ingics.com> | 2013-05-09 21:14:20 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-19 11:38:45 -0700 |
| commit | b479773965dec670698dee71667b76453f055df7 (patch) | |
| tree | 075a7fa46907b760a68287299c0da60811863f62 /sound | |
| parent | 99099e169513f16ea40a35653d50c333f4c05d45 (diff) | |
| download | linux-stable-b479773965dec670698dee71667b76453f055df7.tar.gz linux-stable-b479773965dec670698dee71667b76453f055df7.tar.bz2 linux-stable-b479773965dec670698dee71667b76453f055df7.zip | |
ASoC: da7213: Fix setting dmic_samplephase and dmic_clk_rate
commit 61559af111e41761f5f4f20ce0897345eb59076e upstream.
When set dmic_samplephase and dmic_clk_rate bits for dmic_cfg,
current code checks pdata->dmic_data_sel which is wrong.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
| -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) 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; } |