ASoC: Remove redundant WM8960 SYSCLKSEL clkdiv option
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 27 Apr 2010 19:01:56 +0000 (20:01 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 28 Apr 2010 10:33:04 +0000 (11:33 +0100)
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>
sound/soc/codecs/wm8960.c
sound/soc/codecs/wm8960.h

index eba3ac0..50b2376 100644 (file)
@@ -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);
index d67bfe1..a5ef654 100644 (file)
@@ -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)