diff options
| author | Abhilash Kesavan <a.kesavan@samsung.com> | 2011-10-04 20:25:51 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 20:25:51 +0900 |
| commit | 0da3beadcbed2128702831c9fe106ea23e194b3f (patch) | |
| tree | cdaa779b331f6f8a7ac48c23f91f73dcc10b6d36 /arch | |
| parent | a1a9107deff9b9e5c615058834b74717fa87d49c (diff) | |
ARM: S5P: Make the common S5P PM code conditionally compile
Pave the way for adding PM support on S5P64X0, which is more similar
to the S3C64XX series than the S5P series. Hence, the common pm code
(containing dummy functions) should not be used for S5P64X0.
Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-exynos4/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s5pv210/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/plat-s5p/Kconfig | 6 | ||||
| -rw-r--r-- | arch/arm/plat-s5p/Makefile | 3 |
4 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig index 2dad16c8cf7..43ccbb0bf41 100644 --- a/arch/arm/mach-exynos4/Kconfig +++ b/arch/arm/mach-exynos4/Kconfig @@ -12,11 +12,13 @@ if ARCH_EXYNOS4 config CPU_EXYNOS4210 bool select SAMSUNG_DMADEV + select S5P_PM if PM help Enable EXYNOS4210 CPU support config SOC_EXYNOS4212 bool + select S5P_PM if PM help Enable EXYNOS4212 SoC support diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig index f22c683272d..34b772a9932 100644 --- a/arch/arm/mach-s5pv210/Kconfig +++ b/arch/arm/mach-s5pv210/Kconfig @@ -14,6 +14,7 @@ config CPU_S5PV210 select SAMSUNG_DMADEV select S5P_EXT_INT select S5P_HRT + select S5P_PM if PM help Enable S5PV210 CPU support diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig index f9241a7a68c..53e674348b3 100644 --- a/arch/arm/plat-s5p/Kconfig +++ b/arch/arm/plat-s5p/Kconfig @@ -40,6 +40,12 @@ config S5P_HRT help Use the High Resolution timer support +config S5P_PM + bool + help + Common code for power management support on S5P and newer SoCs + Note: Do not select this for S5P6440 and S5P6450. + comment "System MMU" config S5P_SYSTEM_MMU diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile index 181201974b4..755d7ac4384 100644 --- a/arch/arm/plat-s5p/Makefile +++ b/arch/arm/plat-s5p/Makefile @@ -20,8 +20,7 @@ obj-y += irq.o obj-$(CONFIG_S5P_EXT_INT) += irq-eint.o obj-$(CONFIG_S5P_GPIO_INT) += irq-gpioint.o obj-$(CONFIG_S5P_SYSTEM_MMU) += sysmmu.o -obj-$(CONFIG_PM) += pm.o -obj-$(CONFIG_PM) += irq-pm.o +obj-$(CONFIG_S5P_PM) += pm.o irq-pm.o obj-$(CONFIG_S5P_HRT) += s5p-time.o # devices |