gpio: realtek-otto: use new generic GPIO chip API

Convert the driver to using the new generic GPIO chip interfaces from
linux/gpio/generic.h.

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20250826-gpio-mmio-gpio-conv-part2-v1-9-f67603e4b27e@linaro.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

diff --git a/drivers/gpio/gpio-realtek-otto.c b/drivers/gpio/gpio-realtek-otto.c
index d6418f89d3f63d6029e127d4f774507c2ebbe0cb..ab711422254e9e8ff1a4e7c4016389e6d352f268 100644 (file)
--- a/drivers/gpio/gpio-realtek-otto.c
+++ b/drivers/gpio/gpio-realtek-otto.c
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
-#include <linux/gpio/driver.h>
 #include <linux/cpumask.h>
+#include <linux/gpio/driver.h>
+#include <linux/gpio/generic.h>
 #include <linux/irq.h>
 #include <linux/minmax.h>
 #include <linux/mod_devicetable.h>
@@ -41,7 +42,7 @@
 /**
  * realtek_gpio_ctrl - Realtek Otto GPIO driver data
  *
- * @gc: Associated gpio_chip instance
+ * @chip: Associated gpio_generic_chip instance
  * @base: Base address of the register block for a GPIO bank
  * @lock: Lock for accessing the IRQ registers and values
  * @intr_mask: Mask for interrupts lines
@@ -64,7 +65,7 @@
  * IMR on changes.
  */
 struct realtek_gpio_ctrl {
-       struct gpio_chip gc;
+       struct gpio_generic_chip chip;
        void __iomem *base;
        void __iomem *cpumask_base;
        struct cpumask cpu_irq_maskable;
@@ -101,7 +102,7 @@ static struct realtek_gpio_ctrl *irq_data_to_ctrl(struct irq_data *data)
 {
        struct gpio_chip *gc = irq_data_get_irq_chip_data(data);
 
-       return container_of(gc, struct realtek_gpio_ctrl, gc);
+       return container_of(to_gpio_generic_chip(gc), struct realtek_gpio_ctrl, chip);
 }
 
 /*
@@ -194,7 +195,7 @@ static void realtek_gpio_irq_unmask(struct irq_data *data)
        unsigned int line = irqd_to_hwirq(data);
        unsigned long flags;
 
-       gpiochip_enable_irq(&ctrl->gc, line);
+       gpiochip_enable_irq(&ctrl->chip.gc, line);
 
        raw_spin_lock_irqsave(&ctrl->lock, flags);
        ctrl->intr_mask[line] = REALTEK_GPIO_IMR_LINE_MASK;
@@ -213,7 +214,7 @@ static void realtek_gpio_irq_mask(struct irq_data *data)
        realtek_gpio_update_line_imr(ctrl, line);
        raw_spin_unlock_irqrestore(&ctrl->lock, flags);
 
-       gpiochip_disable_irq(&ctrl->gc, line);
+       gpiochip_disable_irq(&ctrl->chip.gc, line);
 }
 
 static int realtek_gpio_irq_set_type(struct irq_data *data, unsigned int flow_type)
@@ -356,8 +357,9 @@ MODULE_DEVICE_TABLE(of, realtek_gpio_of_match);
 
 static int realtek_gpio_probe(struct platform_device *pdev)
 {
+       struct gpio_generic_chip_config config;
        struct device *dev = &pdev->dev;
-       unsigned long bgpio_flags;
+       unsigned long gen_gc_flags;
        unsigned int dev_flags;
        struct gpio_irq_chip *girq;
        struct realtek_gpio_ctrl *ctrl;
@@ -388,32 +390,37 @@ static int realtek_gpio_probe(struct platform_device *pdev)
        raw_spin_lock_init(&ctrl->lock);
 
        if (dev_flags & GPIO_PORTS_REVERSED) {
-               bgpio_flags = 0;
+               gen_gc_flags = 0;
                ctrl->bank_read = realtek_gpio_bank_read;
                ctrl->bank_write = realtek_gpio_bank_write;
                ctrl->line_imr_pos = realtek_gpio_line_imr_pos;
        } else {
-               bgpio_flags = BGPIOF_BIG_ENDIAN_BYTE_ORDER;
+               gen_gc_flags = BGPIOF_BIG_ENDIAN_BYTE_ORDER;
                ctrl->bank_read = realtek_gpio_bank_read_swapped;
                ctrl->bank_write = realtek_gpio_bank_write_swapped;
                ctrl->line_imr_pos = realtek_gpio_line_imr_pos_swapped;
        }
 
-       err = bgpio_init(&ctrl->gc, dev, 4,
-               ctrl->base + REALTEK_GPIO_REG_DATA, NULL, NULL,
-               ctrl->base + REALTEK_GPIO_REG_DIR, NULL,
-               bgpio_flags);
+       config = (typeof(config)){
+               .dev = dev,
+               .sz = 4,
+               .dat = ctrl->base + REALTEK_GPIO_REG_DATA,
+               .dirout = ctrl->base + REALTEK_GPIO_REG_DIR,
+               .flags = gen_gc_flags,
+       };
+
+       err = gpio_generic_chip_init(&ctrl->chip, &config);
        if (err) {
                dev_err(dev, "unable to init generic GPIO");
                return err;
        }
 
-       ctrl->gc.ngpio = ngpios;
-       ctrl->gc.owner = THIS_MODULE;
+       ctrl->chip.gc.ngpio = ngpios;
+       ctrl->chip.gc.owner = THIS_MODULE;
 
        irq = platform_get_irq_optional(pdev, 0);
        if (!(dev_flags & GPIO_INTERRUPTS_DISABLED) && irq > 0) {
-               girq = &ctrl->gc.irq;
+               girq = &ctrl->chip.gc.irq;
                gpio_irq_chip_set_chip(girq, &realtek_gpio_irq_chip);
                girq->default_type = IRQ_TYPE_NONE;
                girq->handler = handle_bad_irq;
@@ -442,7 +449,7 @@ static int realtek_gpio_probe(struct platform_device *pdev)
                        cpumask_set_cpu(cpu, &ctrl->cpu_irq_maskable);
        }
 
-       return devm_gpiochip_add_data(dev, &ctrl->gc, ctrl);
+       return devm_gpiochip_add_data(dev, &ctrl->chip.gc, ctrl);
 }
 
 static struct platform_driver realtek_gpio_driver = {