Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c28a9926 authored by Mark Brown's avatar Mark Brown
Browse files

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.

Reported-by: default avatarTommy Zhu <Tommy.Zhu@wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent b0fc7b84

include/linux/mfd/wm8350/audio.h

+0 −3
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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