arm: tegra: pm: Update CPU complex resume
Prashant Gaikwad [Tue, 27 Mar 2012 10:42:57 +0000 (15:42 +0530)]
Completely removed PLLP restoration from CPU complex resume on
Tegra2 platforms (too late: PLLP is restored from AVP warm boot
code)

Bug 952200
Bug 931285

Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Reviewed-on: http://git-master/r/92523
(cherry picked from commit 066dc172010f1a5ea5a375e1cbdcf162ab206d63)

Change-Id: I1a31793db8ee1fda5a947d69890e3118f0d3cdab
Reviewed-on: http://git-master/r/93562
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Tested-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

arch/arm/mach-tegra/pm.c

index c68017c..2f51702 100644 (file)
@@ -311,14 +311,6 @@ static void restore_cpu_complex(u32 mode)
 
        BUG_ON(cpu != 0);
 
-       /* restore original PLL settings */
-#ifdef CONFIG_ARCH_TEGRA_2x_SOC
-       writel(tegra_sctx.pllp_misc, clk_rst + CLK_RESET_PLLP_MISC);
-       writel(tegra_sctx.pllp_base, clk_rst + CLK_RESET_PLLP_BASE);
-       writel(tegra_sctx.pllp_outa, clk_rst + CLK_RESET_PLLP_OUTA);
-       writel(tegra_sctx.pllp_outb, clk_rst + CLK_RESET_PLLP_OUTB);
-#endif
-
        /* Is CPU complex already running on PLLX? */
        reg = readl(clk_rst + CLK_RESET_CCLK_BURST);
        policy = (reg >> CLK_RESET_CCLK_BURST_POLICY_SHIFT) & 0xF;