diff options
| author | Abhilash Kesavan <a.kesavan@samsung.com> | 2011-10-04 13:25:51 +0200 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 13:25:51 +0200 |
| commit | 0da3beadcbed2128702831c9fe106ea23e194b3f (patch) | |
| tree | cdaa779b331f6f8a7ac48c23f91f73dcc10b6d36 /arch/arm/plat-s5p | |
| parent | Merge branch 'next-samsung-board-2' into next-samsung-devel-2 (diff) | |
| download | linux-0da3beadcbed2128702831c9fe106ea23e194b3f.tar.xz linux-0da3beadcbed2128702831c9fe106ea23e194b3f.zip | |
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/arm/plat-s5p')
| -rw-r--r-- | arch/arm/plat-s5p/Kconfig | 6 | ||||
| -rw-r--r-- | arch/arm/plat-s5p/Makefile | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig index f9241a7a68ca..53e674348b31 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 181201974b41..755d7ac4384a 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 |