Patch "pinctrl: mediatek: Fix fallback call path" has been added to the 5.4-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    pinctrl: mediatek: Fix fallback call path

to the 5.4-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     pinctrl-mediatek-fix-fallback-call-path.patch
and it can be found in the queue-5.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit cdaf991decc05273aa76307203dd784a56efbc5b
Author: Hsin-Yi Wang <hsinyi@xxxxxxxxxxxx>
Date:   Mon Dec 28 17:04:25 2020 +0800

    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@xxxxxxxxxxxx>
    Acked-by: Sean Wang <sean.wang@xxxxxxxxxx>
    Link: https://lore.kernel.org/r/20201228090425.2130569-1-hsinyi@xxxxxxxxxxxx
    Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
index 634d652aed671..5ef372e702709 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;
 		}