From: Nicolas Pitre <nicolas.pitre@linaro.org>
Date: Wed, 3 Aug 2011 16:21:16 +0000 (-0400)
Subject: ARM: mach-w90x900: properly disable CPU idle call
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a5ad6fbaddf8ada0c52935845a117c483ca0c6d6;p=mv-sheeva.git

ARM: mach-w90x900: properly disable CPU idle call

Signed-off-by: nicolas Pitre <nicolas.pitre@linaro.org>
---

diff --git a/arch/arm/mach-w90x900/dev.c b/arch/arm/mach-w90x900/dev.c
index 78110befb7a..db82568a998 100644
--- a/arch/arm/mach-w90x900/dev.c
+++ b/arch/arm/mach-w90x900/dev.c
@@ -530,6 +530,7 @@ static struct platform_device *nuc900_public_dev[] __initdata = {
 
 void __init nuc900_board_init(struct platform_device **device, int size)
 {
+	disable_hlt();
 	platform_add_devices(device, size);
 	platform_add_devices(nuc900_public_dev, ARRAY_SIZE(nuc900_public_dev));
 	spi_register_board_info(nuc900_spi_board_info,
diff --git a/arch/arm/mach-w90x900/include/mach/system.h b/arch/arm/mach-w90x900/include/mach/system.h
index 2aaeb931161..f713161ee50 100644
--- a/arch/arm/mach-w90x900/include/mach/system.h
+++ b/arch/arm/mach-w90x900/include/mach/system.h
@@ -16,4 +16,5 @@
  */
 static void arch_idle(void)
 {
+	cpu_do_idle();
 }