forked from Openwrt-EcoNet/openwrt
831994e258
Backport upstream pinctrl fixes, these are required for the follow-up I2C PXA recovery fixes. Signed-off-by: Robert Marko <robert.marko@sartura.hr>
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
From bfa0ff804ffa8b1246ade8be08de98c9eb19d16f Mon Sep 17 00:00:00 2001
|
|
From: Gabor Juhos <j4g8y7@gmail.com>
|
|
Date: Wed, 14 May 2025 21:18:36 +0200
|
|
Subject: [PATCH 5/7] pinctrl: armada-37xx: propagate error from
|
|
armada_37xx_pmx_gpio_set_direction()
|
|
|
|
The armada_37xx_gpio_direction_{in,out}put() functions can fail, so
|
|
propagate their error values back to the stack instead of silently
|
|
ignoring those.
|
|
|
|
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Signed-off-by: Gabor Juhos <j4g8y7@gmail.com>
|
|
Link: https://lore.kernel.org/20250514-pinctrl-a37xx-fixes-v2-5-07e9ac1ab737@gmail.com
|
|
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
|
---
|
|
drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
|
|
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
|
|
@@ -472,16 +472,17 @@ static int armada_37xx_pmx_gpio_set_dire
|
|
{
|
|
struct armada_37xx_pinctrl *info = pinctrl_dev_get_drvdata(pctldev);
|
|
struct gpio_chip *chip = range->gc;
|
|
+ int ret;
|
|
|
|
dev_dbg(info->dev, "gpio_direction for pin %u as %s-%d to %s\n",
|
|
offset, range->name, offset, input ? "input" : "output");
|
|
|
|
if (input)
|
|
- armada_37xx_gpio_direction_input(chip, offset);
|
|
+ ret = armada_37xx_gpio_direction_input(chip, offset);
|
|
else
|
|
- armada_37xx_gpio_direction_output(chip, offset, 0);
|
|
+ ret = armada_37xx_gpio_direction_output(chip, offset, 0);
|
|
|
|
- return 0;
|
|
+ return ret;
|
|
}
|
|
|
|
static int armada_37xx_gpio_request_enable(struct pinctrl_dev *pctldev,
|