pinctrl: renesas: rzg2l: Fix configuring the GPIO pins as interrupts

On the RZ/G2UL SoC we have less number of pins compared to RZ/G2L and also
the pin configs are completely different. This patch makes sure we use the
appropriate pin configs for each SoC (which is passed as part of the OF
data) while configuring the GPIO pin as interrupts instead of using
rzg2l_gpio_configs[] for all the SoCs.

Fixes: bfc69bdbaad1 ("pinctrl: renesas: rzg2l: Add RZ/G2UL support")
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230102221815.273719-3-prabhakar.mahadev-lad.rj@bp.renesas.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

diff --git a/drivers/pinctrl/renesas/pinctrl-rzg2l.c b/drivers/pinctrl/renesas/pinctrl-rzg2l.c
index 5aa3836dbc226a1ee022f2e29022379f701f823d..6f762097557af046c725c53fc6e31d9fcb8e42b7 100644 (file)
--- a/drivers/pinctrl/renesas/pinctrl-rzg2l.c
+++ b/drivers/pinctrl/renesas/pinctrl-rzg2l.c
@@ -130,6 +130,7 @@ struct rzg2l_dedicated_configs {
 struct rzg2l_pinctrl_data {
        const char * const *port_pins;
        const u32 *port_pin_configs;
+       unsigned int n_ports;
        struct rzg2l_dedicated_configs *dedicated_pins;
        unsigned int n_port_pins;
        unsigned int n_dedicated_pins;
@@ -1124,7 +1125,7 @@ static struct {
        }
 };
 
-static int rzg2l_gpio_get_gpioint(unsigned int virq)
+static int rzg2l_gpio_get_gpioint(unsigned int virq, const struct rzg2l_pinctrl_data *data)
 {
        unsigned int gpioint;
        unsigned int i;
@@ -1133,13 +1134,13 @@ static int rzg2l_gpio_get_gpioint(unsigned int virq)
        port = virq / 8;
        bit = virq % 8;
 
-       if (port >= ARRAY_SIZE(rzg2l_gpio_configs) ||
-           bit >= RZG2L_GPIO_PORT_GET_PINCNT(rzg2l_gpio_configs[port]))
+       if (port >= data->n_ports ||
+           bit >= RZG2L_GPIO_PORT_GET_PINCNT(data->port_pin_configs[port]))
                return -EINVAL;
 
        gpioint = bit;
        for (i = 0; i < port; i++)
-               gpioint += RZG2L_GPIO_PORT_GET_PINCNT(rzg2l_gpio_configs[i]);
+               gpioint += RZG2L_GPIO_PORT_GET_PINCNT(data->port_pin_configs[i]);
 
        return gpioint;
 }
@@ -1239,7 +1240,7 @@ static int rzg2l_gpio_child_to_parent_hwirq(struct gpio_chip *gc,
        unsigned long flags;
        int gpioint, irq;
 
-       gpioint = rzg2l_gpio_get_gpioint(child);
+       gpioint = rzg2l_gpio_get_gpioint(child, pctrl->data);
        if (gpioint < 0)
                return gpioint;
 
@@ -1313,8 +1314,8 @@ static void rzg2l_init_irq_valid_mask(struct gpio_chip *gc,
                port = offset / 8;
                bit = offset % 8;
 
-               if (port >= ARRAY_SIZE(rzg2l_gpio_configs) ||
-                   bit >= RZG2L_GPIO_PORT_GET_PINCNT(rzg2l_gpio_configs[port]))
+               if (port >= pctrl->data->n_ports ||
+                   bit >= RZG2L_GPIO_PORT_GET_PINCNT(pctrl->data->port_pin_configs[port]))
                        clear_bit(offset, valid_mask);
        }
 }
@@ -1519,6 +1520,7 @@ static int rzg2l_pinctrl_probe(struct platform_device *pdev)
 static struct rzg2l_pinctrl_data r9a07g043_data = {
        .port_pins = rzg2l_gpio_names,
        .port_pin_configs = r9a07g043_gpio_configs,
+       .n_ports = ARRAY_SIZE(r9a07g043_gpio_configs),
        .dedicated_pins = rzg2l_dedicated_pins.common,
        .n_port_pins = ARRAY_SIZE(r9a07g043_gpio_configs) * RZG2L_PINS_PER_PORT,
        .n_dedicated_pins = ARRAY_SIZE(rzg2l_dedicated_pins.common),
@@ -1527,6 +1529,7 @@ static struct rzg2l_pinctrl_data r9a07g043_data = {
 static struct rzg2l_pinctrl_data r9a07g044_data = {
        .port_pins = rzg2l_gpio_names,
        .port_pin_configs = rzg2l_gpio_configs,
+       .n_ports = ARRAY_SIZE(rzg2l_gpio_configs),
        .dedicated_pins = rzg2l_dedicated_pins.common,
        .n_port_pins = ARRAY_SIZE(rzg2l_gpio_names),
        .n_dedicated_pins = ARRAY_SIZE(rzg2l_dedicated_pins.common) +