arm: tegra: scu: Enable IC and SCU standby
Krishna Reddy [Fri, 4 May 2012 02:02:04 +0000 (19:02 -0700)]
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>

Rebase-Id: R7d702046b68e7e2e5ee36f1ceca5779ac5cd982d

arch/arm/mach-tegra/headsmp.S
arch/arm/mach-tegra/platsmp.c

index 560b8af..8ac9477 100644 (file)
@@ -158,7 +158,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]
 
index f30beb6..7c27b39 100644 (file)
@@ -269,7 +269,10 @@ static void __init tegra_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);
        }