diff options
author | Krishna Reddy <vdumpa@nvidia.com> | 2012-05-03 19:02:04 -0700 |
---|---|---|
committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-05-07 08:31:33 -0700 |
commit | b25193d5c3e2c59169c127d23b59123136cfefa7 (patch) | |
tree | 5ead7939dde79a1798b030fcf22d9c0f670cf072 /arch | |
parent | a3be04f0f9deefa1aef4bb89e7f5991816bb929a (diff) |
arm: tegra: scu: Enable IC and SCU standby
Bug 947861
Change-Id: I1ac97b5de5e7e79a418b3c38c70df4976616cdf3
Signed-off-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-on: http://git-master/r/100457
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Aleksandr Frid <afrid@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-tegra/headsmp.S | 4 | ||||
-rw-r--r-- | arch/arm/mach-tegra/platsmp.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/headsmp.S b/arch/arm/mach-tegra/headsmp.S index 4a9f03ffd972..4e28a558cc38 100644 --- a/arch/arm/mach-tegra/headsmp.S +++ b/arch/arm/mach-tegra/headsmp.S @@ -83,7 +83,9 @@ ENTRY(tegra_resume) ldr r1, [r0] orr r1, r1, #1 #if defined(CONFIG_HAVE_ARM_SCU) - orr r1, r1, #(1 << 3) @ Enabled SCU speculative line fill. + orr r1, r1, #(1 << 3) @ Enable SCU speculative line fill. + orr r1, r1, #(1 << 5) @ Enable IC standby. + orr r1, r1, #(1 << 6) @ Enable SCU standby. #endif str r1, [r0] diff --git a/arch/arm/mach-tegra/platsmp.c b/arch/arm/mach-tegra/platsmp.c index ed6c01fe8544..d1178a820f39 100644 --- a/arch/arm/mach-tegra/platsmp.c +++ b/arch/arm/mach-tegra/platsmp.c @@ -290,7 +290,10 @@ void __init platform_smp_prepare_cpus(unsigned int max_cpus) #if defined(CONFIG_HAVE_ARM_SCU) { - u32 scu_ctrl = __raw_readl(scu_base) | 1 << 3; + u32 scu_ctrl = __raw_readl(scu_base) | + 1 << 3 | /* Enable speculative line fill*/ + 1 << 5 | /* Enable IC standby */ + 1 << 6; /* Enable SCU standby */ if (!(scu_ctrl & 1)) __raw_writel(scu_ctrl, scu_base); } |