pinctrl: pistachio: Convert to immutable irq_chip

Convert the driver to immutable irq-chip with a bit of
intuition.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230414-immutable-irqchips-2-v1-2-6b59a5186b00@linaro.org

diff --git a/drivers/pinctrl/pinctrl-pistachio.c b/drivers/pinctrl/pinctrl-pistachio.c
index 7ca4ecb..5340834 100644 (file)
--- a/drivers/pinctrl/pinctrl-pistachio.c
+++ b/drivers/pinctrl/pinctrl-pistachio.c
@@ -17,6 +17,7 @@
 #include <linux/pinctrl/pinmux.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
+#include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 
@@ -93,10 +94,10 @@ struct pistachio_pin_group {
 struct pistachio_gpio_bank {
        struct pistachio_pinctrl *pctl;
        void __iomem *base;
+       int instance;
        unsigned int pin_base;
        unsigned int npins;
        struct gpio_chip gpio_chip;
-       struct irq_chip irq_chip;
 };
 
 struct pistachio_pinctrl {
@@ -1228,12 +1229,14 @@ static void pistachio_gpio_irq_mask(struct irq_data *data)
        struct pistachio_gpio_bank *bank = irqd_to_bank(data);
 
        gpio_mask_writel(bank, GPIO_INTERRUPT_EN, data->hwirq, 0);
+       gpiochip_disable_irq(&bank->gpio_chip, irqd_to_hwirq(data));
 }
 
 static void pistachio_gpio_irq_unmask(struct irq_data *data)
 {
        struct pistachio_gpio_bank *bank = irqd_to_bank(data);
 
+       gpiochip_enable_irq(&bank->gpio_chip, irqd_to_hwirq(data));
        gpio_mask_writel(bank, GPIO_INTERRUPT_EN, data->hwirq, 1);
 }
 
@@ -1312,6 +1315,7 @@ static void pistachio_gpio_irq_handler(struct irq_desc *desc)
 
 #define GPIO_BANK(_bank, _pin_base, _npins)                            \
        {                                                               \
+               .instance = (_bank),                                    \
                .pin_base = _pin_base,                                  \
                .npins = _npins,                                        \
                .gpio_chip = {                                          \
@@ -1326,14 +1330,6 @@ static void pistachio_gpio_irq_handler(struct irq_desc *desc)
                        .base = _pin_base,                              \
                        .ngpio = _npins,                                \
                },                                                      \
-               .irq_chip = {                                           \
-                       .name = "GPIO" #_bank,                          \
-                       .irq_startup = pistachio_gpio_irq_startup,      \
-                       .irq_ack = pistachio_gpio_irq_ack,              \
-                       .irq_mask = pistachio_gpio_irq_mask,            \
-                       .irq_unmask = pistachio_gpio_irq_unmask,        \
-                       .irq_set_type = pistachio_gpio_irq_set_type,    \
-               },                                                      \
        }
 
 static struct pistachio_gpio_bank pistachio_gpio_banks[] = {
@@ -1345,6 +1341,25 @@ static struct pistachio_gpio_bank pistachio_gpio_banks[] = {
        GPIO_BANK(5, PISTACHIO_PIN_MFIO(80), 10),
 };
 
+static void pistachio_gpio_irq_print_chip(struct irq_data *data,
+                                         struct seq_file *p)
+{
+       struct pistachio_gpio_bank *bank = irqd_to_bank(data);
+
+       seq_printf(p, "GPIO%d", bank->instance);
+}
+
+static const struct irq_chip pistachio_gpio_irq_chip = {
+       .irq_startup = pistachio_gpio_irq_startup,
+       .irq_ack = pistachio_gpio_irq_ack,
+       .irq_mask = pistachio_gpio_irq_mask,
+       .irq_unmask = pistachio_gpio_irq_unmask,
+       .irq_set_type = pistachio_gpio_irq_set_type,
+       .irq_print_chip = pistachio_gpio_irq_print_chip,
+       .flags = IRQCHIP_IMMUTABLE,
+       GPIOCHIP_IRQ_RESOURCE_HELPERS,
+};
+
 static int pistachio_gpio_register(struct pistachio_pinctrl *pctl)
 {
        struct pistachio_gpio_bank *bank;
@@ -1394,7 +1409,7 @@ static int pistachio_gpio_register(struct pistachio_pinctrl *pctl)
                bank->gpio_chip.fwnode = child;
 
                girq = &bank->gpio_chip.irq;
-               girq->chip = &bank->irq_chip;
+               gpio_irq_chip_set_chip(girq, &pistachio_gpio_irq_chip);
                girq->parent_handler = pistachio_gpio_irq_handler;
                girq->num_parents = 1;
                girq->parents = devm_kcalloc(pctl->dev, 1,