Commit f2cc646b authored Oct 03, 2023 by Bartosz Golaszewski Committed by sanglipeng Mar 18, 2024

gpio: aspeed: fix the GPIO number passed to pinctrl_gpio_set_config()

stable inclusion
from stable-v5.10.198
commit 6ad972e668708f965f963b6886ff67efc5603e9d
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I987V5

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=6ad972e668708f965f963b6886ff67efc5603e9d



--------------------------------

commit f9315f17 upstream.

pinctrl_gpio_set_config() expects the GPIO number from the global GPIO
numberspace, not the controller-relative offset, which needs to be added
to the chip base.

Fixes: 5ae4cb94 ("gpio: aspeed: Add debounce support")
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: Andy Shevchenko <andy@kernel.org>
Reviewed-by: Andrew Jeffery <andrew@codeconstruct.com.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: sanglipeng <sanglipeng1@jd.com>

parent d1c45cc1

drivers/gpio/gpio-aspeed.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -966,7 +966,7 @@ static int aspeed_gpio_set_config(struct gpio_chip *chip, unsigned int offset,
		else if (param == PIN_CONFIG_BIAS_DISABLE \|\|
		param == PIN_CONFIG_BIAS_PULL_DOWN \|\|
		param == PIN_CONFIG_DRIVE_STRENGTH)
		return pinctrl_gpio_set_config(offset, config);
		return pinctrl_gpio_set_config(chip->base + offset, config);
		else if (param == PIN_CONFIG_DRIVE_OPEN_DRAIN \|\|
		param == PIN_CONFIG_DRIVE_OPEN_SOURCE)
		/* Return -ENOTSUPP to trigger emulation, as per datasheet */