Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7089da9 authored by Russell King's avatar Russell King
Browse files

ARM: pm: samsung: move cpu_suspend into C code 



Move the call to cpu_suspend into C code, and noticing that all the
s3c_cpu_save implementations are now identical, we can move this
into the common samsung code.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4d01446f

arch/arm/mach-exynos4/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static struct sleep_save exynos4_l2cc_save[] = { 
	SAVE_ITEM(S5P_VA_L2CC + L2X0_AUX_CTRL),

};



void exynos4_cpu_suspend(void)

void exynos4_cpu_suspend(unsigned long arg)

{

	unsigned long tmp;

	unsigned long mask = 0xFFFFFFFF;

arch/arm/mach-exynos4/sleep.S

+0 −18
Original line number Diff line number Diff line
@@ -32,24 +32,6 @@ 


	.text



	/*

	 * s3c_cpu_save

	 *

	 * entry:

	 *	r1 = v:p offset

	 */



ENTRY(s3c_cpu_save)

	adr	r3, BSYM(exynos4_finish_suspend)

	b	cpu_suspend



exynos4_finish_suspend:

	ldr	r0, =pm_cpu_sleep

	ldr	r0, [ r0 ]

	mov	pc, r0



	.ltorg



	/*

	 * sleep magic, to allow the bootloader to check for an valid

	 * image to resume to. Must be the first word before the

arch/arm/mach-s3c2412/pm.c

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


extern void s3c2412_sleep_enter(void);



static void s3c2412_cpu_suspend(void)

static void s3c2412_cpu_suspend(unsigned long arg)

{

	unsigned long tmp;

arch/arm/mach-s3c2416/pm.c

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


extern void s3c2412_sleep_enter(void);



static void s3c2416_cpu_suspend(void)

static void s3c2416_cpu_suspend(unsigned long arg)

{

	flush_cache_all();

arch/arm/mach-s3c64xx/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ void s3c_pm_save_core(void) 
 * this.

 */



static void s3c64xx_cpu_suspend(void)

static void s3c64xx_cpu_suspend(unsigned long arg)

{

	unsigned long tmp;