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

Commit 229e3fdc authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: core: Add DOUBLE_R variants of the _RANGE controls 



The code handles this fine already, we just need new macros in the header
for drivers to create the controls.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
parent bb1591b3

include/sound/soc.h

+21 −0
Original line number Diff line number Diff line
@@ -42,6 +42,10 @@ 
	((unsigned long)&(struct soc_mixer_control) \

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

	.max = xmax, .platform_max = xmax, .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, .platform_max = xmax, .invert = 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,\
@@ -96,6 +100,13 @@ 
	.get = snd_soc_get_volsw, .put = snd_soc_put_volsw, \

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

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

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

	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\
@@ -114,6 +125,16 @@ 
	.get = snd_soc_get_volsw, .put = snd_soc_put_volsw, \

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

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

	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\

		 SNDRV_CTL_ELEM_ACCESS_READWRITE,\

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

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

	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \