Commit 67e2996f authored by Fabien Dessenne's avatar Fabien Dessenne Committed by Linus Walleij
Browse files

pinctrl: stm32: fix the reported number of GPIO lines per bank 



Each GPIO bank supports a variable number of lines which is usually 16, but
is less in some cases : this is specified by the last argument of the
"gpio-ranges" bank node property.
Report to the framework, the actual number of lines, so the libgpiod
gpioinfo command lists the actually existing GPIO lines.

Fixes: 1dc9d289 ("pinctrl: stm32: add possibility to use gpio-ranges to declare bank range")
Signed-off-by: default avatarFabien Dessenne <fabien.dessenne@foss.st.com>
Link: https://lore.kernel.org/r/20210617144629.2557693-1-fabien.dessenne@foss.st.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 76b7f8fa

drivers/pinctrl/stm32/pinctrl-stm32.c

+7 −2
Original line number Original line Diff line number Diff line
@@ -1224,7 +1224,7 @@ static int stm32_gpiolib_register_bank(struct stm32_pinctrl *pctl, 
	struct device *dev = pctl->dev;

	struct device *dev = pctl->dev;

	struct resource res;

	struct resource res;

	int npins = STM32_GPIO_PINS_PER_BANK;

	int npins = STM32_GPIO_PINS_PER_BANK;

	int bank_nr, err;

	int bank_nr, err, i = 0;





	if (!IS_ERR(bank->rstc))

	if (!IS_ERR(bank->rstc))

		reset_control_deassert(bank->rstc);

		reset_control_deassert(bank->rstc);
@@ -1246,9 +1246,14 @@ static int stm32_gpiolib_register_bank(struct stm32_pinctrl *pctl, 




	of_property_read_string(np, "st,bank-name", &bank->gpio_chip.label);

	of_property_read_string(np, "st,bank-name", &bank->gpio_chip.label);





	if (!of_parse_phandle_with_fixed_args(np, "gpio-ranges", 3, 0, &args)) {

	if (!of_parse_phandle_with_fixed_args(np, "gpio-ranges", 3, i, &args)) {

		bank_nr = args.args[1] / STM32_GPIO_PINS_PER_BANK;

		bank_nr = args.args[1] / STM32_GPIO_PINS_PER_BANK;

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

		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];

	} else {

	} else {

		bank_nr = pctl->nbanks;

		bank_nr = pctl->nbanks;

		bank->gpio_chip.base = bank_nr * STM32_GPIO_PINS_PER_BANK;

		bank->gpio_chip.base = bank_nr * STM32_GPIO_PINS_PER_BANK;