diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2010-01-29 15:31:06 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-29 15:32:52 +0100 |
commit | b2c3e923110f6ca60ccb30cf4a6bda5211454c4f (patch) | |
tree | a49311b0231b3887122ec23771a7b32b54f37bd7 /sound/soc/sh/migor.c | |
parent | Merge branch 'for-2.6.33' into for-2.6.34 (diff) | |
download | linux-b2c3e923110f6ca60ccb30cf4a6bda5211454c4f.tar.xz linux-b2c3e923110f6ca60ccb30cf4a6bda5211454c4f.zip |
ASoC: clean up wm8974 and wm8978 clock divider handling
wm8974 and wm8978 codec drivers control DAC and ADC oversampling rates in their
.set_clkdiv() methods, which is wrong, because these are simple boolean
switches and not clock dividers. Move these bits to sound controls. Also remove
manual configuration of the MCLK divider in wm8978, since it is configured
automatically.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/sh/migor.c')
-rw-r--r-- | sound/soc/sh/migor.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/sh/migor.c b/sound/soc/sh/migor.c index 3ccd9b393312..b823a5c9b9bc 100644 --- a/sound/soc/sh/migor.c +++ b/sound/soc/sh/migor.c @@ -59,10 +59,6 @@ static int migor_hw_params(struct snd_pcm_substream *substream, if (ret < 0) return ret; - ret = snd_soc_dai_set_clkdiv(codec_dai, WM8978_DACCLK, 8); - if (ret < 0) - return ret; - ret = snd_soc_dai_set_clkdiv(codec_dai, WM8978_OPCLKRATE, rate * 512); if (ret < 0) return ret; |