Unverified Commit 2cb6290a authored by Mark Brown's avatar Mark Brown
Browse files

Tidy up ASoC VALUE control macros 

Merge series from Charles Keepax <ckeepax@opensource.cirrus.com>:

Tidy up the ASoC control value macros. Fix some drivers that should be
using core macros that aren't, combine the existing core macros to be
a little more consistent in style, and update the core macros to use
each other where possible.
parents d6c08418 1743dbb4

include/sound/soc-dapm.h

+23 −34
Original line number Diff line number Diff line
@@ -326,34 +326,37 @@ struct soc_enum; 


/* 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) }

	SOC_DOUBLE_EXT(xname, reg, lshift, rshift, max, invert, \

		       snd_soc_dapm_get_volsw, snd_soc_dapm_put_volsw)

#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) }

	SOC_DOUBLE_R_EXT(xname, lreg, rreg, shift, max, invert, \

			 snd_soc_dapm_get_volsw, snd_soc_dapm_put_volsw)

#define SOC_DAPM_SINGLE(xname, reg, 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_SINGLE_VALUE(reg, shift, max, invert, 0) }

#define SOC_DAPM_SINGLE_AUTODISABLE(xname, reg, 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_SINGLE_VALUE(reg, shift, max, invert, 1) }

	SOC_SINGLE_EXT(xname, reg, shift, max, invert, \

		       snd_soc_dapm_get_volsw, snd_soc_dapm_put_volsw)

#define SOC_DAPM_SINGLE_VIRT(xname, max) \

	SOC_DAPM_SINGLE(xname, SND_SOC_NOPM, 0, max, 0)

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

	SOC_DOUBLE_R_EXT_TLV(xname, lreg, rreg, shift, max, invert, \

			     snd_soc_dapm_get_volsw, snd_soc_dapm_put_volsw, \

			     tlv_array)

#define SOC_DAPM_SINGLE_TLV(xname, reg, shift, max, invert, tlv_array) \

	SOC_SINGLE_EXT_TLV(xname, reg, shift, max, invert, \

			   snd_soc_dapm_get_volsw, snd_soc_dapm_put_volsw, \

			   tlv_array)

#define SOC_DAPM_SINGLE_TLV_VIRT(xname, max, tlv_array) \

	SOC_DAPM_SINGLE(xname, SND_SOC_NOPM, 0, max, 0, tlv_array)

#define SOC_DAPM_ENUM(xname, xenum) \

	SOC_ENUM_EXT(xname, xenum, snd_soc_dapm_get_enum_double, \

		     snd_soc_dapm_put_enum_double)

#define SOC_DAPM_ENUM_EXT(xname, xenum, xget, xput) \

	SOC_ENUM_EXT(xname, xenum, xget, xput)



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

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

	.info = snd_soc_info_volsw, \

	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | SNDRV_CTL_ELEM_ACCESS_READWRITE,\

	.tlv.p = (tlv_array), \

	.get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \

	.private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 0) }

	.private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 1) }

#define SOC_DAPM_SINGLE_TLV_AUTODISABLE(xname, reg, shift, max, invert, tlv_array) \

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

	.info = snd_soc_info_volsw, \
@@ -361,20 +364,6 @@ struct soc_enum; 
	.tlv.p = (tlv_array), \

	.get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \

	.private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 1) }

#define SOC_DAPM_SINGLE_TLV_VIRT(xname, max, tlv_array) \

	SOC_DAPM_SINGLE(xname, SND_SOC_NOPM, 0, max, 0, tlv_array)

#define SOC_DAPM_ENUM(xname, xenum) \

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

	.info = snd_soc_info_enum_double, \

 	.get = snd_soc_dapm_get_enum_double, \

 	.put = snd_soc_dapm_put_enum_double, \

  	.private_value = (unsigned long)&xenum }

#define SOC_DAPM_ENUM_EXT(xname, xenum, xget, xput) \

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

	.info = snd_soc_info_enum_double, \

	.get = xget, \

	.put = xput, \

	.private_value = (unsigned long)&xenum }

#define SOC_DAPM_PIN_SWITCH(xname) \

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

	.info = snd_soc_dapm_info_pin_switch, \

include/sound/soc.h

+10 −21
Original line number Diff line number Diff line
@@ -51,22 +51,14 @@ struct platform_device; 
	.sign_bit = xsign_bit, .invert = xinvert, .autodisable = xautodisable})

#define SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert, xautodisable) \

	SOC_DOUBLE_VALUE(xreg, xshift, xshift, xmax, xinvert, xautodisable)

#define SOC_SINGLE_VALUE_EXT(xreg, xmax, xinvert) \

	((unsigned long)&(struct soc_mixer_control) \

	{.reg = xreg, .max = xmax, .invert = xinvert})

#define SOC_DOUBLE_R_VALUE(xlreg, xrreg, xshift, xmax, xinvert) \

	((unsigned long)&(struct soc_mixer_control) \

	{.reg = xlreg, .rreg = xrreg, .shift = xshift, .rshift = xshift, \

	.max = xmax, .invert = xinvert})

#define SOC_DOUBLE_R_S_VALUE(xlreg, xrreg, xshift, xmin, xmax, xsign_bit, xinvert) \

	((unsigned long)&(struct soc_mixer_control) \

	{.reg = xlreg, .rreg = xrreg, .shift = xshift, .rshift = xshift, \

	.max = xmax, .min = xmin, .sign_bit = xsign_bit, \

	.invert = xinvert})

#define SOC_DOUBLE_R_RANGE_VALUE(xlreg, xrreg, xshift, xmin, xmax, xinvert) \

	((unsigned long)&(struct soc_mixer_control) \

	{.reg = xlreg, .rreg = xrreg, .shift = xshift, .rshift = xshift, \

	.min = xmin, .max = xmax, .invert = xinvert})

#define SOC_DOUBLE_R_VALUE(xlreg, xrreg, xshift, xmin, xmax, xinvert) \

	SOC_DOUBLE_R_S_VALUE(xlreg, xrreg, xshift, xmin, xmax, 0, xinvert)



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

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

	.info = snd_soc_info_volsw, .get = snd_soc_get_volsw,\
@@ -130,13 +122,13 @@ struct platform_device; 
	.info = snd_soc_info_volsw, \

	.get = snd_soc_get_volsw, .put = snd_soc_put_volsw, \

	.private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, xshift, \

					    xmax, xinvert) }

					    0, xmax, xinvert) }

#define SOC_DOUBLE_R_RANGE(xname, reg_left, reg_right, xshift, xmin, \

			   xmax, xinvert)		\

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

	.info = snd_soc_info_volsw_range, \

	.get = snd_soc_get_volsw_range, .put = snd_soc_put_volsw_range, \

	.private_value = SOC_DOUBLE_R_RANGE_VALUE(reg_left, reg_right, \

	.private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, \

					    xshift, xmin, xmax, xinvert) }

#define SOC_DOUBLE_TLV(xname, reg, shift_left, shift_right, max, invert, tlv_array) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\
@@ -179,7 +171,7 @@ struct platform_device; 
	.info = snd_soc_info_volsw, \

	.get = snd_soc_get_volsw, .put = snd_soc_put_volsw, \

	.private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, xshift, \

					    xmax, xinvert) }

					    0, xmax, xinvert) }

#define SOC_DOUBLE_R_RANGE_TLV(xname, reg_left, reg_right, xshift, xmin, \

			       xmax, xinvert, tlv_array)		\

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\
@@ -188,7 +180,7 @@ struct platform_device; 
	.tlv.p = (tlv_array), \

	.info = snd_soc_info_volsw_range, \

	.get = snd_soc_get_volsw_range, .put = snd_soc_put_volsw_range, \

	.private_value = SOC_DOUBLE_R_RANGE_VALUE(reg_left, reg_right, \

	.private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, \

					    xshift, xmin, xmax, xinvert) }

#define SOC_DOUBLE_R_SX_TLV(xname, xreg, xrreg, xshift, xmin, xmax, tlv_array) \

{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
@@ -198,10 +190,7 @@ struct platform_device; 
	.info = snd_soc_info_volsw_sx, \

	.get = snd_soc_get_volsw_sx, \

	.put = snd_soc_put_volsw_sx, \

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

		{.reg = xreg, .rreg = xrreg, \

		.shift = xshift, .rshift = xshift, \

		.max = xmax, .min = xmin} }

	.private_value = SOC_DOUBLE_R_VALUE(xreg, xrreg, xshift, xmin, xmax, 0) }

#define SOC_DOUBLE_R_S_TLV(xname, reg_left, reg_right, xshift, xmin, xmax, xsign_bit, xinvert, tlv_array) \

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

	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\
@@ -275,7 +264,7 @@ struct platform_device; 
	.info = snd_soc_info_volsw, \

	.get = xhandler_get, .put = xhandler_put, \

	.private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, xshift, \

					    xmax, xinvert) }

					    0, xmax, xinvert) }

#define SOC_SINGLE_EXT_TLV(xname, xreg, xshift, xmax, xinvert,\

	 xhandler_get, xhandler_put, tlv_array) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
@@ -316,7 +305,7 @@ struct platform_device; 
	.info = snd_soc_info_volsw, \

	.get = xhandler_get, .put = xhandler_put, \

	.private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, xshift, \

					    xmax, xinvert) }

					    0, xmax, xinvert) }

#define SOC_DOUBLE_R_S_EXT_TLV(xname, reg_left, reg_right, xshift, xmin, xmax, \

			       xsign_bit, xinvert, xhandler_get, xhandler_put, \

			       tlv_array) \

sound/soc/atmel/tse850-pcm5142.c

+2 −9
Original line number Diff line number Diff line
@@ -227,15 +227,8 @@ static const struct snd_kcontrol_new mux1 = 
static const struct snd_kcontrol_new mux2 =

	SOC_DAPM_ENUM_EXT("MUX2", mux_enum, tse850_get_mux2, tse850_put_mux2);



#define TSE850_DAPM_SINGLE_EXT(xname, reg, shift, max, invert, xget, xput) \

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

	.info = snd_soc_info_volsw, \

	.get = xget, \

	.put = xput, \

	.private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 0) }



static const struct snd_kcontrol_new mix[] = {

	TSE850_DAPM_SINGLE_EXT("IN Switch", SND_SOC_NOPM, 0, 1, 0,

	SOC_SINGLE_EXT("IN Switch", SND_SOC_NOPM, 0, 1, 0,

		       tse850_get_mix, tse850_put_mix),

};

sound/soc/codecs/adau17x1.c

+6 −4
Original line number Diff line number Diff line
@@ -254,11 +254,13 @@ static int adau17x1_dsp_mux_enum_get(struct snd_kcontrol *kcontrol, 
}



#define DECLARE_ADAU17X1_DSP_MUX_CTRL(_name, _label, _stream, _text) \

	const struct snd_kcontrol_new _name = \

		SOC_DAPM_ENUM_EXT(_label, (const struct soc_enum)\

	const struct soc_enum _name##_enum = \

			SOC_ENUM_SINGLE(SND_SOC_NOPM, _stream, \

				ARRAY_SIZE(_text), _text), \

			adau17x1_dsp_mux_enum_get, adau17x1_dsp_mux_enum_put)

					ARRAY_SIZE(_text), _text); \

	const struct snd_kcontrol_new _name = \

		SOC_DAPM_ENUM_EXT(_label, _name##_enum, \

				  adau17x1_dsp_mux_enum_get, \

				  adau17x1_dsp_mux_enum_put)



static const char * const adau17x1_dac_mux_text[] = {

	"DSP",

sound/soc/codecs/jz4760.c

+4 −28
Original line number Diff line number Diff line
@@ -314,37 +314,13 @@ static const struct snd_kcontrol_new jz4760_codec_snd_controls[] = { 
};



static const struct snd_kcontrol_new jz4760_codec_pcm_playback_controls[] = {

	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.name = "Volume",

		.info = snd_soc_info_volsw,

		.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ

			| SNDRV_CTL_ELEM_ACCESS_READWRITE,

		.tlv.p = dac_tlv,

		.get = snd_soc_dapm_get_volsw,

		.put = snd_soc_dapm_put_volsw,

		.private_value = SOC_DOUBLE_R_VALUE(JZ4760_CODEC_REG_GCR6,

						    JZ4760_CODEC_REG_GCR5,

						    REG_GCR_GAIN_OFFSET,

						    REG_GCR_GAIN_MAX, 1),

	},

	SOC_DAPM_DOUBLE_R_TLV("Volume", JZ4760_CODEC_REG_GCR6, JZ4760_CODEC_REG_GCR5,

			      REG_GCR_GAIN_OFFSET, REG_GCR_GAIN_MAX, 1, dac_tlv),

};



static const struct snd_kcontrol_new jz4760_codec_hp_playback_controls[] = {

	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.name = "Volume",

		.info = snd_soc_info_volsw,

		.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ

			| SNDRV_CTL_ELEM_ACCESS_READWRITE,

		.tlv.p = out_tlv,

		.get = snd_soc_dapm_get_volsw,

		.put = snd_soc_dapm_put_volsw,

		.private_value = SOC_DOUBLE_R_VALUE(JZ4760_CODEC_REG_GCR2,

						    JZ4760_CODEC_REG_GCR1,

						    REG_GCR_GAIN_OFFSET,

						    REG_GCR_GAIN_MAX, 1),

	},

	SOC_DAPM_DOUBLE_R_TLV("Volume", JZ4760_CODEC_REG_GCR2, JZ4760_CODEC_REG_GCR1,

			      REG_GCR_GAIN_OFFSET, REG_GCR_GAIN_MAX, 1, out_tlv),

};



static int hpout_event(struct snd_soc_dapm_widget *w,