lkml.org 
[lkml]   [2021]   [Dec]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 091/128] pinctrl: stm32: consider the GPIO offset to expose all the GPIO lines
    Date
    From: Fabien Dessenne <fabien.dessenne@foss.st.com>

    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: Christoph Fritz <chf.fritz@googlemail.com>
    Signed-off-by: Fabien Dessenne <fabien.dessenne@foss.st.com>
    Link: https://lore.kernel.org/r/20211215095808.621716-1-fabien.dessenne@foss.st.com
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/pinctrl/stm32/pinctrl-stm32.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- a/drivers/pinctrl/stm32/pinctrl-stm32.c
    +++ b/drivers/pinctrl/stm32/pinctrl-stm32.c
    @@ -1251,10 +1251,10 @@ static int stm32_gpiolib_register_bank(s
    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;

    \
     
     \ /
      Last update: 2021-12-27 16:53    [W:6.437 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site