pinctrl: rockchip: fix restore error in resume
commit c971af25cda94afe71617790826a86253e88eab0 upstream.
The restore in resume should match to suspend which only set for RK3288
SoCs pinctrl.
Fixes: 8dca933127
("pinctrl: rockchip: save and restore gpio6_c6 pinmux in suspend/resume")
Reviewed-by: Jianqun Xu <jay.xu@rock-chips.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Link: https://lore.kernel.org/r/20210223100725.269240-1-jay.xu@rock-chips.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
c92e8a8ecb
commit
67ff75be1a
|
@ -3386,12 +3386,15 @@ static int __maybe_unused rockchip_pinctrl_suspend(struct device *dev)
|
||||||
static int __maybe_unused rockchip_pinctrl_resume(struct device *dev)
|
static int __maybe_unused rockchip_pinctrl_resume(struct device *dev)
|
||||||
{
|
{
|
||||||
struct rockchip_pinctrl *info = dev_get_drvdata(dev);
|
struct rockchip_pinctrl *info = dev_get_drvdata(dev);
|
||||||
int ret = regmap_write(info->regmap_base, RK3288_GRF_GPIO6C_IOMUX,
|
int ret;
|
||||||
rk3288_grf_gpio6c_iomux |
|
|
||||||
GPIO6C6_SEL_WRITE_ENABLE);
|
|
||||||
|
|
||||||
if (ret)
|
if (info->ctrl->type == RK3288) {
|
||||||
return ret;
|
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);
|
return pinctrl_force_default(info->pctl_dev);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue