Unverified Commit 9e6e7e08 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: dapm: Add missing SOC_DAPM_DOUBLE_R_TLV() helper 



A few drivers are open coding SOC_DAPM_DOUBLE_R_TLV() add a core
helper and use that instead.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/20250303171424.444556-11-ckeepax@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7c5b07b4

include/sound/soc-dapm.h

+7 −0
Original line number Diff line number Diff line
@@ -347,6 +347,13 @@ struct soc_enum; 
	.private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 1) }

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

{	.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_DOUBLE_R_VALUE(lreg, rreg, shift, max, invert) }

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

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

	.info = snd_soc_info_volsw, \

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,

sound/soc/codecs/jz4770.c

+6 −34
Original line number Diff line number Diff line
@@ -331,43 +331,15 @@ static const struct snd_kcontrol_new jz4770_codec_snd_controls[] = { 
};



static const struct snd_kcontrol_new jz4770_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,

		/*

		 * NOTE: DACR/DACL are inversed; the gain value written to DACR

		 * seems to affect the left channel, and the gain value written

		 * to DACL seems to affect the right channel.

		 */

		.private_value = SOC_DOUBLE_R_VALUE(JZ4770_CODEC_REG_GCR_DACR,

						    JZ4770_CODEC_REG_GCR_DACL,

						    REG_GCR_GAIN_OFFSET,

						    REG_GCR_GAIN_MAX, 1),

	},

	SOC_DAPM_DOUBLE_R_TLV("Volume", JZ4770_CODEC_REG_GCR_DACR,

			      JZ4770_CODEC_REG_GCR_DACL, REG_GCR_GAIN_OFFSET,

			      REG_GCR_GAIN_MAX, 1, dac_tlv),

};



static const struct snd_kcontrol_new jz4770_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,

		/* HPR/HPL inversed for the same reason as above */

		.private_value = SOC_DOUBLE_R_VALUE(JZ4770_CODEC_REG_GCR_HPR,

						    JZ4770_CODEC_REG_GCR_HPL,

						    REG_GCR_GAIN_OFFSET,

						    REG_GCR_GAIN_MAX, 1),

	},

	SOC_DAPM_DOUBLE_R_TLV("Volume", JZ4770_CODEC_REG_GCR_HPR,

			      JZ4770_CODEC_REG_GCR_HPL, REG_GCR_GAIN_OFFSET,

			      REG_GCR_GAIN_MAX, 1, out_tlv),

};



static int hpout_event(struct snd_soc_dapm_widget *w,