[PATCH 2/3] ASoC: xlnx: spdif: namespace register macros and use a divider enum

From: Dhanunjanrao Katta

Date: Tue Nov 17 2026 - 03:58:25 EST


The field defines were not named after the registers they belong to and
were listed apart from them, three driver constants carried no prefix at
all, and the clock-divider configuration values were written as bare
numbers at the assignment sites.

Name each field define after its register and group the field defines
under it, prefix the remaining driver constants with "XSPDIF_", and
replace the bare clock-divider values with the "xspdif_clk_div" enum,
giving clk_cfg that type.

The channel-status interrupt mask is written to both the status and the
enable register, so it is named for the field rather than for one of the
two registers.

Signed-off-by: Dhanunjanrao Katta <katta.dhanunjanrao@xxxxxxx>
---
sound/soc/xilinx/xlnx_spdif.c | 81 ++++++++++++++++++++---------------
1 file changed, 46 insertions(+), 35 deletions(-)

diff --git a/sound/soc/xilinx/xlnx_spdif.c b/sound/soc/xilinx/xlnx_spdif.c
index 9fdafd45c381..a9d1fe9cc610 100644
--- a/sound/soc/xilinx/xlnx_spdif.c
+++ b/sound/soc/xilinx/xlnx_spdif.c
@@ -22,25 +22,34 @@

#define XLNX_SPDIF_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE)

+#define XSPDIF_GLOBAL_IRQ_REG 0x1C
+#define XSPDIF_GLOBAL_IRQ_ENABLE_MASK BIT(31)
#define XSPDIF_IRQ_STS_REG 0x20
+#define XSPDIF_IRQ_CH_STS_MASK BIT(5)
#define XSPDIF_IRQ_ENABLE_REG 0x28
#define XSPDIF_SOFT_RESET_REG 0x40
+#define XSPDIF_SOFT_RESET_VAL 0xA
#define XSPDIF_CONTROL_REG 0x44
+#define XSPDIF_CONTROL_ENABLE_MASK BIT(0)
+#define XSPDIF_CONTROL_FIFO_FLUSH_MASK BIT(1)
+#define XSPDIF_CONTROL_CLK_CFG_MASK GENMASK(5, 2)
+#define XSPDIF_CONTROL_CLK_CFG_SHIFT 2
#define XSPDIF_CHAN_0_STS_REG 0x4C
-#define XSPDIF_GLOBAL_IRQ_ENABLE_REG 0x1C
#define XSPDIF_CH_A_USER_DATA_REG_0 0x64

-#define XSPDIF_CORE_ENABLE_MASK BIT(0)
-#define XSPDIF_FIFO_FLUSH_MASK BIT(1)
-#define XSPDIF_CH_STS_MASK BIT(5)
-#define XSPDIF_GLOBAL_IRQ_ENABLE BIT(31)
-#define XSPDIF_CLOCK_CONFIG_BITS_MASK GENMASK(5, 2)
-#define XSPDIF_CLOCK_CONFIG_BITS_SHIFT 2
-#define XSPDIF_SOFT_RESET_VALUE 0xA
-
-#define MAX_CHANNELS 2
-#define AES_SAMPLE_WIDTH 32
-#define CH_STATUS_UPDATE_TIMEOUT 40
+#define XSPDIF_MAX_CHANNELS 2
+#define XSPDIF_AES_SAMPLE_WIDTH 32
+#define XSPDIF_CH_STS_UPDATE_TIMEOUT 40
+
+enum xspdif_clk_div {
+ XSPDIF_CLK_DIV_BY_4,
+ XSPDIF_CLK_DIV_BY_8,
+ XSPDIF_CLK_DIV_BY_16,
+ XSPDIF_CLK_DIV_BY_24,
+ XSPDIF_CLK_DIV_BY_32,
+ XSPDIF_CLK_DIV_BY_48,
+ XSPDIF_CLK_DIV_BY_64,
+};

