| Message ID | 1413933588-25721-1-git-send-email-zyw@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Chris, On Tue, Oct 21, 2014 at 4:19 PM, Chris Zhong <zyw@rock-chips.com> wrote: > +static u32 rk3288_grf_gpio6c_iomux; Somehow my instinct says that this should be in the "info" structure, but I can't say exactly why (since by definition there can be only one gpio6_c6). ...no need to change this in my opinion. > static int rockchip_pinctrl_suspend(struct device *dev) > { > struct rockchip_pinctrl *info = dev_get_drvdata(dev); > + int ret = pinctrl_force_sleep(info->pctl_dev); > + > + if (ret) > + return ret; > + > + /* > + * RK3288 GPIO6_C6 mux would be modified by Maskrom when resume, so save > + * the setting here, and restore it at resume. > + */ > + if (info->ctrl->type == RK3288) { > + ret = regmap_read(info->regmap_base, RK3288_GRF_GPIO6C_IOMUX, > + &rk3288_grf_gpio6c_iomux); > + if (ret) > + return ret; I seriously doubt it matters, but as a nit it seems like you should call pinctrl_force_default() in the error case (to undo pinctrl_force_sleep). Everything is just nits and this works for me, so: Tested-by: Doug Anderson <dianders@chromium.org> Reviewed-by: Doug Anderson <dianders@chromium.org>
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c index c4a988d..e2068fe 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c @@ -1771,16 +1771,43 @@ static struct rockchip_pin_ctrl *rockchip_pinctrl_get_soc_data( } #ifdef CONFIG_PM_SLEEP + +#define RK3288_GRF_GPIO6C_IOMUX 0x64 +#define GPIO6C6_SEL_WRITE_ENABLE BIT(28) + +static u32 rk3288_grf_gpio6c_iomux; + static int rockchip_pinctrl_suspend(struct device *dev) { struct rockchip_pinctrl *info = dev_get_drvdata(dev); + int ret = pinctrl_force_sleep(info->pctl_dev); + + if (ret) + return ret; + + /* + * RK3288 GPIO6_C6 mux would be modified by Maskrom when resume, so save + * the setting here, and restore it at resume. + */ + if (info->ctrl->type == RK3288) { + ret = regmap_read(info->regmap_base, RK3288_GRF_GPIO6C_IOMUX, + &rk3288_grf_gpio6c_iomux); + if (ret) + return ret; + } - return pinctrl_force_sleep(info->pctl_dev); + return 0; } static int 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); + + if (ret) + return ret; return pinctrl_force_default(info->pctl_dev); }
Save and restore the gpio6_c6 pinmux setting, since Maskrom of RK3288 would modify it to sdmmc0_det, so it need to be restored to the correct setting after resume from Maskrom. Signed-off-by: Chris Zhong <zyw@rock-chips.com> --- Changes in v4: None Changes in v3: None Changes in v2: None drivers/pinctrl/pinctrl-rockchip.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-)