Commit 4cc43efc authored Dec 28, 2020 by Hsin-Yi Wang Committed by Greg Kroah-Hartman May 17, 2024

pinctrl: mediatek: Fix fallback call path



[ Upstream commit 81bd1579b43e0e285cba667399f1b063f1ce7672 ]

Some SoCs, eg. mt8183, are using a pinconfig operation bias_set_combo.
The fallback path in mtk_pinconf_adv_pull_set() should also try this
operation.

Fixes: cafe19db7751 ("pinctrl: mediatek: Backward compatible to previous Mediatek's bias-pull usage")
Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
Acked-by: Sean Wang <sean.wang@kernel.org>
Link: https://lore.kernel.org/r/20201228090425.2130569-1-hsinyi@chromium.org


Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent d23431fc

drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -877,6 +877,10 @@ int mtk_pinconf_adv_pull_set(struct mtk_pinctrl *hw,
		err = hw->soc->bias_set(hw, desc, pullup);
		if (err)
		return err;
		} else if (hw->soc->bias_set_combo) {
		err = hw->soc->bias_set_combo(hw, desc, pullup, arg);
		if (err)
		return err;
		} else {
		return -ENOTSUPP;
		}