commit 12d2b4e5f0c65eaa1d61e4e1bbfb2df41bc6cd9d
author Nicolas Pitre <nicolas.pitre@linaro.org> Wed Aug 03 07:25:39 2011 -0400
committer Nicolas Pitre <nico@fluxnic.net> Fri Jan 20 18:55:16 2012 -0500
tree 1283d25048a770f01d29208f5a57c1da7b680d29
parent 86ce0d2e6f131bd0b5b1b8d32149e008d39b5ea1

ARM: mach-ixp4xx: properly disable CPU idle call

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

arch/arm/mach-ixp4xx/common.c

diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index 3841ab4..a6329a0 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -236,6 +236,12 @@
 {
 	int i = 0;
 
+	/*
+	 * ixp4xx does not implement the XScale PWRMODE register
+	 * so it must not call cpu_do_idle().
+	 */
+	disable_hlt();
+
 	/* Route all sources to IRQ instead of FIQ */
 	*IXP4XX_ICLR = 0x0;