浏览代码

ARM: mach-gemini: move special idle code out of line

... and hook it to arm_pm_idle.

Signed-off-by: nicolas Pitre <nicolas.pitre@linaro.org>
Nicolas Pitre 14 年之前
父节点
当前提交
8925b0f88e
共有 4 个文件被更改,包括 32 次插入12 次删除
  1. 1 1
      arch/arm/mach-gemini/Makefile
  2. 29 0
      arch/arm/mach-gemini/idle.c
  3. 0 9
      arch/arm/mach-gemini/include/mach/system.h
  4. 2 2
      arch/arm/mach-gemini/irq.c

+ 1 - 1
arch/arm/mach-gemini/Makefile

@@ -4,7 +4,7 @@
 
 
 # Object file lists.
 # Object file lists.
 
 
-obj-y			:= irq.o mm.o time.o devices.o gpio.o
+obj-y			:= irq.o mm.o time.o devices.o gpio.o idle.o
 
 
 # Board-specific support
 # Board-specific support
 obj-$(CONFIG_MACH_NAS4220B)	+= board-nas4220b.o
 obj-$(CONFIG_MACH_NAS4220B)	+= board-nas4220b.o

+ 29 - 0
arch/arm/mach-gemini/idle.c

@@ -0,0 +1,29 @@
+/*
+ * arch/arm/mach-gemini/idle.c
+ */
+
+#include <linux/init.h>
+#include <asm/system.h>
+#include <asm/proc-fns.h>
+
+static void gemini_idle(void)
+{
+	/*
+	 * Because of broken hardware we have to enable interrupts or the CPU
+	 * will never wakeup... Acctualy it is not very good to enable
+	 * interrupts first since scheduler can miss a tick, but there is
+	 * no other way around this. Platforms that needs it for power saving
+	 * should call enable_hlt() in init code, since by default it is
+	 * disabled.
+	 */
+	local_irq_enable();
+	cpu_do_idle();
+}
+
+static int __init gemini_idle_init(void)
+{
+	arm_pm_idle = gemini_idle;
+	return 0;
+}
+
+arch_initcall(gemini_idle_init);

+ 0 - 9
arch/arm/mach-gemini/include/mach/system.h

@@ -16,15 +16,6 @@
 
 
 static inline void arch_idle(void)
 static inline void arch_idle(void)
 {
 {
-	/*
-	 * Because of broken hardware we have to enable interrupts or the CPU
-	 * will never wakeup... Acctualy it is not very good to enable
-	 * interrupts here since scheduler can miss a tick, but there is
-	 * no other way around this. Platforms that needs it for power saving
-	 * should call enable_hlt() in init code, since by default it is
-	 * disabled.
-	 */
-	local_irq_enable();
 	cpu_do_idle();
 	cpu_do_idle();
 }
 }
 
 

+ 2 - 2
arch/arm/mach-gemini/irq.c

@@ -73,8 +73,8 @@ void __init gemini_init_irq(void)
 	unsigned int i, mode = 0, level = 0;
 	unsigned int i, mode = 0, level = 0;
 
 
 	/*
 	/*
-	 * Disable arch_idle() by default since it is buggy
-	 * For more info see arch/arm/mach-gemini/include/mach/system.h
+	 * Disable the idle handler by default since it is buggy
+	 * For more info see arch/arm/mach-gemini/idle.c
 	 */
 	 */
 	disable_hlt();
 	disable_hlt();