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

Commit 049da639 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.30' into for-2.6.31

parents 2d7e71fa 19ab054d

sound/soc/codecs/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ obj-$(CONFIG_SND_SOC_WM8971) += snd-soc-wm8971.o 
obj-$(CONFIG_SND_SOC_WM8960)	+= snd-soc-wm8960.o

obj-$(CONFIG_SND_SOC_WM8988)	+= snd-soc-wm8988.o

obj-$(CONFIG_SND_SOC_WM8990)	+= snd-soc-wm8990.o

obj-$(CONFIG_SND_SOC_WM8991)	+= snd-soc-wm8991.o

obj-$(CONFIG_SND_SOC_WM9705)	+= snd-soc-wm9705.o

obj-$(CONFIG_SND_SOC_WM9712)	+= snd-soc-wm9712.o

obj-$(CONFIG_SND_SOC_WM9713)	+= snd-soc-wm9713.o

sound/soc/codecs/wm8580.c

+10 −6
Original line number Diff line number Diff line
@@ -268,9 +268,11 @@ static const DECLARE_TLV_DB_SCALE(dac_tlv, -12750, 50, 1); 
static int wm8580_out_vu(struct snd_kcontrol *kcontrol,

			 struct snd_ctl_elem_value *ucontrol)

{

	struct soc_mixer_control *mc =

		(struct soc_mixer_control *)kcontrol->private_value;

	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	int reg = kcontrol->private_value & 0xff;

	int reg2 = (kcontrol->private_value >> 24) & 0xff;

	unsigned int reg = mc->reg;

	unsigned int reg2 = mc->rreg;

	int ret;

	u16 val;
@@ -292,15 +294,17 @@ static int wm8580_out_vu(struct snd_kcontrol *kcontrol, 
	return 0;

}



#define SOC_WM8580_OUT_DOUBLE_R_TLV(xname, reg_left, reg_right, shift, max, invert, tlv_array) \

#define SOC_WM8580_OUT_DOUBLE_R_TLV(xname, reg_left, reg_right, xshift, xmax, \

				    xinvert, tlv_array)			\

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \

	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\

		SNDRV_CTL_ELEM_ACCESS_READWRITE,  \

	.tlv.p = (tlv_array), \

	.info = snd_soc_info_volsw_2r, \

	.get = snd_soc_get_volsw_2r, .put = wm8580_out_vu, \

	.private_value = (reg_left) | ((shift) << 8)  |		\

		((max) << 12) | ((invert) << 20) | ((reg_right) << 24) }

	.private_value = (unsigned long)&(struct soc_mixer_control) \

		{.reg = reg_left, .rreg = reg_right, .shift = xshift, \

		.max = xmax, .invert = xinvert} }



static const struct snd_kcontrol_new wm8580_snd_controls[] = {

SOC_WM8580_OUT_DOUBLE_R_TLV("DAC1 Playback Volume",
@@ -522,7 +526,7 @@ static int wm8580_set_dai_pll(struct snd_soc_dai *codec_dai, 
	reg = wm8580_read(codec, WM8580_PLLA4 + offset);

	reg &= ~0x3f;

	reg |= pll_div.prescale | pll_div.postscale << 1 |

		pll_div.freqmode << 4;

		pll_div.freqmode << 3;



	wm8580_write(codec, WM8580_PLLA4 + offset, reg);

sound/soc/codecs/wm9705.c

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ static int wm9705_reset(struct snd_soc_codec *codec) 
}



#ifdef CONFIG_PM

static int wm9705_soc_suspend(struct platform_device *pdev)

static int wm9705_soc_suspend(struct platform_device *pdev, pm_message_t msg)

{

	struct snd_soc_device *socdev = platform_get_drvdata(pdev);

	struct snd_soc_codec *codec = socdev->card->codec;