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: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/20250303171424.444556-11-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 7cf52c8c9cf3298c4f9eebac3fe492c56b81065b..bed1c37529aca3fcd938b2d57e0dc7ee381f8244 100644 (file)
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -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, \

diff --git a/sound/soc/codecs/jz4760.c b/sound/soc/codecs/jz4760.c
index 6217e611259fe15f111a193ae9b6c6fbacf0651f..e04af1b9ace861b8284d3a91243cbdff80a79dd2 100644 (file)
--- a/sound/soc/codecs/jz4760.c
+++ b/sound/soc/codecs/jz4760.c
@@ -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,

diff --git a/sound/soc/codecs/jz4770.c b/sound/soc/codecs/jz4770.c
index acb9eaa7ea1c50e2178d402deed9862a9527d6b1..312202ab5ceae32ce81dc4201bcb89636adf06d4 100644 (file)
--- a/sound/soc/codecs/jz4770.c
+++ b/sound/soc/codecs/jz4770.c
@@ -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,