openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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

15
arch/arm/mach-s5p64x0/common.c
View File

@ -146,15 +146,12 @@ static void s5p64x0_idle(void)
{
unsigned long val;
if (!need_resched()) {
val = __raw_readl(S5P64X0_PWR_CFG);
val &= ~(0x3 << 5);
val |= (0x1 << 5);
__raw_writel(val, S5P64X0_PWR_CFG);
val = __raw_readl(S5P64X0_PWR_CFG);
val &= ~(0x3 << 5);
val |= (0x1 << 5);
__raw_writel(val, S5P64X0_PWR_CFG);
cpu_do_idle();
}
local_irq_enable();
cpu_do_idle();
}
/*
@ -286,7 +283,7 @@ int __init s5p64x0_init(void)
printk(KERN_INFO "S5P64X0(S5P6440/S5P6450): Initializing architecture\n");
/* set idle function */
pm_idle = s5p64x0_idle;
arm_pm_idle = s5p64x0_idle;
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)
{
/* nothing here yet */
cpu_do_idle();
}
#endif /* __ASM_ARCH_SYSTEM_H */