Browse Source

ARM: mach-ixp23xx: properly disable CPU idle call

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Nicolas Pitre 14 years ago
parent
commit
86ce0d2e6f
2 changed files with 4 additions and 4 deletions
  1. 3 0
      arch/arm/mach-ixp23xx/core.c
  2. 1 4
      arch/arm/mach-ixp23xx/include/mach/system.h

+ 3 - 0
arch/arm/mach-ixp23xx/core.c

@@ -441,6 +441,9 @@ static struct platform_device *ixp23xx_devices[] __initdata = {
 
 void __init ixp23xx_sys_init(void)
 {
+	/* by default, the idle code is disabled */
+	disable_hlt();
+
 	*IXP23XX_EXP_UNIT_FUSE |= 0xf;
 	platform_add_devices(ixp23xx_devices, ARRAY_SIZE(ixp23xx_devices));
 }

+ 1 - 4
arch/arm/mach-ixp23xx/include/mach/system.h

@@ -9,8 +9,5 @@
  */
 static inline void arch_idle(void)
 {
-#if 0
-	if (!hlt_counter)
-		cpu_do_idle();
-#endif
+	cpu_do_idle();
 }