Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3f16cb6 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Greg Kroah-Hartman
Browse files

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



commit f9315f17bf778cb8079a29639419fcc8a41a3c84 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: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: default avatarAndy Shevchenko <andy@kernel.org>
Reviewed-by: default avatarAndrew Jeffery <andrew@codeconstruct.com.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 18e301e1

drivers/gpio/gpio-aspeed.c

+1 −1
Original line number Diff line number Diff line
@@ -763,7 +763,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 */