aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-09-30 17:18:48 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-09-30 17:55:28 -0400
commitd330a080a87831b693a2dad1058cd11bbb6c3736 (patch)
tree42ba0b3ef156a0eda28c0bdc4cc3dd582d4af27e
parent33cf45c80f7dc96ff228387add4474b14ff5e1e2 (diff)
ASoC: Relax restrictions on WM8962 BCLK configuration
The restrictions on configuring BCLK are overly cautious, other constraints in the system should ensure that reconfiguration is not possible when the device is sufficiently active to be unable to support reclocking. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
-rw-r--r--sound/soc/codecs/wm8962.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index be34146a775b..38cbf85688f6 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -911,12 +911,6 @@ static void wm8962_configure_bclk(struct snd_soc_codec *codec)
911 int clocking2 = 0; 911 int clocking2 = 0;
912 int aif2 = 0; 912 int aif2 = 0;
913 913
914 /* If the CODEC is powered on we can configure BCLK */
915 if (codec->bias_level != SND_SOC_BIAS_OFF) {
916 dev_dbg(codec->dev, "Bias is off, can't configure BCLK\n");
917 return;
918 }
919
920 if (!wm8962->bclk) { 914 if (!wm8962->bclk) {
921 dev_dbg(codec->dev, "No BCLK rate configured\n"); 915 dev_dbg(codec->dev, "No BCLK rate configured\n");
922 return; 916 return;