From: zyw@rock-chips.com To: Heiko Stuebner <heiko@sntech.de> Cc: Mike Turquette <mturquette@linaro.org>, Ian Campbell <ijc+devicetree@hellion.org.uk>, dianders@chromium.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Kumar Gala <galak@codeaurora.org>, Russell King <linux@arm.linux.org.uk>, linux-rockchip@lists.infradead.org, Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>, Chris Zhong <zyw@rock-chips.com>, Mark Rutland <mark.rutland@arm.com>, linux-arm-kernel@lists.infradead.org, Linus Walleij <linus.walleij@linaro.org> Subject: [PATCH v3 2/6] pinctrl: rockchip: save and restore gpio6_c6 pinmux in suspend/resume Date: Mon, 20 Oct 2014 20:43:31 -0700 [thread overview] Message-ID: <1413863011-2736-1-git-send-email-zyw@rock-chips.com> (raw) In-Reply-To: <1413862894-2623-1-git-send-email-zyw@rock-chips.com> From: Chris Zhong <zyw@rock-chips.com> 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 v3: None Changes in v2: None drivers/pinctrl/pinctrl-rockchip.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c index d384d99..85134e4 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c @@ -1796,26 +1796,54 @@ static struct rockchip_pin_ctrl *rockchip_pinctrl_get_soc_data( } #ifdef CONFIG_PM + +#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 platform_device *pdev, pm_message_t state) { struct rockchip_pinctrl *info; + int ret; info = platform_get_drvdata(pdev); if (!info) return -EINVAL; - return pinctrl_force_sleep(info->pctl_dev); + 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 0; } static int rockchip_pinctrl_resume(struct platform_device *pdev) { struct rockchip_pinctrl *info; + int ret; info = platform_get_drvdata(pdev); if (!info) return -EINVAL; + 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); } #endif -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: zyw@rock-chips.com (zyw at rock-chips.com) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 2/6] pinctrl: rockchip: save and restore gpio6_c6 pinmux in suspend/resume Date: Mon, 20 Oct 2014 20:43:31 -0700 [thread overview] Message-ID: <1413863011-2736-1-git-send-email-zyw@rock-chips.com> (raw) In-Reply-To: <1413862894-2623-1-git-send-email-zyw@rock-chips.com> From: Chris Zhong <zyw@rock-chips.com> 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 v3: None Changes in v2: None drivers/pinctrl/pinctrl-rockchip.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c index d384d99..85134e4 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c @@ -1796,26 +1796,54 @@ static struct rockchip_pin_ctrl *rockchip_pinctrl_get_soc_data( } #ifdef CONFIG_PM + +#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 platform_device *pdev, pm_message_t state) { struct rockchip_pinctrl *info; + int ret; info = platform_get_drvdata(pdev); if (!info) return -EINVAL; - return pinctrl_force_sleep(info->pctl_dev); + 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 0; } static int rockchip_pinctrl_resume(struct platform_device *pdev) { struct rockchip_pinctrl *info; + int ret; info = platform_get_drvdata(pdev); if (!info) return -EINVAL; + 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); } #endif -- 1.7.9.5
next prev parent reply other threads:[~2014-10-21 3:43 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-10-21 3:41 [PATCH v3 0/6] add suspend support for RK3288 zyw 2014-10-21 3:41 ` zyw at rock-chips.com 2014-10-21 3:41 ` zyw-TNX95d0MmH7DzftRWevZcw 2014-10-21 3:42 ` [PATCH v3 1/6] pinctrl: rockchip: add suspend/resume functions zyw 2014-10-21 3:42 ` zyw at rock-chips.com 2014-10-21 16:50 ` Dmitry Torokhov 2014-10-21 16:50 ` Dmitry Torokhov 2014-10-21 21:20 ` Heiko Stübner 2014-10-21 21:20 ` Heiko Stübner 2014-10-21 3:43 ` zyw [this message] 2014-10-21 3:43 ` [PATCH v3 2/6] pinctrl: rockchip: save and restore gpio6_c6 pinmux in suspend/resume zyw at rock-chips.com 2014-10-28 15:52 ` Linus Walleij 2014-10-28 15:52 ` Linus Walleij 2014-10-28 15:52 ` Linus Walleij 2014-10-28 16:05 ` Doug Anderson 2014-10-28 16:05 ` Doug Anderson 2014-10-28 16:05 ` Doug Anderson 2014-10-21 3:44 ` [PATCH v3 3/6] clk: rockchip: RK3288: add suspend and resume zyw 2014-10-21 3:44 ` zyw at rock-chips.com 2014-10-21 3:44 ` [PATCH v3 4/6] ARM: rockchip: add suspend and resume for RK3288 zyw 2014-10-21 3:44 ` zyw at rock-chips.com 2014-10-24 21:47 ` Kevin Hilman 2014-10-24 21:47 ` Kevin Hilman 2014-10-24 21:47 ` Kevin Hilman 2014-10-27 17:42 ` Doug Anderson 2014-10-27 17:42 ` Doug Anderson 2014-10-27 17:42 ` Doug Anderson 2014-10-21 3:44 ` [PATCH v3 5/6] ARM: rockchip: Add pmu-sram binding zyw 2014-10-21 3:44 ` zyw at rock-chips.com 2014-10-21 3:45 ` [PATCH v3 6/6] ARM: dts: add RK3288 suspend support zyw 2014-10-21 3:45 ` zyw at rock-chips.com
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1413863011-2736-1-git-send-email-zyw@rock-chips.com \ --to=zyw@rock-chips.com \ --cc=devicetree@vger.kernel.org \ --cc=dianders@chromium.org \ --cc=galak@codeaurora.org \ --cc=heiko@sntech.de \ --cc=ijc+devicetree@hellion.org.uk \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=linux@arm.linux.org.uk \ --cc=mark.rutland@arm.com \ --cc=mturquette@linaro.org \ --cc=pawel.moll@arm.com \ --cc=robh+dt@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.