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>

diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
index 2dad16c8cf79f952a56f2e86c4f3f5d38db144f8..43ccbb0bf41056d0348e992bb83b28c71a2db8bc 100644 (file)
--- 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 f22c683272d3d48f19e7a40a00f8452b594646fb..34b772a99327e94a8befe93a8b53e09bdb944f26 100644 (file)
--- 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 f9241a7a68ca04a02245de72e0daed57ccc16333..53e674348b313b561d58707b387adc59a0da0d34 100644 (file)
--- 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 181201974b4146d997779b113d862033781cd0f6..755d7ac4384ae0d51a0164fad924f5a366be6bc8 100644 (file)
--- 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