lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pinctrl: ocelot: Fix alt mode for ocelot

Browse Source 
[ Upstream commit 657fd9da2d4b4aa0a384105b236baa22fa0233bf ]

In case the driver was trying to set an alternate mode for gpio
0 or 32 then the mode was not set correctly. The reason is that
there is computation error inside the function ocelot_pinmux_set_mux
because in this case it was trying to shift to left by -1.
Fix this by actually shifting the function bits and not the position.

Fixes: 4b36082e2e ("pinctrl: ocelot: fix pinmuxing for pins after 31")
Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
Link: https://lore.kernel.org/r/20230206203720.1177718-1-horatiu.vultur@microchip.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Horatiu Vultur 2023-02-06 21:37:20 +01:00 committed by Greg Kroah-Hartman
parent 70728d639e
commit 7e71d4d190
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pinctrl/pinctrl-ocelot.c
View File

@ -420,7 +420,7 @@ static int ocelot_pinmux_set_mux(struct pinctrl_dev *pctldev,
regmap_update_bits(info->map, REG_ALT(0, info, pin->pin), regmap_update_bits(info->map, REG_ALT(0, info, pin->pin),
BIT(p), f << p); BIT(p), f << p);
regmap_update_bits(info->map, REG_ALT(1, info, pin->pin), regmap_update_bits(info->map, REG_ALT(1, info, pin->pin),
BIT(p), f << (p - 1)); BIT(p), (f >> 1) << p);
return 0; return 0;
} }