ARM: SAMSUNG: Compile legacy IRQ and GPIO PM code only with ATAGS support

This patch adds new Kconfig symbols, SAMSUNG_PM_GPIO and S5P_IRQ_PM that
get enabled when GPIO_SAMSUNG, PM and S5P_PM are enabled, but only if
SAMSUNG_ATAGS is selected.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index c0f0542e6dfc625eb4164ff1d6208532518af1b3..7b08b2678b1a6bfe99a1a8bf6ff725b3b0ecc876 100644 (file)
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -421,6 +421,19 @@ config S3C_DMA
        help
          Internal configuration for S3C DMA core
 
+config S5P_IRQ_PM
+       bool
+       default y if S5P_PM
+       help
+         Legacy IRQ power management for S5P platforms
+
+config SAMSUNG_PM_GPIO
+       bool
+       default y if GPIO_SAMSUNG && PM
+       help
+         Include legacy GPIO power management code for platforms not using
+         pinctrl-samsung driver.
+
 endif
 
 config SAMSUNG_DMADEV

diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index b549ea9cfe0946c74993c7d72051fc6a7ffc33c3..6348ae2e3b467671f6fe2f3a41720b7598123e38 100644 (file)
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -52,10 +52,11 @@ obj-$(CONFIG_SAMSUNG_DMADEV)        += dma-ops.o
 # PM support
 
 obj-$(CONFIG_PM)               += pm.o
-obj-$(CONFIG_PM)               += pm-gpio.o
+obj-$(CONFIG_SAMSUNG_PM_GPIO)  += pm-gpio.o
 obj-$(CONFIG_SAMSUNG_PM_CHECK) += pm-check.o
 
 obj-$(CONFIG_SAMSUNG_WAKEMASK) += wakeup-mask.o
 
-obj-$(CONFIG_S5P_PM)           += s5p-pm.o s5p-irq-pm.o
+obj-$(CONFIG_S5P_PM)           += s5p-pm.o
+obj-$(CONFIG_S5P_IRQ_PM)       += s5p-irq-pm.o
 obj-$(CONFIG_S5P_SLEEP)                += s5p-sleep.o