gpio: menz127: 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/20250910-gpio-mmio-gpio-conv-part4-v2-10-f3d1a4c57124@linaro.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

diff --git a/drivers/gpio/gpio-menz127.c b/drivers/gpio/gpio-menz127.c
index ebe5da4933bce730c70f83c1c0f86fc4a4cc9906..da2bf9381cc43cd489f6a8593636bbbc95ab5660 100644 (file)
--- a/drivers/gpio/gpio-menz127.c
+++ b/drivers/gpio/gpio-menz127.c
@@ -12,6 +12,7 @@
 #include <linux/mcb.h>
 #include <linux/bitops.h>
 #include <linux/gpio/driver.h>
+#include <linux/gpio/generic.h>
 
 #define MEN_Z127_CTRL  0x00
 #define MEN_Z127_PSR   0x04
@@ -30,7 +31,7 @@
                                         (db <= MEN_Z127_DB_MAX_US))
 
 struct men_z127_gpio {
-       struct gpio_chip gc;
+       struct gpio_generic_chip chip;
        void __iomem *reg_base;
        struct resource *mem;
 };
@@ -64,7 +65,7 @@ static int men_z127_debounce(struct gpio_chip *gc, unsigned gpio,
                debounce /= 50;
        }
 
-       raw_spin_lock(&gc->bgpio_lock);
+       guard(gpio_generic_lock)(&priv->chip);
 
        db_en = readl(priv->reg_base + MEN_Z127_DBER);
 
@@ -79,8 +80,6 @@ static int men_z127_debounce(struct gpio_chip *gc, unsigned gpio,
        writel(db_en, priv->reg_base + MEN_Z127_DBER);
        writel(db_cnt, priv->reg_base + GPIO_TO_DBCNT_REG(gpio));
 
-       raw_spin_unlock(&gc->bgpio_lock);
-
        return 0;
 }
 
@@ -91,7 +90,8 @@ static int men_z127_set_single_ended(struct gpio_chip *gc,
        struct men_z127_gpio *priv = gpiochip_get_data(gc);
        u32 od_en;
 
-       raw_spin_lock(&gc->bgpio_lock);
+       guard(gpio_generic_lock)(&priv->chip);
+
        od_en = readl(priv->reg_base + MEN_Z127_ODER);
 
        if (param == PIN_CONFIG_DRIVE_OPEN_DRAIN)
@@ -101,7 +101,6 @@ static int men_z127_set_single_ended(struct gpio_chip *gc,
                od_en &= ~BIT(offset);
 
        writel(od_en, priv->reg_base + MEN_Z127_ODER);
-       raw_spin_unlock(&gc->bgpio_lock);
 
        return 0;
 }
@@ -137,6 +136,7 @@ static void men_z127_release_mem(void *data)
 static int men_z127_probe(struct mcb_device *mdev,
                          const struct mcb_device_id *id)
 {
+       struct gpio_generic_chip_config config;
        struct men_z127_gpio *men_z127_gpio;
        struct device *dev = &mdev->dev;
        int ret;
@@ -163,18 +163,21 @@ static int men_z127_probe(struct mcb_device *mdev,
 
        mcb_set_drvdata(mdev, men_z127_gpio);
 
-       ret = bgpio_init(&men_z127_gpio->gc, &mdev->dev, 4,
-                        men_z127_gpio->reg_base + MEN_Z127_PSR,
-                        men_z127_gpio->reg_base + MEN_Z127_CTRL,
-                        NULL,
-                        men_z127_gpio->reg_base + MEN_Z127_GPIODR,
-                        NULL, 0);
+       config = (struct gpio_generic_chip_config) {
+               .dev = &mdev->dev,
+               .sz = 4,
+               .dat = men_z127_gpio->reg_base + MEN_Z127_PSR,
+               .set = men_z127_gpio->reg_base + MEN_Z127_CTRL,
+               .dirout = men_z127_gpio->reg_base + MEN_Z127_GPIODR,
+       };
+
+       ret = gpio_generic_chip_init(&men_z127_gpio->chip, &config);
        if (ret)
                return ret;
 
-       men_z127_gpio->gc.set_config = men_z127_set_config;
+       men_z127_gpio->chip.gc.set_config = men_z127_set_config;
 
-       ret = devm_gpiochip_add_data(dev, &men_z127_gpio->gc, men_z127_gpio);
+       ret = devm_gpiochip_add_data(dev, &men_z127_gpio->chip.gc, men_z127_gpio);
        if (ret)
                return dev_err_probe(dev, ret,
                        "failed to register MEN 16Z127 GPIO controller");