diff options
author | Hsin-Yi Wang <hsinyi@chromium.org> | 2020-12-28 12:04:25 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-05-17 12:43:53 +0300 |
commit | 4cc43efca9e0d239145c6b74b2e97098ac74acd4 (patch) | |
tree | 4336267da5264fc59de146ec6fac41c4c90d6ad9 | |
parent | d23431fc4ee87e7de73f30f1a7f54df8102f11a8 (diff) | |
download | linux-4cc43efca9e0d239145c6b74b2e97098ac74acd4.tar.xz |
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>
-rw-r--r-- | drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c index 634d652aed67..5ef372e70270 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c @@ -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; } |