mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
pinctrl: samsung: Fix pinctrl bank pin count
[ Upstream commit 70115558ab02fe8d28a6634350b3491a542aaa02 ] Commit1abd18d1a5("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:1abd18d1a5("pinctrl: samsung: Register pinctrl before GPIO") Signed-off-by: Jaehyoung Choi <[email protected]> Signed-off-by: Sam Protsenko <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Krzysztof Kozlowski <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
This commit is contained in:
parent
e69c283621
commit
b900cc4816
1 changed files with 1 additions and 1 deletions
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue