| commit | 586bf84f30ad70f6bf4efb6947109ca777e31faa | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Tue Dec 17 02:54:21 2013 -0800 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Tue Dec 17 02:54:20 2013 -0800 |
| tree | d27d3a3ab59c267950f45d81ffd5ec370d11c584 | |
| parent | b268b4d2071aa418381543732358a0213b8e021a [diff] | |
| parent | d75ed0193f86f8360a7339e6a67209f9fc012afa [diff] |
Merge "ASoC: msm8x10-wcd: Fix bug in DMIC configuration"
diff --git a/sound/soc/codecs/msm8x10-wcd.c b/sound/soc/codecs/msm8x10-wcd.c index 55fec32..1962ff0 100644 --- a/sound/soc/codecs/msm8x10-wcd.c +++ b/sound/soc/codecs/msm8x10-wcd.c
@@ -1396,7 +1396,10 @@ switch (decimator) { case 1: case 2: - adc_dmic_sel = 0x0; + if ((dec_mux == 3) || (dec_mux == 4)) + adc_dmic_sel = 0x1; + else + adc_dmic_sel = 0x0; break; default: dev_err(codec->dev, "%s: Invalid Decimator = %u\n",