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

Commit 609a4c79 authored by Jerome Brunet's avatar Jerome Brunet Committed by Greg Kroah-Hartman
Browse files

pinctrl: meson: fix pull enable register calculation 



[ Upstream commit 614b1868a125a0ba24be08f3a7fa832ddcde6bca ]

We just changed the code so we apply bias disable on the correct
register but forgot to align the register calculation. The result
is that we apply the change on the correct register, but possibly
at the incorrect offset/bit

This went undetected because offsets tends to be the same between
REG_PULL and REG_PULLEN for a given pin the EE controller. This
is not true for the AO controller.

Fixes: e39f9dd8206a ("pinctrl: meson: fix pinconf bias disable")
Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Acked-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8a12358b

drivers/pinctrl/meson/pinctrl-meson.c

+2 −1
Original line number Diff line number Diff line
@@ -274,7 +274,8 @@ static int meson_pinconf_set(struct pinctrl_dev *pcdev, unsigned int pin, 
		case PIN_CONFIG_BIAS_DISABLE:

			dev_dbg(pc->dev, "pin %u: disable bias\n", pin);



			meson_calc_reg_and_bit(bank, pin, REG_PULL, &reg, &bit);

			meson_calc_reg_and_bit(bank, pin, REG_PULLEN, &reg,

					       &bit);

			ret = regmap_update_bits(pc->reg_pullen, reg,

						 BIT(bit), 0);

			if (ret)