From: Niranjan H Y <niranjan.hy@ti.com>
To: <linux-sound@vger.kernel.org>
Cc: <linux-kernel@vger.kernel.org>, <broonie@kernel.org>,
<ckeepax@opensource.cirrus.com>, <lgirdwood@gmail.com>,
<perex@perex.cz>, <tiwai@suse.com>, <cezary.rojewski@intel.com>,
<peter.ujfalusi@linux.intel.com>,
<yung-chuan.liao@linux.intel.com>, <kai.vehmanen@linux.intel.com>,
<pierre-louis.bossart@linux.dev>, <baojun.xu@ti.com>,
<shenghao-ding@ti.com>, <sandeepk@ti.com>, <v-hampiholi@ti.com>,
Niranjan H Y <niranjan.hy@ti.com>
Subject: [PATCH v2 2/3] ASoC: tac5xx2-sdw: Rename gain and volume macros
Date: Thu, 20 Aug 2026 17:21:13 +0530 [thread overview]
Message-ID: <20260820115114.1203-2-niranjan.hy@ti.com> (raw)
In-Reply-To: <20260820115114.1203-1-niranjan.hy@ti.com>
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>
---
changes in v2:
- newly added
---
sound/soc/codecs/tac5xx2-sdw.c | 48 +++++++++++++++++-----------------
sound/soc/codecs/tac5xx2.h | 5 ++--
2 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/sound/soc/codecs/tac5xx2-sdw.c b/sound/soc/codecs/tac5xx2-sdw.c
index c062065a8..065e7d456 100644
--- 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 eed8e6cf3..a84c5ca51 100644
--- 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
--
2.53.0
next prev parent reply other threads:[~2026-08-20 11:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-20 11:51 [PATCH v2 1/3] ASoC: sdw_utils: Set component_name for tac5xx2 codec family Niranjan H Y
2026-08-20 11:51 ` Niranjan H Y [this message]
2026-08-20 11:51 ` [PATCH v2 3/3] ASoC: tac5xx2-sdw: update default regmap registers Niranjan H Y
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260820115114.1203-2-niranjan.hy@ti.com \
--to=niranjan.hy@ti.com \
--cc=baojun.xu@ti.com \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=ckeepax@opensource.cirrus.com \
--cc=kai.vehmanen@linux.intel.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=peter.ujfalusi@linux.intel.com \
--cc=pierre-louis.bossart@linux.dev \
--cc=sandeepk@ti.com \
--cc=shenghao-ding@ti.com \
--cc=tiwai@suse.com \
--cc=v-hampiholi@ti.com \
--cc=yung-chuan.liao@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.