aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorAndreas Blaesius <skate4life@gmx.de>2016-04-24 12:09:28 +0200
committerAndreas Blaesius <skate4life@gmx.de>2016-04-30 19:29:14 +0200
commit91efd4588c2e6fd397ed85c0434379a2ea40dcd9 (patch)
treebf9caeb3716f7944328c4b4f9d35f91a46223b2d /sound
parentcda13403633be4d5d2e94a1f05aa65e5bda2413c (diff)
downloadkernel_samsung_espresso10-91efd4588c2e6fd397ed85c0434379a2ea40dcd9.zip
kernel_samsung_espresso10-91efd4588c2e6fd397ed85c0434379a2ea40dcd9.tar.gz
kernel_samsung_espresso10-91efd4588c2e6fd397ed85c0434379a2ea40dcd9.tar.bz2
[espresso] Revert "ASoC: wm8994: Ensure there are enough BCLKs for four channels" for espresso
This reverts commit 3b6ae1807d29f8cacd63fddf513110f9308b4c8e.
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8994.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index b637275..cd63506 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -2761,7 +2761,11 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream,
return -EINVAL;
}
+#ifdef CONFIG_MACH_OMAP4_ESPRESSO
+ bclk_rate = params_rate(params) * 2;
+#else
bclk_rate = params_rate(params) * 4;
+#endif
switch (params_format(params)) {
case SNDRV_PCM_FORMAT_S16_LE:
bclk_rate *= 16;