diff options
| author | Chen-Yu Tsai <wenst@chromium.org> | 2022-03-08 18:09:49 +0800 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2022-03-15 01:24:15 +0100 |
| commit | 54fe55fb384ade630ef20b9a8b8f3b2a89ad97f2 (patch) | |
| tree | 91c9d516988cd0c42c58b032753725b9bb727eef | |
| parent | 19bce7ce0a593c7024030a0cda9e23facea3c93d (diff) | |
| download | linux-54fe55fb384ade630ef20b9a8b8f3b2a89ad97f2.tar.gz linux-54fe55fb384ade630ef20b9a8b8f3b2a89ad97f2.tar.bz2 linux-54fe55fb384ade630ef20b9a8b8f3b2a89ad97f2.zip | |
pinctrl: mediatek: paris: Fix pingroup pin config state readback
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@chromium.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20220308100956.2750295-5-wenst@chromium.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | drivers/pinctrl/mediatek/pinctrl-paris.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.c b/drivers/pinctrl/mediatek/pinctrl-paris.c index 8a9fb88fe23a..bae019e6d989 100644 --- a/drivers/pinctrl/mediatek/pinctrl-paris.c +++ b/drivers/pinctrl/mediatek/pinctrl-paris.c @@ -732,10 +732,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, @@ -751,8 +751,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; |