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

Commit 4f5ad99b authored by Russell King's avatar Russell King
Browse files

ARM: pm: convert PXA to generic suspend/resume support 



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

arch/arm/mach-pxa/include/mach/pm.h

+2 −3
Original line number Diff line number Diff line
@@ -22,9 +22,8 @@ struct pxa_cpu_pm_fns { 
extern struct pxa_cpu_pm_fns *pxa_cpu_pm_fns;



/* sleep.S */

extern void pxa25x_cpu_suspend(unsigned int);

extern void pxa27x_cpu_suspend(unsigned int);

extern void pxa_cpu_resume(void);

extern void pxa25x_cpu_suspend(unsigned int, long);

extern void pxa27x_cpu_suspend(unsigned int, long);



extern int pxa_pm_enter(suspend_state_t state);

extern int pxa_pm_prepare(void);

arch/arm/mach-pxa/palmz72.c

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static unsigned long store_ptr; 
static int palmz72_pm_suspend(struct sys_device *dev, pm_message_t msg)

{

	/* setup the resume_info struct for the original bootloader */

	palmz72_resume_info.resume_addr = (u32) pxa_cpu_resume;

	palmz72_resume_info.resume_addr = (u32) cpu_resume;



	/* Storing memory touched by ROM */

	store_ptr = *PALMZ72_SAVE_DWORD;

arch/arm/mach-pxa/pm.c

+0 −5
Original line number Diff line number Diff line
@@ -67,11 +67,6 @@ int pxa_pm_enter(suspend_state_t state) 


EXPORT_SYMBOL_GPL(pxa_pm_enter);



unsigned long sleep_phys_sp(void *sp)

{

	return virt_to_phys(sp);

}



static int pxa_pm_valid(suspend_state_t state)

{

	if (pxa_cpu_pm_fns)

arch/arm/mach-pxa/pxa25x.c

+2 −2
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ static void pxa25x_cpu_pm_enter(suspend_state_t state) 


	switch (state) {

	case PM_SUSPEND_MEM:

		pxa25x_cpu_suspend(PWRMODE_SLEEP);

		pxa25x_cpu_suspend(PWRMODE_SLEEP, PLAT_PHYS_OFFSET - PAGE_OFFSET);

		break;

	}

}
@@ -252,7 +252,7 @@ static void pxa25x_cpu_pm_enter(suspend_state_t state) 
static int pxa25x_cpu_pm_prepare(void)

{

	/* set resume return address */

	PSPR = virt_to_phys(pxa_cpu_resume);

	PSPR = virt_to_phys(cpu_resume);

	return 0;

}

arch/arm/mach-pxa/pxa27x.c

+2 −2
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ void pxa27x_cpu_pm_enter(suspend_state_t state) 
		pxa_cpu_standby();

		break;

	case PM_SUSPEND_MEM:

		pxa27x_cpu_suspend(pwrmode);

		pxa27x_cpu_suspend(pwrmode, PLAT_PHYS_OFFSET - PAGE_OFFSET);

		break;

	}

}
@@ -313,7 +313,7 @@ static int pxa27x_cpu_pm_valid(suspend_state_t state) 
static int pxa27x_cpu_pm_prepare(void)

{

	/* set resume return address */

	PSPR = virt_to_phys(pxa_cpu_resume);

	PSPR = virt_to_phys(cpu_resume);

	return 0;

}