Skip to contentSkip to conversation

ASoC: Remove broken WM8350 direction constants

PATCH In review Mark Brown 2 participants 2 messages Nov 9, 2010

Subsystems (4)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 ASoC: Remove broken WM8350 direction constants

The WM8350 driver was using some custom constants to interpret the direction of the MCLK signal which had the opposite values to those used as standard by the ASoC core, causing confusion in machine drivers such as the 1133-EV1 board.

---
 include/linux/mfd/wm8350/audio.h |    3 ---
 sound/soc/codecs/wm8350.c        |    2 +-
 2 files changed, 1 insertions(+), 4 deletions(-)
include/linux/mfd/wm8350/audio.h +0 -3
index a95141e..bd581c6 100644
@@ -522,9 +522,6 @@
 #define WM8350_MCLK_SEL_PLL_32K			3
 #define WM8350_MCLK_SEL_MCLK			5
 
-#define WM8350_MCLK_DIR_OUT			0
-#define WM8350_MCLK_DIR_IN			1
-
 /* clock divider id's */
 #define WM8350_ADC_CLKDIV			0
 #define WM8350_DAC_CLKDIV			1
sound/soc/codecs/wm8350.c +1 -1
index f4f1fba..4f3e919 100644
@@ -831,7 +831,7 @@ static int wm8350_set_dai_sysclk(struct snd_soc_dai *codec_dai,
 	}
 
 	/* MCLK direction */
-	if (dir == WM8350_MCLK_DIR_OUT)
+	if (dir == SND_SOC_CLOCK_OUT)
 		wm8350_set_bits(wm8350, WM8350_CLOCK_CONTROL_2,
 				WM8350_MCLK_DIR);
 	else
Signature · 1 line
1.7.1
Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · Mark Brown

The WM8350 driver was using some custom constants to interpret the direction of the MCLK signal which had the opposite values to those used as standard by the ASoC core, causing confusion in machine drivers such as the 1133-EV1 board.

Signature · 3 lines
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk