Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e71d4d1 authored by Horatiu Vultur's avatar Horatiu Vultur Committed by Greg Kroah-Hartman
Browse files

pinctrl: ocelot: Fix alt mode for ocelot 



[ 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: 4b36082e ("pinctrl: ocelot: fix pinmuxing for pins after 31")
Signed-off-by: default avatarHoratiu Vultur <horatiu.vultur@microchip.com>
Link: https://lore.kernel.org/r/20230206203720.1177718-1-horatiu.vultur@microchip.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 70728d63

drivers/pinctrl/pinctrl-ocelot.c

+1 −1
Original line number Diff line number Diff line
@@ -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),

			   BIT(p), f << p);

	regmap_update_bits(info->map, REG_ALT(1, info, pin->pin),

			   BIT(p), f << (p - 1));

			   BIT(p), (f >> 1) << p);



	return 0;

}