| Message ID | 20210223064807.121358-1-jay.xu@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | pinctrl: rockchip: fix restore error in resume | expand |
Am Dienstag, 23. Februar 2021, 07:48:07 CET schrieb Jianqun Xu: > From: Wang Panzhenzhuan <randy.wang@rock-chips.com> > > 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@rock-chips.com> > Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com> > Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com> Very good catch. Writing something to that register even on non-rk3288 socs probably can cause strange effects. Reviewed-by: Heiko Stuebner <heiko@sntech.de> > --- > drivers/pinctrl/pinctrl-rockchip.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c > index aa1a1c850d05..53a0badc6b03 100644 > --- a/drivers/pinctrl/pinctrl-rockchip.c > +++ b/drivers/pinctrl/pinctrl-rockchip.c > @@ -3727,12 +3727,15 @@ static int __maybe_unused rockchip_pinctrl_suspend(struct device *dev) > 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); > } >
On Tue, Feb 23, 2021 at 7:48 AM Jianqun Xu <jay.xu@rock-chips.com> wrote: > > From: Wang Panzhenzhuan <randy.wang@rock-chips.com> > > 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@rock-chips.com> > Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com> > Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com> Patch applied for fixes! Yours, Linus Walleij
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c index aa1a1c850d05..53a0badc6b03 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c @@ -3727,12 +3727,15 @@ static int __maybe_unused rockchip_pinctrl_suspend(struct device *dev) 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); }