Skip to content

Commit

Permalink
ASoC: Remove broken WM8350 direction constants
Browse files Browse the repository at this point in the history
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.

Reported-by: Tommy Zhu <Tommy.Zhu@wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
  • Loading branch information
Mark Brown committed Nov 10, 2010
1 parent b0fc7b8 commit c28a992
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
3 changes: 0 additions & 3 deletions include/linux/mfd/wm8350/audio.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/wm8350.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c28a992

Please sign in to comment.