From 5a41f063be6496aa1915db78c289c6e9dc6b6382 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 27 Apr 2010 20:01:56 +0100 Subject: [PATCH] --- yaml --- r: 193420 b: refs/heads/master c: dde3a7e9cb187e25deeac0269733116d4840f91e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8960.c | 4 ---- trunk/sound/soc/codecs/wm8960.h | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 54ee1dc84e65..62a8cc6fbd31 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb7b76961f73e4ae934d44f7b2e7ba974442f2fe +refs/heads/master: dde3a7e9cb187e25deeac0269733116d4840f91e diff --git a/trunk/sound/soc/codecs/wm8960.c b/trunk/sound/soc/codecs/wm8960.c index eba3ac013119..50b2376680c1 100644 --- a/trunk/sound/soc/codecs/wm8960.c +++ b/trunk/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/trunk/sound/soc/codecs/wm8960.h b/trunk/sound/soc/codecs/wm8960.h index d67bfe1300da..a5ef65481b86 100644 --- a/trunk/sound/soc/codecs/wm8960.h +++ b/trunk/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)