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

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

Merge branch 'fix/asoc' into for-linus 

* fix/asoc:
  ASoC: s3c-i2s-v2 needs to declare a license for modular builds
  ASoC: remove non-existing referece to CONFIG_SND_SOC_CODEC_WM8991
  ASoC: Fix WM8580 volume update handling for large register changes
  ASoC: Fix offset of freqmode in WM8580 PLL configuration
parents ce8a7424 a396e32e

sound/soc/codecs/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -56,7 +56,6 @@ obj-$(CONFIG_SND_SOC_WM8900) += snd-soc-wm8900.o 
obj-$(CONFIG_SND_SOC_WM8903)	+= snd-soc-wm8903.o

obj-$(CONFIG_SND_SOC_WM8903)	+= snd-soc-wm8903.o

obj-$(CONFIG_SND_SOC_WM8971)	+= snd-soc-wm8971.o

obj-$(CONFIG_SND_SOC_WM8971)	+= snd-soc-wm8971.o

obj-$(CONFIG_SND_SOC_WM8990)	+= snd-soc-wm8990.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_WM9705)	+= snd-soc-wm9705.o

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

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

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

sound/soc/codecs/wm8580.c

+10 −6
Original line number Original line 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,

static int wm8580_out_vu(struct snd_kcontrol *kcontrol,

			 struct snd_ctl_elem_value *ucontrol)

			 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);

	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	int reg = kcontrol->private_value & 0xff;

	unsigned int reg = mc->reg;

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

	unsigned int reg2 = mc->rreg;

	int ret;

	int ret;

	u16 val;

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

	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), \

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

	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\

	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\

		SNDRV_CTL_ELEM_ACCESS_READWRITE,  \

		SNDRV_CTL_ELEM_ACCESS_READWRITE,  \

	.tlv.p = (tlv_array), \

	.tlv.p = (tlv_array), \

	.info = snd_soc_info_volsw_2r, \

	.info = snd_soc_info_volsw_2r, \

	.get = snd_soc_get_volsw_2r, .put = wm8580_out_vu, \

	.get = snd_soc_get_volsw_2r, .put = wm8580_out_vu, \

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

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

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

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

		.max = xmax, .invert = xinvert} }





static const struct snd_kcontrol_new wm8580_snd_controls[] = {

static const struct snd_kcontrol_new wm8580_snd_controls[] = {

SOC_WM8580_OUT_DOUBLE_R_TLV("DAC1 Playback Volume",

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 = wm8580_read(codec, WM8580_PLLA4 + offset);

	reg &= ~0x3f;

	reg &= ~0x3f;

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

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

		pll_div.freqmode << 4;

		pll_div.freqmode << 3;





	wm8580_write(codec, WM8580_PLLA4 + offset, reg);

	wm8580_write(codec, WM8580_PLLA4 + offset, reg);

sound/soc/s3c24xx/s3c-i2s-v2.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -636,5 +636,6 @@ int s3c_i2sv2_register_dai(struct snd_soc_dai *dai) 




	return snd_soc_register_dai(dai);

	return snd_soc_register_dai(dai);

}

}



EXPORT_SYMBOL_GPL(s3c_i2sv2_register_dai);

EXPORT_SYMBOL_GPL(s3c_i2sv2_register_dai);



MODULE_LICENSE("GPL");