Parcourir la source

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>
Mark Brown il y a 15 ans
Parent
commit
dde3a7e9cb
2 fichiers modifiés avec 0 ajouts et 5 suppressions
  1. 0 4
      sound/soc/codecs/wm8960.c
  2. 0 1
      sound/soc/codecs/wm8960.h

+ 0 - 4
sound/soc/codecs/wm8960.c

@@ -738,10 +738,6 @@ static int wm8960_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
 	u16 reg;
 	u16 reg;
 
 
 	switch (div_id) {
 	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:
 	case WM8960_SYSCLKDIV:
 		reg = snd_soc_read(codec, WM8960_CLOCK1) & 0x1f9;
 		reg = snd_soc_read(codec, WM8960_CLOCK1) & 0x1f9;
 		snd_soc_write(codec, WM8960_CLOCK1, reg | div);
 		snd_soc_write(codec, WM8960_CLOCK1, reg | div);

+ 0 - 1
sound/soc/codecs/wm8960.h

@@ -76,7 +76,6 @@
 #define WM8960_OPCLKDIV			2
 #define WM8960_OPCLKDIV			2
 #define WM8960_DCLKDIV			3
 #define WM8960_DCLKDIV			3
 #define WM8960_TOCLKSEL			4
 #define WM8960_TOCLKSEL			4
-#define WM8960_SYSCLKSEL		5
 
 
 #define WM8960_SYSCLK_DIV_1		(0 << 1)
 #define WM8960_SYSCLK_DIV_1		(0 << 1)
 #define WM8960_SYSCLK_DIV_2		(2 << 1)
 #define WM8960_SYSCLK_DIV_2		(2 << 1)