From: mturquette@linaro.org (Mike Turquette)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v7 1/5] clk: rockchip: RK3288: add suspend and resume
Date: Wed, 12 Nov 2014 16:38:55 -0800 [thread overview]
Message-ID: <20141113003855.25314.67230@quantum> (raw)
In-Reply-To: <1415368177-6637-2-git-send-email-zyw@rock-chips.com>
Quoting Chris Zhong (2014-11-07 05:49:33)
> save and restore some clks, which might be changed in suspend.
>
> Signed-off-by: Tony Xie <xxx@rock-chips.com>
> Signed-off-by: Chris Zhong <zyw@rock-chips.com>
> Reviewed-by: Doug Anderson <dianders@chromium.org>
> Tested-by: Doug Anderson <dianders@chromium.org>
Looks good to me.
Regards,
Mike
>
> ---
>
> Changes in v7: None
> Changes in v6:
> - modify comments
>
> Changes in v5:
> - modify comments
>
> Changes in v4: None
> Changes in v3: None
> Changes in v2:
> - __raw_readl/__raw_writel replaced by readl_relaxed/writel_relaxed
>
> drivers/clk/rockchip/clk-rk3288.c | 60 +++++++++++++++++++++++++++++++++++++++
> 1 file changed, 60 insertions(+)
>
> diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
> index 2327829..66a9cb0 100644
> --- a/drivers/clk/rockchip/clk-rk3288.c
> +++ b/drivers/clk/rockchip/clk-rk3288.c
> @@ -16,6 +16,7 @@
> #include <linux/clk-provider.h>
> #include <linux/of.h>
> #include <linux/of_address.h>
> +#include <linux/syscore_ops.h>
> #include <dt-bindings/clock/rk3288-cru.h>
> #include "clk.h"
>
> @@ -762,6 +763,64 @@ static const char *rk3288_critical_clocks[] __initconst = {
> "hclk_peri",
> };
>
> +#ifdef CONFIG_PM_SLEEP
> +static void __iomem *rk3288_cru_base;
> +
> +/* Some CRU registers will be reset in maskrom when the system
> + * wakes up from fastboot.
> + * So save them before suspend, restore them after resume.
> + */
> +static const int rk3288_saved_cru_reg_ids[] = {
> + RK3288_MODE_CON,
> + RK3288_CLKSEL_CON(0),
> + RK3288_CLKSEL_CON(1),
> + RK3288_CLKSEL_CON(10),
> + RK3288_CLKSEL_CON(33),
> + RK3288_CLKSEL_CON(37),
> +};
> +
> +static u32 rk3288_saved_cru_regs[ARRAY_SIZE(rk3288_saved_cru_reg_ids)];
> +
> +static int rk3288_clk_suspend(void)
> +{
> + int i, reg_id;
> +
> + for (i = 0; i < ARRAY_SIZE(rk3288_saved_cru_reg_ids); i++) {
> + reg_id = rk3288_saved_cru_reg_ids[i];
> +
> + rk3288_saved_cru_regs[i] =
> + readl_relaxed(rk3288_cru_base + reg_id);
> + }
> + return 0;
> +}
> +
> +static void rk3288_clk_resume(void)
> +{
> + int i, reg_id;
> +
> + for (i = ARRAY_SIZE(rk3288_saved_cru_reg_ids) - 1; i >= 0; i--) {
> + reg_id = rk3288_saved_cru_reg_ids[i];
> +
> + writel_relaxed(rk3288_saved_cru_regs[i] | 0xffff0000,
> + rk3288_cru_base + reg_id);
> + }
> +}
> +
> +static struct syscore_ops rk3288_clk_syscore_ops = {
> + .suspend = rk3288_clk_suspend,
> + .resume = rk3288_clk_resume,
> +};
> +
> +static void rk3288_clk_sleep_init(void __iomem *reg_base)
> +{
> + rk3288_cru_base = reg_base;
> + register_syscore_ops(&rk3288_clk_syscore_ops);
> +}
> +
> +#else /* CONFIG_PM_SLEEP */
> +static void rk3288_clk_sleep_init(void __iomem *reg_base) {}
> +#endif
> +
> static void __init rk3288_clk_init(struct device_node *np)
> {
> void __iomem *reg_base;
> @@ -810,5 +869,6 @@ static void __init rk3288_clk_init(struct device_node *np)
> ROCKCHIP_SOFTRST_HIWORD_MASK);
>
> rockchip_register_restart_notifier(RK3288_GLB_SRST_FST);
> + rk3288_clk_sleep_init(reg_base);
> }
> CLK_OF_DECLARE(rk3288_cru, "rockchip,rk3288-cru", rk3288_clk_init);
> --
> 1.9.1
>
next prev parent reply other threads:[~2014-11-13 0:38 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-07 13:49 [PATCH v7 0/5] This is the 1st version of suspend for RK3288 Chris Zhong
2014-11-07 13:49 ` [PATCH v7 1/5] clk: rockchip: RK3288: add suspend and resume Chris Zhong
2014-11-10 20:00 ` Heiko Stübner
2014-11-13 0:38 ` Mike Turquette [this message]
2014-11-07 13:49 ` [PATCH v7 2/5] ARM: rockchip: add suspend and resume for RK3288 Chris Zhong
2014-11-10 22:42 ` Doug Anderson
2014-11-07 13:49 ` [PATCH v7 4/5] ARM: dts: add RK3288 suspend support Chris Zhong
2014-11-10 18:40 ` Doug Anderson
2014-11-07 13:49 ` [PATCH v7 5/5] ARM: dts: add suspend voltage setting for RK808 Chris Zhong
2014-11-07 22:48 ` [PATCH v7 0/5] This is the 1st version of suspend for RK3288 Kevin Hilman
2014-11-11 0:40 ` Heiko Stübner
2014-11-11 5:47 ` Doug Anderson
2014-11-11 7:10 ` Chris Zhong
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=20141113003855.25314.67230@quantum \
--to=mturquette@linaro.org \
--cc=linux-arm-kernel@lists.infradead.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).