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

Commit 533462fb authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] pxa: omit PXA25x or PXA27x standby/sleep code as appropriate 



There's no point building standby/sleep code for processors which
aren't configured.

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

arch/arm/mach-pxa/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -41,14 +41,10 @@ led-$(CONFIG_MACH_TRIZEPS4) += leds-trizeps4.o 
obj-$(CONFIG_LEDS)		+= $(led-y)



# Misc features

obj-$(CONFIG_PM)		+= pm.o sleep.o

obj-$(CONFIG_PM)		+= pm.o sleep.o standby.o

obj-$(CONFIG_CPU_FREQ)		+= cpu-pxa.o

obj-$(CONFIG_PXA_SSP)		+= ssp.o



ifeq ($(CONFIG_PXA27x),y)

obj-$(CONFIG_PM)		+= standby.o

endif



ifeq ($(CONFIG_PCI),y)

obj-$(CONFIG_MACH_ARMCORE) += cm-x270-pci.o

endif

arch/arm/mach-pxa/sleep.S

+6 −2
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ pxa_cpu_save_sp: 
	str	r0, [r1]

	ldr	pc, [sp], #4



#ifdef CONFIG_PXA27x

/*

 * pxa27x_cpu_suspend()

 *
@@ -105,9 +106,11 @@ ENTRY(pxa27x_cpu_suspend) 


	@ align execution to a cache line

	b	pxa_cpu_do_suspend

#endif



#ifdef CONFIG_PXA25x

/*

 * pxa27x_cpu_suspend()

 * pxa25x_cpu_suspend()

 *

 * Forces CPU into sleep state.

 *
@@ -170,6 +173,7 @@ ENTRY(pxa25x_cpu_suspend) 
	mcr	p14, 0, r0, c6, c0, 0

	orr	r0, r0, #2			@ initiate change bit

	b	pxa_cpu_do_suspend

#endif



	.ltorg

	.align	5
@@ -209,7 +213,7 @@ pxa_cpu_do_suspend: 
20:	b	20b				@ loop waiting for sleep



/*

 * cpu_pxa_resume()

 * pxa_cpu_resume()

 *

 * entry point from bootloader into kernel during resume

 *

arch/arm/mach-pxa/standby.S

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


		.text



#ifdef CONFIG_PXA27x

ENTRY(pxa_cpu_standby)

	ldr	r0, =PSSR

	mov	r1, #(PSSR_PH | PSSR_STS)
@@ -29,3 +30,5 @@ ENTRY(pxa_cpu_standby) 
1:	mcr	p14, 0, r2, c7, c0, 0	@ put the system into Standby

	str	r1, [r0]		@ make sure PSSR_PH/STS are clear

	mov	pc, lr



#endif