ASoC: Remove redundant WM8960 SYSCLKSEL clkdiv option

The SYSCLK source is automatically managed when configuring the PLL.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index eba3ac0131190d0871135c6646f52b7cbad73365..50b2376680c15a6dccf6a55c82ac4bad0f56940c 100644 (file)
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -738,10 +738,6 @@ static int wm8960_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
        u16 reg;
 
        switch (div_id) {
-       case WM8960_SYSCLKSEL:
-               reg = snd_soc_read(codec, WM8960_CLOCK1) & 0x1fe;
-               snd_soc_write(codec, WM8960_CLOCK1, reg | div);
-               break;
        case WM8960_SYSCLKDIV:
                reg = snd_soc_read(codec, WM8960_CLOCK1) & 0x1f9;
                snd_soc_write(codec, WM8960_CLOCK1, reg | div);

diff --git a/sound/soc/codecs/wm8960.h b/sound/soc/codecs/wm8960.h
index d67bfe1300dab6f7424a6f50d4703fc9ed2a46bd..a5ef65481b86e036bdad252b7aba50a6f14ec2e5 100644 (file)
--- a/sound/soc/codecs/wm8960.h
+++ b/sound/soc/codecs/wm8960.h
@@ -76,7 +76,6 @@
 #define WM8960_OPCLKDIV                        2
 #define WM8960_DCLKDIV                 3
 #define WM8960_TOCLKSEL                        4
-#define WM8960_SYSCLKSEL               5
 
 #define WM8960_SYSCLK_DIV_1            (0 << 1)
 #define WM8960_SYSCLK_DIV_2            (2 << 1)