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

Commit c0f2302a authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next

parents 3f1b8613 02866eab

include/sound/soc-dapm.h

+14 −0
Original line number Diff line number Diff line
@@ -272,6 +272,16 @@ struct device; 




/* dapm kcontrol types */

#define SOC_DAPM_DOUBLE(xname, reg, lshift, rshift, max, invert) \

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

	.info = snd_soc_info_volsw, \

	.get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \

	.private_value = SOC_DOUBLE_VALUE(reg, lshift, rshift, max, invert, 0) }

#define SOC_DAPM_DOUBLE_R(xname, lreg, rreg, shift, max, invert) \

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

	.info = snd_soc_info_volsw, \

	.get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \

	.private_value = SOC_DOUBLE_R_VALUE(lreg, rreg, shift, max, invert) }

#define SOC_DAPM_SINGLE(xname, reg, shift, max, invert) \

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

	.info = snd_soc_info_volsw, \
@@ -615,6 +625,10 @@ struct snd_soc_dapm_update { 
	int reg;

	int mask;

	int val;

	int reg2;

	int mask2;

	int val2;

	bool has_second_set;

};



struct snd_soc_dapm_wcache {

sound/soc/codecs/adau17x1.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static int adau17x1_dsp_mux_enum_put(struct snd_kcontrol *kcontrol, 
	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

	struct adau *adau = snd_soc_codec_get_drvdata(codec);

	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;

	struct snd_soc_dapm_update update;

	struct snd_soc_dapm_update update = { 0 };

	unsigned int stream = e->shift_l;

	unsigned int val, change;

	int reg;

sound/soc/codecs/tlv320aic3x.c

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol, 
	unsigned int mask = (1 << fls(max)) - 1;

	unsigned int invert = mc->invert;

	unsigned short val;

	struct snd_soc_dapm_update update;

	struct snd_soc_dapm_update update = { 0 };

	int connect, change;



	val = (ucontrol->value.integer.value[0] & mask);

sound/soc/codecs/wm9712.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static int wm9712_hp_mixer_put(struct snd_kcontrol *kcontrol, 
	struct soc_mixer_control *mc =

		(struct soc_mixer_control *)kcontrol->private_value;

	unsigned int mixer, mask, shift, old;

	struct snd_soc_dapm_update update;

	struct snd_soc_dapm_update update = { 0 };

	bool change;



	mixer = mc->shift >> 8;

sound/soc/codecs/wm9713.c

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ static int wm9713_hp_mixer_put(struct snd_kcontrol *kcontrol, 
	struct soc_mixer_control *mc =

		(struct soc_mixer_control *)kcontrol->private_value;

	unsigned int mixer, mask, shift, old;

	struct snd_soc_dapm_update update;

	struct snd_soc_dapm_update update = { 0 };

	bool change;



	mixer = mc->shift >> 8;