summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrei Lalaev <andrey.lalaev@gmail.com>2022-05-25 22:04:25 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-07-12 16:32:20 +0200
commit1d0c3ced2d1c1c0858ee042d29d4c9ed07d987bf (patch)
tree9f324b2da57da433813cdaf19ecf635bcb8141a8
parente1cda2a03d81560ac0badb5fce3aae66bc8a4ae3 (diff)
downloadlinux-stable-1d0c3ced2d1c1c0858ee042d29d4c9ed07d987bf.tar.gz
linux-stable-1d0c3ced2d1c1c0858ee042d29d4c9ed07d987bf.tar.bz2
linux-stable-1d0c3ced2d1c1c0858ee042d29d4c9ed07d987bf.zip
pinctrl: sunxi: sunxi_pconf_set: use correct offset
[ Upstream commit cd4c1e65a32afd003b08ad4aafe1e4d3e4e8e61b ] Some Allwinner SoCs have 2 pinctrls (PIO and R_PIO). Previous implementation used absolute pin numbering and it was incorrect for R_PIO pinctrl. It's necessary to take into account the base pin number. Fixes: 90be64e27621 ("pinctrl: sunxi: implement pin_config_set") Signed-off-by: Andrei Lalaev <andrey.lalaev@gmail.com> Reviewed-by: Samuel Holland <samuel@sholland.org> Link: https://lore.kernel.org/r/20220525190423.410609-1-andrey.lalaev@gmail.com Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/pinctrl/sunxi/pinctrl-sunxi.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
index be7f4f95f455..24c861434bf1 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
@@ -544,6 +544,8 @@ static int sunxi_pconf_set(struct pinctrl_dev *pctldev, unsigned pin,
struct sunxi_pinctrl *pctl = pinctrl_dev_get_drvdata(pctldev);
int i;
+ pin -= pctl->desc->pin_base;
+
for (i = 0; i < num_configs; i++) {
enum pin_config_param param;
unsigned long flags;