diff mbox series

[v2] pinctrl: renesas: rza1: mark GPIOs as used

Message ID 20240930191523.7030-2-wsa+renesas@sang-engineering.com
State New
Headers show
Series [v2] pinctrl: renesas: rza1: mark GPIOs as used | expand

Commit Message

Wolfram Sang Sept. 30, 2024, 7:14 p.m. UTC
GPIOs showed up as unclaimed, so they could be muxed to something else
even though they were in use. Mark GPIOs as claimed to avoid that.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---

Change since v1: * free the gpio as well (Thanks, Geert!)

 drivers/pinctrl/renesas/pinctrl-rza1.c | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Geert Uytterhoeven Oct. 1, 2024, 7:02 a.m. UTC | #1
On Mon, Sep 30, 2024 at 9:15 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> GPIOs showed up as unclaimed, so they could be muxed to something else
> even though they were in use. Mark GPIOs as claimed to avoid that.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> ---
>
> Change since v1: * free the gpio as well (Thanks, Geert!)

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
i.e. will queue in renesas-pinctrl for v6.13.

Gr{oetje,eeting}s,

                        Geert
diff mbox series

Patch

diff --git a/drivers/pinctrl/renesas/pinctrl-rza1.c b/drivers/pinctrl/renesas/pinctrl-rza1.c
index 6527872813dc..b1058504e0bb 100644
--- a/drivers/pinctrl/renesas/pinctrl-rza1.c
+++ b/drivers/pinctrl/renesas/pinctrl-rza1.c
@@ -19,6 +19,7 @@ 
 #include <linux/ioport.h>
 #include <linux/module.h>
 #include <linux/of.h>
+#include <linux/pinctrl/consumer.h>
 #include <linux/pinctrl/pinconf-generic.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/pinctrl/pinmux.h>
@@ -750,6 +751,11 @@  static int rza1_pin_mux_single(struct rza1_pinctrl *rza1_pctl,
 static int rza1_gpio_request(struct gpio_chip *chip, unsigned int gpio)
 {
 	struct rza1_port *port = gpiochip_get_data(chip);
+	int ret;
+
+	ret = pinctrl_gpio_request(chip, gpio);
+	if (ret)
+		return ret;
 
 	rza1_pin_reset(port, gpio);
 
@@ -771,6 +777,7 @@  static void rza1_gpio_free(struct gpio_chip *chip, unsigned int gpio)
 	struct rza1_port *port = gpiochip_get_data(chip);
 
 	rza1_pin_reset(port, gpio);
+	pinctrl_gpio_free(chip, gpio);
 }
 
 static int rza1_gpio_get_direction(struct gpio_chip *chip, unsigned int gpio)