Commit 15e0d9e3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: pm: let platforms select cpu_suspend support 



Support for the cpu_suspend functions is only built-in
when CONFIG_PM_SLEEP is enabled, but omap3/4, exynos4
and pxa always call cpu_suspend when CONFIG_PM is enabled.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 82b9c18d

arch/arm/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -631,6 +631,7 @@ config ARCH_PXA 
	select SPARSE_IRQ

	select AUTO_ZRELADDR

	select MULTI_IRQ_HANDLER

	select ARM_CPU_SUSPEND if PM

	help

	  Support for Intel/Marvell's PXA2xx/PXA3xx processor line.
@@ -2077,6 +2078,9 @@ config ARCH_SUSPEND_POSSIBLE 
		CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE

	def_bool y



config ARM_CPU_SUSPEND

	def_bool PM_SLEEP



endmenu



source "net/Kconfig"

arch/arm/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ obj-$(CONFIG_MODULES) += armksyms.o module.o 
obj-$(CONFIG_ARTHUR)		+= arthur.o

obj-$(CONFIG_ISA_DMA)		+= dma-isa.o

obj-$(CONFIG_PCI)		+= bios32.o isa.o

obj-$(CONFIG_PM_SLEEP)		+= sleep.o

obj-$(CONFIG_ARM_CPU_SUSPEND)	+= sleep.o

obj-$(CONFIG_HAVE_SCHED_CLOCK)	+= sched_clock.o

obj-$(CONFIG_SMP)		+= smp.o smp_tlb.o

obj-$(CONFIG_HAVE_ARM_SCU)	+= smp_scu.o

arch/arm/mach-exynos4/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ if ARCH_EXYNOS4 
config CPU_EXYNOS4210

	bool

	select S3C_PL330_DMA

	select ARM_CPU_SUSPEND if PM

	help

	  Enable EXYNOS4210 CPU support

arch/arm/mach-omap2/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ config ARCH_OMAP3 
	select ARM_L1_CACHE_SHIFT_6 if !ARCH_OMAP4

	select ARCH_HAS_OPP

	select PM_OPP if PM

	select ARM_CPU_SUSPEND if PM



config ARCH_OMAP4

	bool "TI OMAP4"
@@ -50,6 +51,7 @@ config ARCH_OMAP4 
	select ARCH_HAS_OPP

	select PM_OPP if PM

	select USB_ARCH_HAS_EHCI

	select ARM_CPU_SUSPEND if PM



comment "OMAP Core Type"

	depends on ARCH_OMAP2

arch/arm/mm/proc-v7.S

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ ENDPROC(cpu_v7_set_pte_ext) 
/* Suspend/resume support: derived from arch/arm/mach-s5pv210/sleep.S */

.globl	cpu_v7_suspend_size

.equ	cpu_v7_suspend_size, 4 * 9

#ifdef CONFIG_PM_SLEEP

#ifdef CONFIG_ARM_CPU_SUSPEND

ENTRY(cpu_v7_do_suspend)

	stmfd	sp!, {r4 - r11, lr}

	mrc	p15, 0, r4, c13, c0, 0	@ FCSE/PID