ASoC: SDCA: Pass device register map from IRQ alloc to handlers

Store a copy of the device register map in the structure for the IRQ
handlers. This will allow the individual IRQ handlers access to the
device level register map if required.

Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>
Link: https://patch.msgid.link/20251020155512.353774-6-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/sdca_interrupts.h b/include/sound/sdca_interrupts.h
index bbbc3ab27ebae59416df30eed9d5b4ef08d517fa..d652c6e94ddcb499bcb86b1e709226b63ae44c20 100644 (file)
--- a/include/sound/sdca_interrupts.h
+++ b/include/sound/sdca_interrupts.h
@@ -23,6 +23,7 @@ struct sdca_function_data;
 /**
  * struct sdca_interrupt - contains information about a single SDCA interrupt
  * @name: The name of the interrupt.
+ * @device_regmap: Pointer to the IRQ regmap.
  * @component: Pointer to the ASoC component owns the interrupt.
  * @function: Pointer to the Function that the interrupt is associated with.
  * @entity: Pointer to the Entity that the interrupt is associated with.
@@ -35,6 +36,7 @@ struct sdca_function_data;
 struct sdca_interrupt {
        const char *name;
 
+       struct regmap *device_regmap;
        struct snd_soc_component *component;
        struct sdca_function_data *function;
        struct sdca_entity *entity;

diff --git a/sound/soc/sdca/sdca_interrupts.c b/sound/soc/sdca/sdca_interrupts.c
index 9295d283be910bb8ff022c830511068def3f2d39..898069ceffe93e97c041acfc3c30c76a0a0ec9d8 100644 (file)
--- a/sound/soc/sdca/sdca_interrupts.c
+++ b/sound/soc/sdca/sdca_interrupts.c
@@ -437,7 +437,7 @@ struct sdca_interrupt_info *sdca_irq_allocate(struct device *sdev,
                                              struct regmap *regmap, int irq)
 {
        struct sdca_interrupt_info *info;
-       int ret;
+       int ret, i;
 
        info = devm_kzalloc(sdev, sizeof(*info), GFP_KERNEL);
        if (!info)
@@ -445,6 +445,9 @@ struct sdca_interrupt_info *sdca_irq_allocate(struct device *sdev,
 
        info->irq_chip = sdca_irq_chip;
 
+       for (i = 0; i < ARRAY_SIZE(info->irqs); i++)
+               info->irqs[i].device_regmap = regmap;
+
        ret = devm_mutex_init(sdev, &info->irq_lock);
        if (ret)
                return ERR_PTR(ret);