ARM: mach-tegra: properly disable CPU idle call
authorNicolas Pitre <nicolas.pitre@linaro.org>
Wed, 3 Aug 2011 16:21:16 +0000 (12:21 -0400)
committerNicolas Pitre <nico@fluxnic.net>
Fri, 20 Jan 2012 23:55:19 +0000 (18:55 -0500)
Signed-off-by: nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Stephen Warren <swarren@nvidia.com>
arch/arm/mach-tegra/common.c
arch/arm/mach-tegra/include/mach/system.h

index a2eb90169aed4dcee4b48541db475456b972e5bf..2db20da1d585a98535046fe01e4911c80a108a17 100644 (file)
@@ -27,7 +27,6 @@
 #include <asm/hardware/gic.h>
 
 #include <mach/iomap.h>
-#include <mach/system.h>
 
 #include "board.h"
 #include "clock.h"
@@ -96,6 +95,8 @@ static void __init tegra_init_cache(u32 tag_latency, u32 data_latency)
 #ifdef CONFIG_ARCH_TEGRA_2x_SOC
 void __init tegra20_init_early(void)
 {
+       disable_hlt();  /* idle WFI usage needs to be confirmed */
+
        tegra_init_fuse();
        tegra2_init_clocks();
        tegra_clk_init_from_table(tegra20_clk_init_table);
index a312988bf6f8609a9bbeb590db5a4cfe8e8df30f..968ea2b0529b35f17aa24cc61c35da16cc50747b 100644 (file)
@@ -23,6 +23,7 @@
 
 static inline void arch_idle(void)
 {
+       cpu_do_idle();
 }
 
 #endif