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

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

Merge remote-tracking branches 'asoc/fix/wm8737', 'asoc/fix/wm8903',... 

Merge remote-tracking branches 'asoc/fix/wm8737', 'asoc/fix/wm8903', 'asoc/fix/wm8955' and 'asoc/fix/wm8960' into asoc-linus
parents 6917aeed 14ba3ec1 ebb6ad73 12c35005 a077e81e

sound/soc/codecs/wm8737.c

+4 −2
Original line number Diff line number Diff line
@@ -483,7 +483,8 @@ static int wm8737_set_bias_level(struct snd_soc_codec *codec, 


			/* Fast VMID ramp at 2*2.5k */

			snd_soc_update_bits(codec, WM8737_MISC_BIAS_CONTROL,

					    WM8737_VMIDSEL_MASK, 0x4);

					    WM8737_VMIDSEL_MASK,

					    2 << WM8737_VMIDSEL_SHIFT);



			/* Bring VMID up */

			snd_soc_update_bits(codec, WM8737_POWER_MANAGEMENT,
@@ -497,7 +498,8 @@ static int wm8737_set_bias_level(struct snd_soc_codec *codec, 


		/* VMID at 2*300k */

		snd_soc_update_bits(codec, WM8737_MISC_BIAS_CONTROL,

				    WM8737_VMIDSEL_MASK, 2);

				    WM8737_VMIDSEL_MASK,

				    1 << WM8737_VMIDSEL_SHIFT);



		break;

sound/soc/codecs/wm8903.h

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ extern int wm8903_mic_detect(struct snd_soc_codec *codec, 
#define WM8903_VMID_BUF_ENA_WIDTH                    1  /* VMID_BUF_ENA */



#define WM8903_VMID_RES_50K                          2

#define WM8903_VMID_RES_250K                         3

#define WM8903_VMID_RES_250K                         4

#define WM8903_VMID_RES_5K                           6



/*

sound/soc/codecs/wm8955.c

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static int wm8955_configure_clocking(struct snd_soc_codec *codec) 
		snd_soc_update_bits(codec, WM8955_PLL_CONTROL_2,

				    WM8955_K_17_9_MASK,

				    (pll.k >> 9) & WM8955_K_17_9_MASK);

		snd_soc_update_bits(codec, WM8955_PLL_CONTROL_2,

		snd_soc_update_bits(codec, WM8955_PLL_CONTROL_3,

				    WM8955_K_8_0_MASK,

				    pll.k & WM8955_K_8_0_MASK);

		if (pll.k)

sound/soc/codecs/wm8960.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ SOC_SINGLE("PCM Playback -6dB Switch", WM8960_DACCTL1, 7, 1, 0), 
SOC_ENUM("ADC Polarity", wm8960_enum[0]),

SOC_SINGLE("ADC High Pass Filter Switch", WM8960_DACCTL1, 0, 1, 0),



SOC_ENUM("DAC Polarity", wm8960_enum[2]),

SOC_ENUM("DAC Polarity", wm8960_enum[1]),

SOC_SINGLE_BOOL_EXT("DAC Deemphasis Switch", 0,

		    wm8960_get_deemph, wm8960_put_deemph),