Skip to content

Commit

Permalink
ARM: mach-gemini: move special idle code out of line
Browse files Browse the repository at this point in the history
... and hook it to arm_pm_idle.

Signed-off-by: nicolas Pitre <nicolas.pitre@linaro.org>
  • Loading branch information
Nicolas Pitre authored and Nicolas Pitre committed Jan 20, 2012
1 parent 1b7f72f commit 8925b0f
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 12 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-gemini/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# 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
obj-$(CONFIG_MACH_NAS4220B) += board-nas4220b.o
Expand Down
29 changes: 29 additions & 0 deletions arch/arm/mach-gemini/idle.c
Original file line number Diff line number Diff line change
@@ -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);
9 changes: 0 additions & 9 deletions arch/arm/mach-gemini/include/mach/system.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,6 @@

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();
}

Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-gemini/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ void __init gemini_init_irq(void)
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();

Expand Down

0 comments on commit 8925b0f

Please sign in to comment.