mfd: intel_soc_pmic_bxtwc: Use IRQ domain for PMIC devices

[ Upstream commit 0350d783ab888cb1cb48ced36cc28b372723f1a4 ]

While design wise the idea of converting the driver to use
the hierarchy of the IRQ chips is correct, the implementation
has (inherited) flaws. This was unveiled when platform_get_irq()
had started WARN() on IRQ 0 that is supposed to be a Linux
IRQ number (also known as vIRQ).

Rework the driver to respect IRQ domain when creating each MFD
device separately, as the domain is not the same for all of them.

Fixes: 57129044f504 ("mfd: intel_soc_pmic_bxtwc: Use chained IRQs for second level IRQ chips")
Tested-by: Zhang Ning <zhangn1985@outlook.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20241005193029.1929139-4-andriy.shevchenko@linux.intel.com
Signed-off-by: Lee Jones <lee@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/mfd/intel_soc_pmic_bxtwc.c b/drivers/mfd/intel_soc_pmic_bxtwc.c
index f4d50e35b84891a145189c3e084af028e217dd98..f588e0f1fd0ade10079b98cf630e07f0113e6a22 100644 (file)
--- a/drivers/mfd/intel_soc_pmic_bxtwc.c
+++ b/drivers/mfd/intel_soc_pmic_bxtwc.c
@@ -231,21 +231,11 @@ static const struct resource tmu_resources[] = {
 };
 
 static struct mfd_cell bxt_wc_dev[] = {
-       {
-               .name = "bxt_wcove_gpadc",
-               .num_resources = ARRAY_SIZE(adc_resources),
-               .resources = adc_resources,
-       },
        {
                .name = "bxt_wcove_thermal",
                .num_resources = ARRAY_SIZE(thermal_resources),
                .resources = thermal_resources,
        },
-       {
-               .name = "bxt_wcove_bcu",
-               .num_resources = ARRAY_SIZE(bcu_resources),
-               .resources = bcu_resources,
-       },
        {
                .name = "bxt_wcove_gpio",
                .num_resources = ARRAY_SIZE(gpio_resources),
@@ -264,6 +254,22 @@ static const struct mfd_cell bxt_wc_tmu_dev[] = {
        },
 };
 
+static const struct mfd_cell bxt_wc_bcu_dev[] = {
+       {
+               .name = "bxt_wcove_bcu",
+               .num_resources = ARRAY_SIZE(bcu_resources),
+               .resources = bcu_resources,
+       },
+};
+
+static const struct mfd_cell bxt_wc_adc_dev[] = {
+       {
+               .name = "bxt_wcove_gpadc",
+               .num_resources = ARRAY_SIZE(adc_resources),
+               .resources = adc_resources,
+       },
+};
+
 static struct mfd_cell bxt_wc_chgr_dev[] = {
        {
                .name = "bxt_wcove_usbc",
@@ -509,23 +515,23 @@ static int bxtwc_probe(struct platform_device *pdev)
        if (ret)
                return dev_err_probe(dev, ret, "Failed to add PWRBTN IRQ chip\n");
 
-       /* Add chained IRQ handler for BCU IRQs */
-       ret = bxtwc_add_chained_irq_chip(pmic, pmic->irq_chip_data,
-                                        BXTWC_BCU_LVL1_IRQ,
-                                        IRQF_ONESHOT,
-                                        &bxtwc_regmap_irq_chip_bcu,
-                                        &pmic->irq_chip_data_bcu);
+       ret = bxtwc_add_chained_devices(pmic, bxt_wc_bcu_dev, ARRAY_SIZE(bxt_wc_bcu_dev),
+                                       pmic->irq_chip_data,
+                                       BXTWC_BCU_LVL1_IRQ,
+                                       IRQF_ONESHOT,
+                                       &bxtwc_regmap_irq_chip_bcu,
+                                       &pmic->irq_chip_data_bcu);
        if (ret)
-               return dev_err_probe(dev, ret, "Failed to add BUC IRQ chip\n");
+               return ret;
 
-       /* Add chained IRQ handler for ADC IRQs */
-       ret = bxtwc_add_chained_irq_chip(pmic, pmic->irq_chip_data,
-                                        BXTWC_ADC_LVL1_IRQ,
-                                        IRQF_ONESHOT,
-                                        &bxtwc_regmap_irq_chip_adc,
-                                        &pmic->irq_chip_data_adc);
+       ret = bxtwc_add_chained_devices(pmic, bxt_wc_adc_dev, ARRAY_SIZE(bxt_wc_adc_dev),
+                                       pmic->irq_chip_data,
+                                       BXTWC_ADC_LVL1_IRQ,
+                                       IRQF_ONESHOT,
+                                       &bxtwc_regmap_irq_chip_adc,
+                                       &pmic->irq_chip_data_adc);
        if (ret)
-               return dev_err_probe(dev, ret, "Failed to add ADC IRQ chip\n");
+               return ret;
 
        ret = bxtwc_add_chained_devices(pmic, bxt_wc_chgr_dev, ARRAY_SIZE(bxt_wc_chgr_dev),
                                        pmic->irq_chip_data,