From 80868069306984afdcf52f36a1fb212f15ed065b Mon Sep 17 00:00:00 2001 From: Wang Panzhenzhuan Date: Fri, 4 Dec 2020 17:07:31 +0800 Subject: [PATCH] pinctrl: rockchip: fix rk3568 gpio4a iomux h issue RK3288_GRF_GPIO6C_IOMUX address is 0x64, if not jugged type RK3288; it will set rk3568 GRF_GPIO4A_IOMUX_H reg to 0x0 after resume. then cause gpio4 a4/5/6/7 iomux abnormal. Fixes: 8dca933127024 ("pinctrl: rockchip: save and restore gpio6_c6 pinmux in suspend/resume") Signed-off-by: Wang Panzhenzhuan Change-Id: Icb7700ff63e3cb8ca46025e6efd260d91608f23f --- 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 6b654018176b..08477a068fab 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c @@ -3923,12 +3923,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); }