ASoC: tac5xx2-sdw: Rename gain and volume macros

  Rename gain and volume macros to match the hardware intent. Currently,
both TAC_SDCA_CHANNEL_GAIN and TAC_SDCA_CHANNEL_VOLUME are defined as 0x02.
Keep only TAC_SDCA_CHANNEL_VOLUME and reposition TAC_SDCA_CHANNEL_GAIN to
0x0B. Remove the now-redundant TAC_SDCA_MASTER_GAIN alias (also 0x0B),
replacing its single use with TAC_SDCA_CHANNEL_GAIN.

Signed-off-by: Niranjan H Y <niranjan.hy@ti.com>
Link: https://patch.msgid.link/20260820115114.1203-2-niranjan.hy@ti.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/tac5xx2-sdw.c b/sound/soc/codecs/tac5xx2-sdw.c
index c062065a807dac63829c54c3e6d9bf6483ee1c84..065e7d456240f0da6f2640efe73c8840c861e5e7 100644 (file)
--- a/sound/soc/codecs/tac5xx2-sdw.c
+++ b/sound/soc/codecs/tac5xx2-sdw.c
@@ -123,9 +123,9 @@ static const DECLARE_TLV_DB_SCALE(tac5xx2_dvc_tlv, -7200, 50, 0);
 #define TAC_DOUBLE_Q78_TLV(name, func_id, ent_id) \
        SDCA_DOUBLE_Q78_TLV(name, \
                            SDW_SDCA_CTL(TAC_FUNCTION_ID_##func_id, TAC_SDCA_ENT_##ent_id, \
-                                        TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_LEFT), \
+                                        TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_LEFT), \
                            SDW_SDCA_CTL(TAC_FUNCTION_ID_##func_id, TAC_SDCA_ENT_##ent_id, \
-                                        TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_RIGHT), \
+                                        TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_RIGHT), \
                            TAC_DVC_MIN, TAC_DVC_MAX, TAC_DVC_STEP, tac5xx2_dvc_tlv)
 
 struct tac5xx2_prv {
@@ -385,33 +385,33 @@ static const struct reg_default tac_reg_default[] = {
 
 static const struct reg_sequence tac_spk_seq[] = {
        REG_SEQ0(SDW_SDCA_CTL(TAC_FUNCTION_ID_SA, TAC_SDCA_ENT_FU21,
-                             TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_LEFT), 0),
+                             TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_LEFT), 0),
        REG_SEQ0(SDW_SDCA_CTL(TAC_FUNCTION_ID_SA, TAC_SDCA_ENT_FU21,
-                             TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_RIGHT), 0),
+                             TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_RIGHT), 0),
        REG_SEQ0(SDW_SDCA_CTL(TAC_FUNCTION_ID_SA, TAC_SDCA_ENT_FU23,
-                             TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_LEFT), 0),
+                             TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_LEFT), 0),
        REG_SEQ0(SDW_SDCA_CTL(TAC_FUNCTION_ID_SA, TAC_SDCA_ENT_FU23,
-                             TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_RIGHT), 0),
+                             TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_RIGHT), 0),
 };
 
 static const struct reg_sequence tac_sm_seq[] = {
        REG_SEQ0(SDW_SDCA_CTL(TAC_FUNCTION_ID_SM, TAC_SDCA_ENT_FU113,
-                             TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_LEFT), 0),
+                             TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_LEFT), 0),
        REG_SEQ0(SDW_SDCA_CTL(TAC_FUNCTION_ID_SM, TAC_SDCA_ENT_FU113,
-                             TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_RIGHT), 0),
+                             TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_RIGHT), 0),
        REG_SEQ0(SDW_SDCA_CTL(TAC_FUNCTION_ID_SM, TAC_SDCA_ENT_FU11,
-                             TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_LEFT), 0),
+                             TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_LEFT), 0),
        REG_SEQ0(SDW_SDCA_CTL(TAC_FUNCTION_ID_SM, TAC_SDCA_ENT_FU11,
-                             TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_RIGHT), 0),
+                             TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_RIGHT), 0),
 };
 
 static const struct reg_sequence tac_uaj_seq[] = {
        REG_SEQ0(SDW_SDCA_CTL(TAC_FUNCTION_ID_UAJ, TAC_SDCA_ENT_FU41,
-                             TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_LEFT), 0),
+                             TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_LEFT), 0),
        REG_SEQ0(SDW_SDCA_CTL(TAC_FUNCTION_ID_UAJ, TAC_SDCA_ENT_FU41,
-                             TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_RIGHT), 0),
+                             TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_RIGHT), 0),
        REG_SEQ0(SDW_SDCA_CTL(TAC_FUNCTION_ID_UAJ, TAC_SDCA_ENT_FU36,
-                             TAC_SDCA_CHANNEL_GAIN, TAC_JACK_MONO_CS), 0),
+                             TAC_SDCA_CHANNEL_VOLUME, TAC_JACK_MONO_CS), 0),
 };
 
 static bool tac_volatile_reg(struct device *dev, unsigned int reg)
@@ -468,25 +468,25 @@ static int tac_sdca_mbq_size(struct device *dev, unsigned int reg)
        case SDW_SDCA_CTL(TAC_FUNCTION_ID_SA, TAC_SDCA_ENT_FU21,
                          TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_RIGHT):
        case SDW_SDCA_CTL(TAC_FUNCTION_ID_SA, TAC_SDCA_ENT_FU23,
-                         TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_LEFT):
+                         TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_LEFT):
        case SDW_SDCA_CTL(TAC_FUNCTION_ID_SA, TAC_SDCA_ENT_FU23,
-                         TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_RIGHT):
+                         TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_RIGHT):
        case SDW_SDCA_CTL(TAC_FUNCTION_ID_SA, TAC_SDCA_ENT_FU23,
-                         TAC_SDCA_MASTER_GAIN, 0):
+                         TAC_SDCA_CHANNEL_GAIN, 0):
        case SDW_SDCA_CTL(TAC_FUNCTION_ID_SM, TAC_SDCA_ENT_FU113,
-                         TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_LEFT):
+                         TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_LEFT):
        case SDW_SDCA_CTL(TAC_FUNCTION_ID_SM, TAC_SDCA_ENT_FU113,
-                         TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_RIGHT):
+                         TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_RIGHT):
        case SDW_SDCA_CTL(TAC_FUNCTION_ID_SM, TAC_SDCA_ENT_FU11,
-                         TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_LEFT):
+                         TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_LEFT):
        case SDW_SDCA_CTL(TAC_FUNCTION_ID_SM, TAC_SDCA_ENT_FU11,
-                         TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_RIGHT):
+                         TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_RIGHT):
        case SDW_SDCA_CTL(TAC_FUNCTION_ID_UAJ, TAC_SDCA_ENT_FU41,
-                         TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_LEFT):
+                         TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_LEFT):
        case SDW_SDCA_CTL(TAC_FUNCTION_ID_UAJ, TAC_SDCA_ENT_FU41,
-                         TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_RIGHT):
+                         TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_RIGHT):
        case SDW_SDCA_CTL(TAC_FUNCTION_ID_UAJ, TAC_SDCA_ENT_FU36,
-                         TAC_SDCA_CHANNEL_GAIN, TAC_JACK_MONO_CS):
+                         TAC_SDCA_CHANNEL_VOLUME, TAC_JACK_MONO_CS):
                return 2;
 
        default:
@@ -531,7 +531,7 @@ static const struct snd_kcontrol_new tac_uaj_controls[] = {
        TAC_DOUBLE_Q78_TLV("UAJ Playback Volume", UAJ, FU41),
        SDCA_SINGLE_Q78_TLV("UAJ Capture Volume",
                            SDW_SDCA_CTL(TAC_FUNCTION_ID_UAJ, TAC_SDCA_ENT_FU36,
-                                        TAC_SDCA_CHANNEL_GAIN, TAC_JACK_MONO_CS),
+                                        TAC_SDCA_CHANNEL_VOLUME, TAC_JACK_MONO_CS),
                           TAC_DVC_MIN, TAC_DVC_MAX, TAC_DVC_STEP, tac5xx2_dvc_tlv),
 };
 

diff --git a/sound/soc/codecs/tac5xx2.h b/sound/soc/codecs/tac5xx2.h
index eed8e6cf3498b56ae714602cf5d21e99e18ca931..a84c5ca515a7bba3e7d63f4e2434e74e3cea06e8 100644 (file)
--- a/sound/soc/codecs/tac5xx2.h
+++ b/sound/soc/codecs/tac5xx2.h
@@ -174,14 +174,13 @@
 #define TAC_SDCA_ENT_SAPU29    0x35
 
 /* Control selector definitions */
-#define TAC_SDCA_MASTER_GAIN   0x0B
 #define TAC_SDCA_MASTER_MUTE   0x01
 #define TAC_SDCA_CHANNEL_MUTE  0x01
-#define TAC_SDCA_CHANNEL_GAIN  0x02
+#define TAC_SDCA_CHANNEL_VOLUME        0x02
 #define TAC_SDCA_POSTURENUMBER 0x10
 #define TAC_SDCA_REQUESTED_PS  0x01
 #define TAC_SDCA_ACTUAL_PS     0x10
-#define TAC_SDCA_CHANNEL_VOLUME        0x02
+#define TAC_SDCA_CHANNEL_GAIN  0x0B
 
 /* 2. smart mic function */
 #define TAC_FUNCTION_ID_SM     0x2