Patch "pinctrl: mediatek: paris: Fix pingroup pin config state readback" has been added to the 5.15-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

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

    pinctrl: mediatek: paris: Fix pingroup pin config state readback

to the 5.15-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-paris-fix-pingroup-pin-config-state.patch
and it can be found in the queue-5.15 subdirectory.

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



commit d38db6de5d16754b4b9c203a6002fd75dfceb6c0
Author: Chen-Yu Tsai <wenst@xxxxxxxxxxxx>
Date:   Tue Mar 8 18:09:49 2022 +0800

    pinctrl: mediatek: paris: Fix pingroup pin config state readback
    
    [ Upstream commit 54fe55fb384ade630ef20b9a8b8f3b2a89ad97f2 ]
    
    mtk_pconf_group_get(), used to read back pingroup pin config state,
    simply returns a set of configs saved from a previous invocation of
    mtk_pconf_group_set(). This is an unfiltered, unvalidated set passed
    in from the pinconf core, which does not match the current hardware
    state.
    
    Since the driver library is designed to have one pin per group, pass
    through mtk_pconf_group_get() to mtk_pinconf_get(), to read back the
    current pin config state of the only pin in the group.
    
    Also drop the assignment of pin config state to the group.
    
    Fixes: 805250982bb5 ("pinctrl: mediatek: add pinctrl-paris that implements the vendor dt-bindings")
    Signed-off-by: Chen-Yu Tsai <wenst@xxxxxxxxxxxx>
    Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@xxxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20220308100956.2750295-5-wenst@xxxxxxxxxxxx
    Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.c b/drivers/pinctrl/mediatek/pinctrl-paris.c
index bcf359256ed4..2133964dfd59 100644
--- a/drivers/pinctrl/mediatek/pinctrl-paris.c
+++ b/drivers/pinctrl/mediatek/pinctrl-paris.c
@@ -714,10 +714,10 @@ static int mtk_pconf_group_get(struct pinctrl_dev *pctldev, unsigned group,
 			       unsigned long *config)
 {
 	struct mtk_pinctrl *hw = pinctrl_dev_get_drvdata(pctldev);
+	struct mtk_pinctrl_group *grp = &hw->groups[group];
 
-	*config = hw->groups[group].config;
-
-	return 0;
+	 /* One pin per group only */
+	return mtk_pinconf_get(pctldev, grp->pin, config);
 }
 
 static int mtk_pconf_group_set(struct pinctrl_dev *pctldev, unsigned group,
@@ -733,8 +733,6 @@ static int mtk_pconf_group_set(struct pinctrl_dev *pctldev, unsigned group,
 				      pinconf_to_config_argument(configs[i]));
 		if (ret < 0)
 			return ret;
-
-		grp->config = configs[i];
 	}
 
 	return 0;