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

Commit 00fb0d98 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.37' into for-2.6.38

parents fd8d3bc0 0049317e

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

+8 −1
Original line number Diff line number Diff line
@@ -833,7 +833,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
@@ -1588,6 +1588,13 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec) 
	wm8350_set_bits(wm8350, WM8350_ROUT2_VOLUME,

			WM8350_OUT2_VU | WM8350_OUT2R_MUTE);



	/* Make sure AIF tristating is disabled by default */

	wm8350_clear_bits(wm8350, WM8350_AI_FORMATING, WM8350_AIF_TRI);



	/* Make sure we've got a sane companding setup too */

	wm8350_clear_bits(wm8350, WM8350_ADC_DAC_COMP,

			  WM8350_DAC_COMP | WM8350_LOOPBACK);



	/* Make sure jack detect is disabled to start off with */

	wm8350_clear_bits(wm8350, WM8350_JACK_DETECT,

			  WM8350_JDL_ENA | WM8350_JDR_ENA);