This is a note to let you know that I've just added the patch titled
pinctrl: rockchip: fix restore error in resume
to the 5.11-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-rockchip-fix-restore-error-in-resume.patch
and it can be found in the queue-5.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From c971af25cda94afe71617790826a86253e88eab0 Mon Sep 17 00:00:00 2001
From: Wang Panzhenzhuan <randy.wang@xxxxxxxxxxxxxx>
Date: Tue, 23 Feb 2021 18:07:25 +0800
Subject: pinctrl: rockchip: fix restore error in resume
From: Wang Panzhenzhuan <randy.wang@xxxxxxxxxxxxxx>
commit c971af25cda94afe71617790826a86253e88eab0 upstream.
The restore in resume should match to suspend which only set for RK3288
SoCs pinctrl.
Fixes: 8dca933127024 ("pinctrl: rockchip: save and restore gpio6_c6 pinmux in suspend/resume")
Reviewed-by: Jianqun Xu <jay.xu@xxxxxxxxxxxxxx>
Reviewed-by: Heiko Stuebner <heiko@xxxxxxxxx>
Signed-off-by: Wang Panzhenzhuan <randy.wang@xxxxxxxxxxxxxx>
Signed-off-by: Jianqun Xu <jay.xu@xxxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20210223100725.269240-1-jay.xu@xxxxxxxxxxxxxx
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/pinctrl/pinctrl-rockchip.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
--- a/drivers/pinctrl/pinctrl-rockchip.c
+++ b/drivers/pinctrl/pinctrl-rockchip.c
@@ -3727,12 +3727,15 @@ static int __maybe_unused rockchip_pinct
static int __maybe_unused rockchip_pinctrl_resume(struct device *dev)
{
struct rockchip_pinctrl *info = dev_get_drvdata(dev);
- int ret = regmap_write(info->regmap_base, RK3288_GRF_GPIO6C_IOMUX,
- rk3288_grf_gpio6c_iomux |
- GPIO6C6_SEL_WRITE_ENABLE);
+ int ret;
- if (ret)
- return ret;
+ if (info->ctrl->type == RK3288) {
+ ret = regmap_write(info->regmap_base, RK3288_GRF_GPIO6C_IOMUX,
+ rk3288_grf_gpio6c_iomux |
+ GPIO6C6_SEL_WRITE_ENABLE);
+ if (ret)
+ return ret;
+ }
return pinctrl_force_default(info->pctl_dev);
}
Patches currently in stable-queue which might be from randy.wang@xxxxxxxxxxxxxx are
queue-5.11/pinctrl-rockchip-fix-restore-error-in-resume.patch
