Re: [PATCH v7 07/16] clk: tegra: Save/restore CCLKG_BURST_POLICY on suspend

Peter De Schrijver
2015-02-12T14:24:40Z

On Thu, Jan 08, 2015 at 03:22:10PM +0200, Mikko Perttunen wrote:
> From: Tuomas Tynkkynen <ttynkkynen@nvidia.com>
>
> Save and restore this register since the LP1 restore assembly routines
> fiddle with it. Otherwise the CPU would keep running on PLLX after
> resume from suspend even when DFLL was the original clocksource.
>
> Signed-off-by: Tuomas Tynkkynen <ttynkkynen@nvidia.com>
> Signed-off-by: Mikko Perttunen <mikko.perttunen@kapsi.fi>
Acked-By: Peter De Schrijver <pdeschrijver@nvidia.com>

> ---
> drivers/clk/tegra/clk-tegra124.c | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/drivers/clk/tegra/clk-tegra124.c b/drivers/clk/tegra/clk-tegra124.c
> index 623b77f..9354c42 100644
> --- a/drivers/clk/tegra/clk-tegra124.c
> +++ b/drivers/clk/tegra/clk-tegra124.c
> @@ -89,6 +89,8 @@
> #define PMC_PLLM_WB0_OVERRIDE 0x1dc
> #define PMC_PLLM_WB0_OVERRIDE_2 0x2b0
>
> +#define CCLKG_BURST_POLICY 0x368
> +
> #define UTMIP_PLL_CFG2 0x488
> #define UTMIP_PLL_CFG2_STABLE_COUNT(x) (((x) & 0xffff) << 6)
> #define UTMIP_PLL_CFG2_ACTIVE_DLY_COUNT(x) (((x) & 0x3f) << 18)
> @@ -121,6 +123,8 @@
> #ifdef CONFIG_PM_SLEEP
> static struct cpu_clk_suspend_context {
> u32 clk_csite_src;
> + u32 cclkg_burst;
> + u32 cclkg_divider;
> } tegra124_cpu_clk_sctx;
> #endif
>
> @@ -1331,12 +1335,22 @@ static void tegra124_cpu_clock_suspend(void)
> tegra124_cpu_clk_sctx.clk_csite_src =
> readl(clk_base + CLK_SOURCE_CSITE);
> writel(3 << 30, clk_base + CLK_SOURCE_CSITE);
> +
> + tegra124_cpu_clk_sctx.cclkg_burst =
> + readl(clk_base + CCLKG_BURST_POLICY);
> + tegra124_cpu_clk_sctx.cclkg_divider =
> + readl(clk_base + CCLKG_BURST_POLICY + 4);
> }
>
> static void tegra124_cpu_clock_resume(void)
> {
> writel(tegra124_cpu_clk_sctx.clk_csite_src,
> clk_base + CLK_SOURCE_CSITE);
> +
> + writel(tegra124_cpu_clk_sctx.cclkg_burst,
> + clk_base + CCLKG_BURST_POLICY);
> + writel(tegra124_cpu_clk_sctx.cclkg_divider,
> + clk_base + CCLKG_BURST_POLICY + 4);
> }
> #endif
>
> --
> 2.2.1
>