From 7ee68273dde3de3ed1cc5ed9afd2c87c2d741aac Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nicolas.pitre@linaro.org>
Date: Wed, 3 Aug 2011 12:21:16 -0400
Subject: [PATCH] --- yaml --- r: 295335 b: refs/heads/master c:
 daa14d5e60e040bde290ec904af976fef6292627 h: refs/heads/master i:   295333:
 4563e365cd578299eeb138d9b7c9949829b35407   295331:
 07a271e8ff43efce5a84924b62a07da4d1f279e4   295327:
 8828596bdaf4992e53f04a51e3f92b88c66b40d8 v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/arm/mach-tegra/common.c              | 3 ++-
 trunk/arch/arm/mach-tegra/include/mach/system.h | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 99012f5e3990..9f91288a4054 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bab421b0a97c4ae41d1b41c9ad10b7841c2130f
+refs/heads/master: daa14d5e60e040bde290ec904af976fef6292627
diff --git a/trunk/arch/arm/mach-tegra/common.c b/trunk/arch/arm/mach-tegra/common.c
index a2eb90169aed..2db20da1d585 100644
--- a/trunk/arch/arm/mach-tegra/common.c
+++ b/trunk/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);
diff --git a/trunk/arch/arm/mach-tegra/include/mach/system.h b/trunk/arch/arm/mach-tegra/include/mach/system.h
index a312988bf6f8..968ea2b0529b 100644
--- a/trunk/arch/arm/mach-tegra/include/mach/system.h
+++ b/trunk/arch/arm/mach-tegra/include/mach/system.h
@@ -23,6 +23,7 @@
 
 static inline void arch_idle(void)
 {
+	cpu_do_idle();
 }
 
 #endif