[PATCH 5/5] ASoC: aw88399: rename AW883XX_* macros to AW88399_*
From: Marco Giunta
Date: Thu Nov 19 2026 - 11:31:25 EST
The aw88399 library header at include/sound/aw88399.h defines all its
macros as AW88399_*, apart from a few AW883XX_* ones.
These are likely an oversight from when the generic Android vendor driver,
aw883xx, was originally ported upstream in an aw88399-specialized version.
Rename these macros to AW88399_* to make them consistent with the rest of
the header.
Signed-off-by: Marco Giunta <marco_giunta@xxxxxxxxxx>
---
include/sound/aw88399.h | 14 +++++++-------
sound/soc/codecs/aw88399.c | 6 +++---
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/sound/aw88399.h b/include/sound/aw88399.h
index d72c491ee866..fa43e8068093 100644
--- a/include/sound/aw88399.h
+++ b/include/sound/aw88399.h
@@ -469,13 +469,13 @@
#define AW88399_DSP_VOL_MASK \
(~(((1<<AW88399_DSP_VOL_BITS_LEN)-1) << AW88399_DSP_VOL_START_BIT))
-#define AW883XX_DSP_NG_EN_START (13)
-#define AW883XX_DSP_NG_EN_LEN (1)
-#define AW883XX_DSP_NG_EN_MASK \
- (~(((1 << AW883XX_DSP_NG_EN_LEN) - 1) << AW883XX_DSP_NG_EN_START))
-#define AW883XX_DSP_NG_EN_DISABLE (0)
-#define AW883XX_DSP_NG_EN_DISABLE_VALUE \
- (AW883XX_DSP_NG_EN_DISABLE << AW883XX_DSP_NG_EN_START)
+#define AW88399_DSP_NG_EN_START (13)
+#define AW88399_DSP_NG_EN_LEN (1)
+#define AW88399_DSP_NG_EN_MASK \
+ (~(((1 << AW88399_DSP_NG_EN_LEN) - 1) << AW88399_DSP_NG_EN_START))
+#define AW88399_DSP_NG_EN_DISABLE (0)
+#define AW88399_DSP_NG_EN_DISABLE_VALUE \
+ (AW88399_DSP_NG_EN_DISABLE << AW88399_DSP_NG_EN_START)
#define AW88399_VOLUME_STEP_DB (64)
#define AW88399_VOL_DEFAULT_VALUE (0)
diff --git a/sound/soc/codecs/aw88399.c b/sound/soc/codecs/aw88399.c
index 1275ac601bcb..28a9803a693f 100644
--- a/sound/soc/codecs/aw88399.c
+++ b/sound/soc/codecs/aw88399.c
@@ -106,7 +106,7 @@ static int aw_cali_svc_cali_en(struct aw_device *aw_dev, bool cali_en)
aw_dev_dsp_enable(aw_dev, false);
if (cali_en) {
regmap_update_bits(aw_dev->regmap, AW88399_DBGCTRL_REG,
- ~AW883XX_DSP_NG_EN_MASK, AW883XX_DSP_NG_EN_DISABLE_VALUE);
+ ~AW88399_DSP_NG_EN_MASK, AW88399_DSP_NG_EN_DISABLE_VALUE);
aw_dev_dsp_write(aw_dev, AW88399_DSP_LOW_POWER_SWITCH_CFG_ADDR,
AW88399_DSP_LOW_POWER_SWITCH_DISABLE, AW_DSP_16_DATA);
@@ -166,7 +166,7 @@ static void aw_cali_svc_backup_info(struct aw_device *aw_dev)
unsigned int reg_val, dsp_val;
regmap_read(aw_dev->regmap, AW88399_DBGCTRL_REG, ®_val);
- backup_desc->dsp_ng_cfg = reg_val & (~AW883XX_DSP_NG_EN_MASK);
+ backup_desc->dsp_ng_cfg = reg_val & (~AW88399_DSP_NG_EN_MASK);
aw_dev_dsp_read(aw_dev, AW88399_DSP_LOW_POWER_SWITCH_CFG_ADDR, &dsp_val, AW_DSP_16_DATA);
@@ -178,7 +178,7 @@ static void aw_cali_svc_recover_info(struct aw_device *aw_dev)
struct aw_cali_backup_desc *backup_desc = &aw_dev->cali_desc.backup_info;
regmap_update_bits(aw_dev->regmap, AW88399_DBGCTRL_REG,
- ~AW883XX_DSP_NG_EN_MASK, backup_desc->dsp_ng_cfg);
+ ~AW88399_DSP_NG_EN_MASK, backup_desc->dsp_ng_cfg);
aw_dev_dsp_write(aw_dev, AW88399_DSP_LOW_POWER_SWITCH_CFG_ADDR,
backup_desc->dsp_lp_cfg, AW_DSP_16_DATA);
--
2.56.1