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

Commit d9031ce0 authored by Fabien Dessenne's avatar Fabien Dessenne Committed by Greg Kroah-Hartman
Browse files

pinctrl: stm32: consider the GPIO offset to expose all the GPIO lines 



commit b67210cc217f9ca1c576909454d846970c13dfd4 upstream.

Consider the GPIO controller offset (from "gpio-ranges") to compute the
maximum GPIO line number.
This fixes an issue where gpio-ranges uses a non-null offset.
  e.g.: gpio-ranges = <&pinctrl 6 86 10>
        In that case the last valid GPIO line is not 9 but 15 (6 + 10 - 1)

Cc: stable@vger.kernel.org
Fixes: 67e2996f72c7 ("pinctrl: stm32: fix the reported number of GPIO lines per bank")
Reported-by: default avatarChristoph Fritz <chf.fritz@googlemail.com>
Signed-off-by: default avatarFabien Dessenne <fabien.dessenne@foss.st.com>
Link: https://lore.kernel.org/r/20211215095808.621716-1-fabien.dessenne@foss.st.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c7b2e585

drivers/pinctrl/stm32/pinctrl-stm32.c

+4 −4
Original line number Diff line number Diff line
@@ -1186,10 +1186,10 @@ static int stm32_gpiolib_register_bank(struct stm32_pinctrl *pctl, 
		bank_nr = args.args[1] / STM32_GPIO_PINS_PER_BANK;

		bank->gpio_chip.base = args.args[1];



		npins = args.args[2];

		while (!of_parse_phandle_with_fixed_args(np, "gpio-ranges", 3,

							 ++i, &args))

			npins += args.args[2];

		/* get the last defined gpio line (offset + nb of pins) */

		npins = args.args[0] + args.args[2];

		while (!of_parse_phandle_with_fixed_args(np, "gpio-ranges", 3, ++i, &args))

			npins = max(npins, (int)(args.args[0] + args.args[2]));

	} else {

		bank_nr = pctl->nbanks;

		bank->gpio_chip.base = bank_nr * STM32_GPIO_PINS_PER_BANK;