]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
pinctrl: starfive: jh7100: use new GPIO line value setter callbacks
authorBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Thu, 12 Jun 2025 12:24:30 +0000 (14:24 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 18 Jun 2025 12:06:23 +0000 (14:06 +0200)
struct gpio_chip now has callbacks for setting line values that return
an integer, allowing to indicate failures. Convert the driver to using
them.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: Hal Feng <hal.feng@starfivetech.com>
Reviewed-by: Emil Renner Berthing <emil.renner.berthing@canonical.com>
Link: https://lore.kernel.org/20250612-gpiochip-set-rv-pinctrl-starfive-v1-1-8507b46516f5@linaro.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c

index aeaa0ded7c1e5ee7f9c5e4113bfd208fb844ba7d..b729ca4de4227dbf4b9420d6c78820fb15a59f8f 100644 (file)
@@ -969,8 +969,8 @@ static int starfive_gpio_get(struct gpio_chip *gc, unsigned int gpio)
        return !!(readl_relaxed(din) & BIT(gpio % 32));
 }
 
-static void starfive_gpio_set(struct gpio_chip *gc, unsigned int gpio,
-                             int value)
+static int starfive_gpio_set(struct gpio_chip *gc, unsigned int gpio,
+                            int value)
 {
        struct starfive_pinctrl *sfp = container_of(gc, struct starfive_pinctrl, gc);
        void __iomem *dout = sfp->base + GPON_DOUT_CFG + 8 * gpio;
@@ -979,6 +979,8 @@ static void starfive_gpio_set(struct gpio_chip *gc, unsigned int gpio,
        raw_spin_lock_irqsave(&sfp->lock, flags);
        writel_relaxed(value, dout);
        raw_spin_unlock_irqrestore(&sfp->lock, flags);
+
+       return 0;
 }
 
 static int starfive_gpio_set_config(struct gpio_chip *gc, unsigned int gpio,
@@ -1300,7 +1302,7 @@ static int starfive_probe(struct platform_device *pdev)
        sfp->gc.direction_input = starfive_gpio_direction_input;
        sfp->gc.direction_output = starfive_gpio_direction_output;
        sfp->gc.get = starfive_gpio_get;
-       sfp->gc.set = starfive_gpio_set;
+       sfp->gc.set_rv = starfive_gpio_set;
        sfp->gc.set_config = starfive_gpio_set_config;
        sfp->gc.add_pin_ranges = starfive_gpio_add_pin_ranges;
        sfp->gc.base = -1;