evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: mach-s5p64x0: move idle handler from pm_idle to arm_pm_idle

Browse source 
Signed-off-by: Nicolas Pitre <nico@linaro.org>
This commit is contained in:
Nicolas Pitre 2012-01-04 17:24:25 -05:00 • committed by Nicolas Pitre
parent 20a7b2c151
commit 1ab4ef9112
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/arm/mach-s5p64x0/common.c
View file

@ -146,7 +146,6 @@ static void s5p64x0_idle(void)
{ {
unsigned long val; unsigned long val;
if (!need_resched()) {
val = __raw_readl(S5P64X0_PWR_CFG); val = __raw_readl(S5P64X0_PWR_CFG);
val &= ~(0x3 << 5); val &= ~(0x3 << 5);
val |= (0x1 << 5); val |= (0x1 << 5);
@ -154,8 +153,6 @@ static void s5p64x0_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
local_irq_enable();
}
/* /*
* s5p64x0_map_io * s5p64x0_map_io
@ -286,7 +283,7 @@ int __init s5p64x0_init(void)
printk(KERN_INFO "S5P64X0(S5P6440/S5P6450): Initializing architecture\n"); printk(KERN_INFO "S5P64X0(S5P6440/S5P6450): Initializing architecture\n");
/* set idle function */ /* set idle function */
pm_idle = s5p64x0_idle; arm_pm_idle = s5p64x0_idle;
return device_register(&s5p64x0_dev); return device_register(&s5p64x0_dev);
} }

2
arch/arm/mach-s5p64x0/include/mach/system.h
View file

@ -15,7 +15,7 @@
static void arch_idle(void) static void arch_idle(void)
{ {
/* nothing here yet */ cpu_do_idle();
} }
#endif /* __ASM_ARCH_SYSTEM_H */ #endif /* __ASM_ARCH_SYSTEM_H */