Commit 1ab4ef91 authored by Nicolas Pitre's avatar Nicolas Pitre
Browse files

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



Signed-off-by: default avatarNicolas Pitre <nico@linaro.org>
parent 20a7b2c1

arch/arm/mach-s5p64x0/common.c

+6 −9
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ static void s5p64x0_idle(void) 
{

	unsigned long val;



	if (!need_resched()) {

	val = __raw_readl(S5P64X0_PWR_CFG);

	val &= ~(0x3 << 5);

	val |= (0x1 << 5);
@@ -154,8 +153,6 @@ static void s5p64x0_idle(void) 


	cpu_do_idle();

}

	local_irq_enable();

}



/*

 * s5p64x0_map_io
@@ -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);

}

arch/arm/mach-s5p64x0/include/mach/system.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


static void arch_idle(void)

{

	/* nothing here yet */

	cpu_do_idle();

}



#endif /* __ASM_ARCH_SYSTEM_H */