Commit 1e2fa4cf authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/db1200', 'asoc/fix/dwc',... 

Merge remote-tracking branches 'asoc/fix/db1200', 'asoc/fix/dwc', 'asoc/fix/imx-ssi', 'asoc/fix/maintainers', 'asoc/fix/rt5645', 'asoc/fix/sgtl5000' and 'asoc/fix/tas2552' into asoc-linus
parents 049e6dde e74679b3 924eb475 b7b01d34 ff6afc8d 8c1a9d63 e256da84 e2600460

MAINTAINERS

+0 −9
Original line number Diff line number Diff line
@@ -11378,15 +11378,6 @@ W: http://oops.ghostprotocols.net:81/blog 
S:	Maintained

F:	drivers/net/wireless/wl3501*



WM97XX TOUCHSCREEN DRIVERS

M:	Mark Brown <broonie@kernel.org>

M:	Liam Girdwood <lrg@slimlogic.co.uk>

L:	linux-input@vger.kernel.org

W:	https://github.com/CirrusLogic/linux-drivers/wiki

S:	Supported

F:	drivers/input/touchscreen/*wm97*

F:	include/linux/wm97xx.h



WOLFSON MICROELECTRONICS DRIVERS

L:	patches@opensource.wolfsonmicro.com

T:	git https://github.com/CirrusLogic/linux-drivers.git

sound/soc/au1x/db1200.c

+4 −0
Original line number Diff line number Diff line
@@ -129,6 +129,8 @@ static struct snd_soc_dai_link db1300_i2s_dai = { 
	.cpu_dai_name	= "au1xpsc_i2s.2",

	.platform_name	= "au1xpsc-pcm.2",

	.codec_name	= "wm8731.0-001b",

	.dai_fmt	= SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF |

			  SND_SOC_DAIFMT_CBM_CFM,

	.ops		= &db1200_i2s_wm8731_ops,

};
@@ -146,6 +148,8 @@ static struct snd_soc_dai_link db1550_i2s_dai = { 
	.cpu_dai_name	= "au1xpsc_i2s.3",

	.platform_name	= "au1xpsc-pcm.3",

	.codec_name	= "wm8731.0-001b",

	.dai_fmt	= SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF |

			  SND_SOC_DAIFMT_CBM_CFM,

	.ops		= &db1200_i2s_wm8731_ops,

};

sound/soc/codecs/rt5645.c

+3 −3
Original line number Diff line number Diff line
@@ -519,11 +519,11 @@ static const struct snd_kcontrol_new rt5645_snd_controls[] = { 
		RT5645_L_VOL_SFT + 1, RT5645_R_VOL_SFT + 1, 63, 0, adc_vol_tlv),



	/* ADC Boost Volume Control */

	SOC_DOUBLE_TLV("STO1 ADC Boost Gain", RT5645_ADC_BST_VOL1,

	SOC_DOUBLE_TLV("ADC Boost Capture Volume", RT5645_ADC_BST_VOL1,

		RT5645_STO1_ADC_L_BST_SFT, RT5645_STO1_ADC_R_BST_SFT, 3, 0,

		adc_bst_tlv),

	SOC_DOUBLE_TLV("STO2 ADC Boost Gain", RT5645_ADC_BST_VOL1,

		RT5645_STO2_ADC_L_BST_SFT, RT5645_STO2_ADC_R_BST_SFT, 3, 0,

	SOC_DOUBLE_TLV("Mono ADC Boost Capture Volume", RT5645_ADC_BST_VOL2,

		RT5645_MONO_ADC_L_BST_SFT, RT5645_MONO_ADC_R_BST_SFT, 3, 0,

		adc_bst_tlv),



	/* I2S2 function select */

sound/soc/codecs/rt5645.h

+9 −7
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ 
#define RT5645_STO1_ADC_DIG_VOL			0x1c

#define RT5645_MONO_ADC_DIG_VOL			0x1d

#define RT5645_ADC_BST_VOL1			0x1e

/* Mixer - D-D */

#define RT5645_ADC_BST_VOL2			0x20

/* Mixer - D-D */

#define RT5645_STO1_ADC_MIXER			0x27

#define RT5645_MONO_ADC_MIXER			0x28

#define RT5645_AD_DA_MIXER			0x29
@@ -315,12 +315,14 @@ 
#define RT5645_STO1_ADC_R_BST_SFT		12

#define RT5645_STO1_ADC_COMP_MASK		(0x3 << 10)

#define RT5645_STO1_ADC_COMP_SFT		10

#define RT5645_STO2_ADC_L_BST_MASK		(0x3 << 8)

#define RT5645_STO2_ADC_L_BST_SFT		8

#define RT5645_STO2_ADC_R_BST_MASK		(0x3 << 6)

#define RT5645_STO2_ADC_R_BST_SFT		6

#define RT5645_STO2_ADC_COMP_MASK		(0x3 << 4)

#define RT5645_STO2_ADC_COMP_SFT		4



/* ADC Boost Volume Control (0x20) */

#define RT5645_MONO_ADC_L_BST_MASK		(0x3 << 14)

#define RT5645_MONO_ADC_L_BST_SFT		14

#define RT5645_MONO_ADC_R_BST_MASK		(0x3 << 12)

#define RT5645_MONO_ADC_R_BST_SFT		12

#define RT5645_MONO_ADC_COMP_MASK		(0x3 << 10)

#define RT5645_MONO_ADC_COMP_SFT		10



/* Stereo2 ADC Mixer Control (0x26) */

#define RT5645_STO2_ADC_SRC_MASK		(0x1 << 15)

sound/soc/codecs/sgtl5000.c

+3 −3
Original line number Diff line number Diff line
@@ -1376,8 +1376,8 @@ static int sgtl5000_probe(struct snd_soc_codec *codec) 
			sgtl5000->micbias_resistor << SGTL5000_BIAS_R_SHIFT);



	snd_soc_update_bits(codec, SGTL5000_CHIP_MIC_CTRL,

			SGTL5000_BIAS_R_MASK,

			sgtl5000->micbias_voltage << SGTL5000_BIAS_R_SHIFT);

			SGTL5000_BIAS_VOLT_MASK,

			sgtl5000->micbias_voltage << SGTL5000_BIAS_VOLT_SHIFT);

	/*

	 * disable DAP

	 * TODO:
@@ -1549,7 +1549,7 @@ static int sgtl5000_i2c_probe(struct i2c_client *client, 
			else {

				sgtl5000->micbias_voltage = 0;

				dev_err(&client->dev,

					"Unsuitable MicBias resistor\n");

					"Unsuitable MicBias voltage\n");

			}

		} else {

			sgtl5000->micbias_voltage = 0;