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

Commit 0c7c4c4a authored by Jerome Brunet's avatar Jerome Brunet Committed by Greg Kroah-Hartman
Browse files

pinctrl: meson: fix pinconf bias disable 



[ Upstream commit e39f9dd8206ad66992ac0e6218ef1ba746f2cce9 ]

If a bias is enabled on a pin of an Amlogic SoC, calling .pin_config_set()
with PIN_CONFIG_BIAS_DISABLE will not disable the bias. Instead it will
force a pull-down bias on the pin.

Instead of the pull type register bank, the driver should access the pull
enable register bank.

Fixes: 6ac73095 ("pinctrl: add driver for Amlogic Meson SoCs")
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 1a817402

drivers/pinctrl/meson/pinctrl-meson.c

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static int meson_pinconf_set(struct pinctrl_dev *pcdev, unsigned int pin, 
			dev_dbg(pc->dev, "pin %u: disable bias\n", pin);



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

			ret = regmap_update_bits(pc->reg_pull, reg,

			ret = regmap_update_bits(pc->reg_pullen, reg,

						 BIT(bit), 0);

			if (ret)

				return ret;