Commit 9fedcc44 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v3.9-rc1' of... 

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

ASoC: Updates for v3.9

A few driver fixes, none of them terribly dramatic.
parents 2069d483 f73c06dc

sound/soc/codecs/wm5102.c

+13 −2
Original line number Diff line number Diff line
@@ -573,6 +573,13 @@ static const struct reg_default wm5102_sysclk_reva_patch[] = { 
	{ 0x025e, 0x0112 },

};



static const struct reg_default wm5102_sysclk_revb_patch[] = {

	{ 0x3081, 0x08FE },

	{ 0x3083, 0x00ED },

	{ 0x30C1, 0x08FE },

	{ 0x30C3, 0x00ED },

};



static int wm5102_sysclk_ev(struct snd_soc_dapm_widget *w,

			    struct snd_kcontrol *kcontrol, int event)

{
@@ -587,6 +594,10 @@ static int wm5102_sysclk_ev(struct snd_soc_dapm_widget *w, 
		patch = wm5102_sysclk_reva_patch;

		patch_size = ARRAY_SIZE(wm5102_sysclk_reva_patch);

		break;

	default:

		patch = wm5102_sysclk_revb_patch;

		patch_size = ARRAY_SIZE(wm5102_sysclk_revb_patch);

		break;

	}



	switch (event) {
@@ -755,7 +766,7 @@ SOC_SINGLE("SPKDAT1 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_5L, 


SOC_DOUBLE_R("HPOUT1 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_1L,

	     ARIZONA_DAC_DIGITAL_VOLUME_1R, ARIZONA_OUT1L_MUTE_SHIFT, 1, 1),

SOC_DOUBLE_R("OUT2 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_2L,

SOC_DOUBLE_R("HPOUT2 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_2L,

	     ARIZONA_DAC_DIGITAL_VOLUME_2R, ARIZONA_OUT2L_MUTE_SHIFT, 1, 1),

SOC_SINGLE("EPOUT Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_3L,

	   ARIZONA_OUT3L_MUTE_SHIFT, 1, 1),
@@ -767,7 +778,7 @@ SOC_DOUBLE_R("SPKDAT1 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_5L, 
SOC_DOUBLE_R_TLV("HPOUT1 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_1L,

		 ARIZONA_DAC_DIGITAL_VOLUME_1R, ARIZONA_OUT1L_VOL_SHIFT,

		 0xbf, 0, digital_tlv),

SOC_DOUBLE_R_TLV("OUT2 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_2L,

SOC_DOUBLE_R_TLV("HPOUT2 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_2L,

		 ARIZONA_DAC_DIGITAL_VOLUME_2R, ARIZONA_OUT2L_VOL_SHIFT,

		 0xbf, 0, digital_tlv),

SOC_SINGLE_TLV("EPOUT Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_3L,

sound/soc/codecs/wm5110.c

+8 −8
Original line number Diff line number Diff line
@@ -213,9 +213,9 @@ ARIZONA_MIXER_CONTROLS("SPKDAT2R", ARIZONA_OUT6RMIX_INPUT_1_SOURCE), 


SOC_SINGLE("HPOUT1 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_1L,

	   ARIZONA_OUT1_OSR_SHIFT, 1, 0),

SOC_SINGLE("OUT2 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_2L,

SOC_SINGLE("HPOUT2 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_2L,

	   ARIZONA_OUT2_OSR_SHIFT, 1, 0),

SOC_SINGLE("OUT3 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_3L,

SOC_SINGLE("HPOUT3 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_3L,

	   ARIZONA_OUT3_OSR_SHIFT, 1, 0),

SOC_SINGLE("Speaker High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_4L,

	   ARIZONA_OUT4_OSR_SHIFT, 1, 0),
@@ -226,9 +226,9 @@ SOC_SINGLE("SPKDAT2 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_6L, 


SOC_DOUBLE_R("HPOUT1 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_1L,

	     ARIZONA_DAC_DIGITAL_VOLUME_1R, ARIZONA_OUT1L_MUTE_SHIFT, 1, 1),

SOC_DOUBLE_R("OUT2 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_2L,

SOC_DOUBLE_R("HPOUT2 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_2L,

	     ARIZONA_DAC_DIGITAL_VOLUME_2R, ARIZONA_OUT2L_MUTE_SHIFT, 1, 1),

SOC_DOUBLE_R("OUT3 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_3L,

SOC_DOUBLE_R("HPOUT3 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_3L,

	     ARIZONA_DAC_DIGITAL_VOLUME_3R, ARIZONA_OUT3L_MUTE_SHIFT, 1, 1),

SOC_DOUBLE_R("Speaker Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_4L,

	     ARIZONA_DAC_DIGITAL_VOLUME_4R, ARIZONA_OUT4L_MUTE_SHIFT, 1, 1),
@@ -240,10 +240,10 @@ SOC_DOUBLE_R("SPKDAT2 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_6L, 
SOC_DOUBLE_R_TLV("HPOUT1 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_1L,

		 ARIZONA_DAC_DIGITAL_VOLUME_1R, ARIZONA_OUT1L_VOL_SHIFT,

		 0xbf, 0, digital_tlv),

SOC_DOUBLE_R_TLV("OUT2 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_2L,

SOC_DOUBLE_R_TLV("HPOUT2 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_2L,

		 ARIZONA_DAC_DIGITAL_VOLUME_2R, ARIZONA_OUT2L_VOL_SHIFT,

		 0xbf, 0, digital_tlv),

SOC_DOUBLE_R_TLV("OUT3 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_3L,

SOC_DOUBLE_R_TLV("HPOUT3 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_3L,

		 ARIZONA_DAC_DIGITAL_VOLUME_3R, ARIZONA_OUT3L_VOL_SHIFT,

		 0xbf, 0, digital_tlv),

SOC_DOUBLE_R_TLV("Speaker Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_4L,
@@ -260,11 +260,11 @@ SOC_DOUBLE_R_RANGE_TLV("HPOUT1 Volume", ARIZONA_OUTPUT_PATH_CONFIG_1L, 
		       ARIZONA_OUTPUT_PATH_CONFIG_1R,

		       ARIZONA_OUT1L_PGA_VOL_SHIFT,

		       0x34, 0x40, 0, ana_tlv),

SOC_DOUBLE_R_RANGE_TLV("OUT2 Volume", ARIZONA_OUTPUT_PATH_CONFIG_2L,

SOC_DOUBLE_R_RANGE_TLV("HPOUT2 Volume", ARIZONA_OUTPUT_PATH_CONFIG_2L,

		       ARIZONA_OUTPUT_PATH_CONFIG_2R,

		       ARIZONA_OUT2L_PGA_VOL_SHIFT,

		       0x34, 0x40, 0, ana_tlv),

SOC_DOUBLE_R_RANGE_TLV("OUT3 Volume", ARIZONA_OUTPUT_PATH_CONFIG_3L,

SOC_DOUBLE_R_RANGE_TLV("HPOUT3 Volume", ARIZONA_OUTPUT_PATH_CONFIG_3L,

		       ARIZONA_OUTPUT_PATH_CONFIG_3R,

		       ARIZONA_OUT3L_PGA_VOL_SHIFT, 0x34, 0x40, 0, ana_tlv),

sound/soc/codecs/wm8350.c

+2 −2
Original line number Diff line number Diff line
@@ -1301,7 +1301,7 @@ static irqreturn_t wm8350_hpl_jack_handler(int irq, void *data) 
	if (device_may_wakeup(wm8350->dev))

		pm_wakeup_event(wm8350->dev, 250);



	schedule_delayed_work(&priv->hpl.work, 200);

	schedule_delayed_work(&priv->hpl.work, msecs_to_jiffies(200));



	return IRQ_HANDLED;

}
@@ -1318,7 +1318,7 @@ static irqreturn_t wm8350_hpr_jack_handler(int irq, void *data) 
	if (device_may_wakeup(wm8350->dev))

		pm_wakeup_event(wm8350->dev, 250);



	schedule_delayed_work(&priv->hpr.work, 200);

	schedule_delayed_work(&priv->hpr.work, msecs_to_jiffies(200));



	return IRQ_HANDLED;

}

sound/soc/codecs/wm8960.c

+4 −4
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ 
 * using 2 wire for device control, so we cache them instead.

 */

static const struct reg_default wm8960_reg_defaults[] = {

	{  0x0, 0x0097 },

	{  0x1, 0x0097 },

	{  0x0, 0x00a7 },

	{  0x1, 0x00a7 },

	{  0x2, 0x0000 },

	{  0x3, 0x0000 },

	{  0x4, 0x0000 },
@@ -323,8 +323,8 @@ SND_SOC_DAPM_MIXER("Left Input Mixer", WM8960_POWER3, 5, 0, 
SND_SOC_DAPM_MIXER("Right Input Mixer", WM8960_POWER3, 4, 0,

		   wm8960_rin, ARRAY_SIZE(wm8960_rin)),



SND_SOC_DAPM_ADC("Left ADC", "Capture", WM8960_POWER2, 3, 0),

SND_SOC_DAPM_ADC("Right ADC", "Capture", WM8960_POWER2, 2, 0),

SND_SOC_DAPM_ADC("Left ADC", "Capture", WM8960_POWER1, 3, 0),

SND_SOC_DAPM_ADC("Right ADC", "Capture", WM8960_POWER1, 2, 0),



SND_SOC_DAPM_DAC("Left DAC", "Playback", WM8960_POWER2, 8, 0),

SND_SOC_DAPM_DAC("Right DAC", "Playback", WM8960_POWER2, 7, 0),

sound/soc/tegra/tegra20_i2s.h

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ 


#define TEGRA20_I2S_TIMING_NON_SYM_ENABLE		(1 << 12)

#define TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_SHIFT	0

#define TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_MASK_US	0x7fff

#define TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_MASK_US	0x7ff

#define TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_MASK	(TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_MASK_US << TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_SHIFT)



/* Fields in TEGRA20_I2S_FIFO_SCR */