diff options
author | Tomasz Figa <t.figa@samsung.com> | 2013-06-18 12:24:12 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-06-18 12:24:37 -0400 |
commit | 105dddbfcc3ceb8bde60af1121a60ea9978fe714 (patch) | |
tree | acadbe906dcf18ff08b4c3cba22a248b6447c178 /arch/arm/plat-samsung | |
parent | 38d0a99e9b09fd9cd57638a9603a0dd26c8909f4 (diff) |
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>
Diffstat (limited to 'arch/arm/plat-samsung')
-rw-r--r-- | arch/arm/plat-samsung/Kconfig | 13 | ||||
-rw-r--r-- | arch/arm/plat-samsung/Makefile | 5 |
2 files changed, 16 insertions, 2 deletions
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index c0f0542e6dfc..7b08b2678b1a 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig | |||
@@ -421,6 +421,19 @@ config S3C_DMA | |||
421 | help | 421 | help |
422 | Internal configuration for S3C DMA core | 422 | Internal configuration for S3C DMA core |
423 | 423 | ||
424 | config S5P_IRQ_PM | ||
425 | bool | ||
426 | default y if S5P_PM | ||
427 | help | ||
428 | Legacy IRQ power management for S5P platforms | ||
429 | |||
430 | config SAMSUNG_PM_GPIO | ||
431 | bool | ||
432 | default y if GPIO_SAMSUNG && PM | ||
433 | help | ||
434 | Include legacy GPIO power management code for platforms not using | ||
435 | pinctrl-samsung driver. | ||
436 | |||
424 | endif | 437 | endif |
425 | 438 | ||
426 | config SAMSUNG_DMADEV | 439 | config SAMSUNG_DMADEV |
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile index b549ea9cfe09..6348ae2e3b46 100644 --- a/arch/arm/plat-samsung/Makefile +++ b/arch/arm/plat-samsung/Makefile | |||
@@ -52,10 +52,11 @@ obj-$(CONFIG_SAMSUNG_DMADEV) += dma-ops.o | |||
52 | # PM support | 52 | # PM support |
53 | 53 | ||
54 | obj-$(CONFIG_PM) += pm.o | 54 | obj-$(CONFIG_PM) += pm.o |
55 | obj-$(CONFIG_PM) += pm-gpio.o | 55 | obj-$(CONFIG_SAMSUNG_PM_GPIO) += pm-gpio.o |
56 | obj-$(CONFIG_SAMSUNG_PM_CHECK) += pm-check.o | 56 | obj-$(CONFIG_SAMSUNG_PM_CHECK) += pm-check.o |
57 | 57 | ||
58 | obj-$(CONFIG_SAMSUNG_WAKEMASK) += wakeup-mask.o | 58 | obj-$(CONFIG_SAMSUNG_WAKEMASK) += wakeup-mask.o |
59 | 59 | ||
60 | obj-$(CONFIG_S5P_PM) += s5p-pm.o s5p-irq-pm.o | 60 | obj-$(CONFIG_S5P_PM) += s5p-pm.o |
61 | obj-$(CONFIG_S5P_IRQ_PM) += s5p-irq-pm.o | ||
61 | obj-$(CONFIG_S5P_SLEEP) += s5p-sleep.o | 62 | obj-$(CONFIG_S5P_SLEEP) += s5p-sleep.o |