Commit c95d947f authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus 

ASoC: Fixes for v3.7

Nothing too exciting except for the ams-delta change which is relatively
lerge due to the fact that the driver loading had been totally broken as
the driver needed a newer API to function.
parents 71aa5ebe 9233ef6b

arch/arm/mach-omap1/board-ams-delta.c

+12 −0
Original line number Diff line number Diff line
@@ -444,16 +444,28 @@ static struct omap1_cam_platform_data ams_delta_camera_platform_data = { 
	.lclk_khz_max	= 1334,		/* results in 5fps CIF, 10fps QCIF */

};



static struct platform_device ams_delta_audio_device = {

	.name   = "ams-delta-audio",

	.id     = -1,

};



static struct platform_device cx20442_codec_device = {

	.name   = "cx20442-codec",

	.id     = -1,

};



static struct platform_device *ams_delta_devices[] __initdata = {

	&latch1_gpio_device,

	&latch2_gpio_device,

	&ams_delta_kp_device,

	&ams_delta_camera_device,

	&ams_delta_audio_device,

};



static struct platform_device *late_devices[] __initdata = {

	&ams_delta_nand_device,

	&ams_delta_lcd_device,

	&cx20442_codec_device,

};



static void __init ams_delta_init(void)

sound/soc/Makefile

+3 −2
Original line number Diff line number Diff line 
snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o

snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o



snd-soc-dmaengine-pcm-objs := soc-dmaengine-pcm.o

obj-$(CONFIG_SND_SOC_DMAENGINE_PCM) += snd-soc-dmaengine-pcm.o

ifneq ($(CONFIG_SND_SOC_DMAENGINE_PCM),)

snd-soc-core-objs += soc-dmaengine-pcm.o

endif



obj-$(CONFIG_SND_SOC)	+= snd-soc-core.o

obj-$(CONFIG_SND_SOC)	+= codecs/

sound/soc/codecs/da9055.c

+21 −1
Original line number Diff line number Diff line
@@ -178,6 +178,12 @@ 
#define DA9055_AIF_WORD_S24_LE		(2 << 2)

#define DA9055_AIF_WORD_S32_LE		(3 << 2)



/* MIC_L_CTRL bit fields */

#define DA9055_MIC_L_MUTE_EN		(1 << 6)



/* MIC_R_CTRL bit fields */

#define DA9055_MIC_R_MUTE_EN		(1 << 6)



/* MIXIN_L_CTRL bit fields */

#define DA9055_MIXIN_L_MIX_EN		(1 << 3)
@@ -476,7 +482,7 @@ static int da9055_put_alc_sw(struct snd_kcontrol *kcontrol, 
			     struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	u8 reg_val, adc_left, adc_right;

	u8 reg_val, adc_left, adc_right, mic_left, mic_right;

	int avg_left_data, avg_right_data, offset_l, offset_r;



	if (ucontrol->value.integer.value[0]) {
@@ -485,6 +491,16 @@ static int da9055_put_alc_sw(struct snd_kcontrol *kcontrol, 
		 * offsets must be done first

		 */



		/* Save current values from Mic control registers */

		mic_left = snd_soc_read(codec, DA9055_MIC_L_CTRL);

		mic_right = snd_soc_read(codec, DA9055_MIC_R_CTRL);



		/* Mute Mic PGA Left and Right */

		snd_soc_update_bits(codec, DA9055_MIC_L_CTRL,

				    DA9055_MIC_L_MUTE_EN, DA9055_MIC_L_MUTE_EN);

		snd_soc_update_bits(codec, DA9055_MIC_R_CTRL,

				    DA9055_MIC_R_MUTE_EN, DA9055_MIC_R_MUTE_EN);



		/* Save current values from ADC control registers */

		adc_left = snd_soc_read(codec, DA9055_ADC_L_CTRL);

		adc_right = snd_soc_read(codec, DA9055_ADC_R_CTRL);
@@ -520,6 +536,10 @@ static int da9055_put_alc_sw(struct snd_kcontrol *kcontrol, 
		/* Restore original values of ADC control registers */

		snd_soc_write(codec, DA9055_ADC_L_CTRL, adc_left);

		snd_soc_write(codec, DA9055_ADC_R_CTRL, adc_right);



		/* Restore original values of Mic control registers */

		snd_soc_write(codec, DA9055_MIC_L_CTRL, mic_left);

		snd_soc_write(codec, DA9055_MIC_R_CTRL, mic_right);

	}



	return snd_soc_put_volsw(kcontrol, ucontrol);

sound/soc/codecs/twl6040.c

+4 −4
Original line number Diff line number Diff line
@@ -820,10 +820,10 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"VIBRA DAC", NULL, "Vibra Playback"},



	/* ADC -> Stream mapping */

	{"ADC Left", NULL, "Legacy Capture"},

	{"ADC Left", NULL, "Capture"},

	{"ADC Right", NULL, "Legacy Capture"},

	{"ADC Right", NULL, "Capture"},

	{"Legacy Capture" , NULL, "ADC Left"},

	{"Capture", NULL, "ADC Left"},

	{"Legacy Capture", NULL, "ADC Right"},

	{"Capture" , NULL, "ADC Right"},



	/* Capture path */

	{"Analog Left Capture Route", "Headset Mic", "HSMIC"},

sound/soc/codecs/wm2200.c

+2 −1
Original line number Diff line number Diff line
@@ -1028,7 +1028,7 @@ SOC_DOUBLE_R_TLV("OUT2 Digital Volume", WM2200_DAC_DIGITAL_VOLUME_2L, 
		 WM2200_DAC_DIGITAL_VOLUME_2R, WM2200_OUT2L_VOL_SHIFT, 0x9f, 0,

		 digital_tlv),

SOC_DOUBLE("OUT2 Switch", WM2200_PDM_1, WM2200_SPK1L_MUTE_SHIFT,

	   WM2200_SPK1R_MUTE_SHIFT, 1, 0),

	   WM2200_SPK1R_MUTE_SHIFT, 1, 1),

};



WM2200_MIXER_ENUMS(OUT1L, WM2200_OUT1LMIX_INPUT_1_SOURCE);
@@ -2091,6 +2091,7 @@ static __devinit int wm2200_i2c_probe(struct i2c_client *i2c, 


	switch (wm2200->rev) {

	case 0:

	case 1:

		ret = regmap_register_patch(wm2200->regmap, wm2200_reva_patch,

					    ARRAY_SIZE(wm2200_reva_patch));

		if (ret != 0) {