Messages in this thread Patch in this message | | | From | Hsin-Yi Wang <> | Subject | [PATCH] pinctrl: mediatek: Fix fallback behavior for bias_set_combo | Date | Thu, 1 Jul 2021 14:54:39 +0800 |
| |
Some pin doesn't support PUPD register, if it fails and fallbacks with bias_set_combo case, it will call mtk_pinconf_bias_set_pupd_r1_r0() to modify the PUPD pin again.
Since the general bias set are either PU/PD or PULLSEL/PULLEN, try bias_set or bias_set_rev1 for this fallback case.
Fixes: 81bd1579b43e ("pinctrl: mediatek: Fix fallback call path") Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org> --- drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c index 5b3b048725cc8..0cdff487836fa 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c @@ -926,9 +926,12 @@ int mtk_pinconf_adv_pull_set(struct mtk_pinctrl *hw, 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; + err = mtk_pinconf_bias_set_rev1(hw, desc, pullup); + if (err) { + err = mtk_pinconf_bias_set(hw, desc, pullup); + if (err) + return err; + } } else { return -ENOTSUPP; } -- 2.32.0.93.g670b81a890-goog
| |