struct spdif_dev_data {
u32 mode;
@@ -57,12 +66,12 @@ static irqreturn_t xlnx_spdifrx_irq_handler(int irq, void *arg)
struct spdif_dev_data *ctx = arg;

val = readl(ctx->base + XSPDIF_IRQ_STS_REG);
- if (val & XSPDIF_CH_STS_MASK) {
- writel(val & XSPDIF_CH_STS_MASK,
+ if (val & XSPDIF_IRQ_CH_STS_MASK) {
+ writel(val & XSPDIF_IRQ_CH_STS_MASK,
ctx->base + XSPDIF_IRQ_STS_REG);
val = readl(ctx->base +
XSPDIF_IRQ_ENABLE_REG);
- writel(val & ~XSPDIF_CH_STS_MASK,
+ writel(val & ~XSPDIF_IRQ_CH_STS_MASK,
ctx->base + XSPDIF_IRQ_ENABLE_REG);

ctx->rx_chsts_updated = true;
@@ -80,14 +89,14 @@ static int xlnx_spdif_startup(struct snd_pcm_substream *substream,
struct spdif_dev_data *ctx = dev_get_drvdata(dai->dev);

val = readl(ctx->base + XSPDIF_CONTROL_REG);
- val |= XSPDIF_FIFO_FLUSH_MASK;
+ val |= XSPDIF_CONTROL_FIFO_FLUSH_MASK;
writel(val, ctx->base + XSPDIF_CONTROL_REG);

if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
- writel(XSPDIF_CH_STS_MASK,
+ writel(XSPDIF_IRQ_CH_STS_MASK,
ctx->base + XSPDIF_IRQ_ENABLE_REG);
- writel(XSPDIF_GLOBAL_IRQ_ENABLE,
- ctx->base + XSPDIF_GLOBAL_IRQ_ENABLE_REG);
+ writel(XSPDIF_GLOBAL_IRQ_ENABLE_MASK,
+ ctx->base + XSPDIF_GLOBAL_IRQ_REG);
}

return 0;
@@ -98,48 +107,50 @@ static void xlnx_spdif_shutdown(struct snd_pcm_substream *substream,
{
struct spdif_dev_data *ctx = dev_get_drvdata(dai->dev);

- writel(XSPDIF_SOFT_RESET_VALUE, ctx->base + XSPDIF_SOFT_RESET_REG);
+ writel(XSPDIF_SOFT_RESET_VAL, ctx->base + XSPDIF_SOFT_RESET_REG);
}

static int xlnx_spdif_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params,
struct snd_soc_dai *dai)
{
- u32 val, clk_div, clk_cfg;
+ enum xspdif_clk_div clk_cfg;
+ u32 val, clk_div;
struct spdif_dev_data *ctx = dev_get_drvdata(dai->dev);

- clk_div = DIV_ROUND_CLOSEST(ctx->aclk, MAX_CHANNELS * AES_SAMPLE_WIDTH *
+ clk_div = DIV_ROUND_CLOSEST(ctx->aclk, XSPDIF_MAX_CHANNELS *
+ XSPDIF_AES_SAMPLE_WIDTH *
params_rate(params));

switch (clk_div) {
case 4:
- clk_cfg = 0;
+ clk_cfg = XSPDIF_CLK_DIV_BY_4;
break;
case 8:
- clk_cfg = 1;
+ clk_cfg = XSPDIF_CLK_DIV_BY_8;
break;
case 16:
- clk_cfg = 2;
+ clk_cfg = XSPDIF_CLK_DIV_BY_16;
break;
case 24:
- clk_cfg = 3;
+ clk_cfg = XSPDIF_CLK_DIV_BY_24;
break;
case 32:
- clk_cfg = 4;
+ clk_cfg = XSPDIF_CLK_DIV_BY_32;
break;
case 48:
- clk_cfg = 5;
+ clk_cfg = XSPDIF_CLK_DIV_BY_48;
break;
case 64:
- clk_cfg = 6;
+ clk_cfg = XSPDIF_CLK_DIV_BY_64;
break;
default:
return -EINVAL;
}

val = readl(ctx->base + XSPDIF_CONTROL_REG);
- val &= ~XSPDIF_CLOCK_CONFIG_BITS_MASK;
- val |= clk_cfg << XSPDIF_CLOCK_CONFIG_BITS_SHIFT;
+ val &= ~XSPDIF_CONTROL_CLK_CFG_MASK;
+ val |= clk_cfg << XSPDIF_CONTROL_CLK_CFG_SHIFT;
writel(val, ctx->base + XSPDIF_CONTROL_REG);

return 0;
@@ -149,7 +160,7 @@ static int rx_stream_detect(struct snd_soc_dai *dai)
{
int err;
struct spdif_dev_data *ctx = dev_get_drvdata(dai->dev);
- unsigned long jiffies = msecs_to_jiffies(CH_STATUS_UPDATE_TIMEOUT);
+ unsigned long jiffies = msecs_to_jiffies(XSPDIF_CH_STS_UPDATE_TIMEOUT);

/* start capture only if stream is detected within 40ms timeout */
err = wait_event_interruptible_timeout(ctx->chsts_q,
@@ -176,7 +187,7 @@ static int xlnx_spdif_trigger(struct snd_pcm_substream *substream, int cmd,
case SNDRV_PCM_TRIGGER_START:
case SNDRV_PCM_TRIGGER_RESUME:
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
- val |= XSPDIF_CORE_ENABLE_MASK;
+ val |= XSPDIF_CONTROL_ENABLE_MASK;
writel(val, ctx->base + XSPDIF_CONTROL_REG);
if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
ret = rx_stream_detect(dai);
@@ -184,7 +195,7 @@ static int xlnx_spdif_trigger(struct snd_pcm_substream *substream, int cmd,
case SNDRV_PCM_TRIGGER_STOP:
case SNDRV_PCM_TRIGGER_SUSPEND:
case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
- val &= ~XSPDIF_CORE_ENABLE_MASK;
+ val &= ~XSPDIF_CONTROL_ENABLE_MASK;
writel(val, ctx->base + XSPDIF_CONTROL_REG);
break;
default:
@@ -287,7 +298,7 @@ static int xlnx_spdif_probe(struct platform_device *pdev)
if (ret)
return ret;

- writel(XSPDIF_SOFT_RESET_VALUE, ctx->base + XSPDIF_SOFT_RESET_REG);
+ writel(XSPDIF_SOFT_RESET_VAL, ctx->base + XSPDIF_SOFT_RESET_REG);
dev_info(dev, "%s DAI registered\n", dai_drv->name);

return 0;
--
2.34.1