Browse Source

ARM: mach-tegra: properly disable CPU idle call

Signed-off-by: nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Stephen Warren <swarren@nvidia.com>
Nicolas Pitre 14 years ago
parent
commit
daa14d5e60
2 changed files with 3 additions and 1 deletions
  1. 2 1
      arch/arm/mach-tegra/common.c
  2. 1 0
      arch/arm/mach-tegra/include/mach/system.h

+ 2 - 1
arch/arm/mach-tegra/common.c

@@ -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);

+ 1 - 0
arch/arm/mach-tegra/include/mach/system.h

@@ -23,6 +23,7 @@
 
 static inline void arch_idle(void)
 {
+	cpu_do_idle();
 }
 
 #endif