Merge branch 'exynos/pwm-clocksource' into late/multiplatform

[~andy/linux] / arch / arm / plat-samsung / Kconfig

diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 2e1b1905ac3a26e183f88564ec0602d41418325c..53b2d59ca252f6d52683a9d8c9d433f36a5328ac 100644 (file)
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -13,6 +13,10 @@ config PLAT_SAMSUNG
        help
          Base platform code for all Samsung SoC based systems
 
+config PLAT_SAMSUNG_SINGLE
+       def_bool PLAT_SAMSUNG && !ARCH_MULTIPLATFORM
+       
+
 config PLAT_S5P
        bool
        depends on (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS)
@@ -23,9 +27,9 @@ config PLAT_S5P
        select GIC_NON_BANKED if ARCH_EXYNOS4
        select NO_IOPORT
        select PLAT_SAMSUNG
-       select S3C_GPIO_TRACK
+       select S3C_GPIO_TRACK if PLAT_SAMSUNG_SINGLE
        select S5P_GPIO_DRVSTR
-       select SAMSUNG_CLKSRC
+       select SAMSUNG_CLKSRC if !COMMON_CLK
        select SAMSUNG_GPIOLIB_4BIT
        select SAMSUNG_IRQ_VIC_TIMER
        help
@@ -70,7 +74,7 @@ config S3C_LOWLEVEL_UART_PORT
 
 # timer options
 
-config S5P_HRT
+config SAMSUNG_HRT
        bool
        select SAMSUNG_DEV_PWM
        help
@@ -89,7 +93,7 @@ config SAMSUNG_CLKSRC
          used by newer systems such as the S3C64XX.
 
 config S5P_CLOCK
-       def_bool (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS)
+       def_bool (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210)
        help
          Support common clock part for ARCH_S5P and ARCH_EXYNOS SoCs
 
@@ -178,6 +182,7 @@ config S5P_DEV_UART
 
 config S3C_ADC
        bool "ADC common driver support"
+       depends on PLAT_SAMSUNG_SINGLE
        help
          Core support for the ADC block found in the Samsung SoC systems
          for drivers such as the touchscreen and hwmon to use to share