pinctrl: samsung: Fix pinctrl bank pin count
authorJaehyoung Choi <jkkkkk.choi@samsung.com>
Fri, 30 Jul 2021 19:29:05 +0000 (22:29 +0300)
committerKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Mon, 2 Aug 2021 13:22:18 +0000 (15:22 +0200)
Commit 1abd18d1a51a ("pinctrl: samsung: Register pinctrl before GPIO")
changes the order of GPIO and pinctrl registration: now pinctrl is
registered before GPIO. That means gpio_chip->ngpio is not set when
samsung_pinctrl_register() called, and one cannot rely on that value
anymore. Use `pin_bank->nr_pins' instead of `pin_bank->gpio_chip.ngpio'
to fix mentioned inconsistency.

Fixes: 1abd18d1a51a ("pinctrl: samsung: Register pinctrl before GPIO")
Signed-off-by: Jaehyoung Choi <jkkkkk.choi@samsung.com>
Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Link: https://lore.kernel.org/r/20210730192905.7173-1-semen.protsenko@linaro.org
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
drivers/pinctrl/samsung/pinctrl-samsung.c

index 376876b..2975b43 100644 (file)
@@ -918,7 +918,7 @@ static int samsung_pinctrl_register(struct platform_device *pdev,
                pin_bank->grange.pin_base = drvdata->pin_base
                                                + pin_bank->pin_base;
                pin_bank->grange.base = pin_bank->grange.pin_base;
-               pin_bank->grange.npins = pin_bank->gpio_chip.ngpio;
+               pin_bank->grange.npins = pin_bank->nr_pins;
                pin_bank->grange.gc = &pin_bank->gpio_chip;
                pinctrl_add_gpio_range(drvdata->pctl_dev, &pin_bank->grange);
        }