Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / arm / mach-s3c24xx / Kconfig

diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index 37f513d1588ece1db569d02bdeda76980b6a65e1..f2f7088bfd221c9bb50df7180f1dbbc51a9e2e2d 100644 (file)
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -30,29 +30,30 @@ config CPU_S3C2410
        select S3C2410_CLOCK
        select S3C2410_CPUFREQ if CPU_FREQ_S3C24XX
        select S3C2410_PM if PM
+       select SAMSUNG_HRT
        help
          Support for S3C2410 and S3C2410A family from the S3C24XX line
          of Samsung Mobile CPUs.
 
 config CPU_S3C2412
        bool "SAMSUNG S3C2412"
-       depends on ARCH_S3C24XX
        select CPU_ARM926T
        select CPU_LLSERIAL_S3C2440
        select S3C2412_DMA if S3C24XX_DMA
        select S3C2412_PM if PM
+       select SAMSUNG_HRT
        help
          Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line
 
 config CPU_S3C2416
        bool "SAMSUNG S3C2416/S3C2450"
-       depends on ARCH_S3C24XX
        select CPU_ARM926T
        select CPU_LLSERIAL_S3C2440
        select S3C2416_PM if PM
        select S3C2443_COMMON
        select S3C2443_DMA if S3C24XX_DMA
        select SAMSUNG_CLKSRC
+       select SAMSUNG_HRT
        help
          Support for the S3C2416 SoC from the S3C24XX line
 
@@ -63,6 +64,7 @@ config CPU_S3C2440
        select S3C2410_CLOCK
        select S3C2410_PM if PM
        select S3C2440_DMA if S3C24XX_DMA
+       select SAMSUNG_HRT
        help
          Support for S3C2440 Samsung Mobile CPU based systems.
 
@@ -72,6 +74,7 @@ config CPU_S3C2442
        select CPU_LLSERIAL_S3C2440
        select S3C2410_CLOCK
        select S3C2410_PM if PM
+       select SAMSUNG_HRT
        help
          Support for S3C2442 Samsung Mobile CPU based systems.
 
@@ -81,12 +84,12 @@ config CPU_S3C244X
 
 config CPU_S3C2443
        bool "SAMSUNG S3C2443"
-       depends on ARCH_S3C24XX
        select CPU_ARM920T
        select CPU_LLSERIAL_S3C2440
        select S3C2443_COMMON
        select S3C2443_DMA if S3C24XX_DMA
        select SAMSUNG_CLKSRC
+       select SAMSUNG_HRT
        help
          Support for the S3C2443 SoC from the S3C24XX line
 
@@ -133,7 +136,6 @@ config S3C24XX_SETUP_TS
 
 config S3C24XX_DMA
        bool "S3C2410 DMA support"
-       depends on ARCH_S3C24XX
        select S3C_DMA
        help
          S3C2410 DMA support. This is needed for drivers like sound which
@@ -142,7 +144,7 @@ config S3C24XX_DMA
 
 config S3C2410_DMA_DEBUG
        bool "S3C2410 DMA support debug"
-       depends on ARCH_S3C24XX && S3C2410_DMA
+       depends on S3C2410_DMA
        help
          Enable debugging output for the DMA code. This option sends info
          to the kernel log, at priority KERN_DEBUG.
@@ -233,7 +235,7 @@ if CPU_S3C2410
 
 config S3C2410_CPUFREQ
        bool
-       depends on CPU_FREQ_S3C24XX && CPU_S3C2410
+       depends on CPU_FREQ_S3C24XX
        select S3C2410_CPUFREQ_UTILS
        help
          CPU Frequency scaling support for S3C2410
@@ -320,7 +322,6 @@ config PM_H1940
 
 config MACH_N30
        bool "Acer N30 family"
-       select MACH_N35
        select S3C_DEV_NAND
        select S3C_DEV_USB_HOST
        help
@@ -380,14 +381,13 @@ if CPU_S3C2412
 
 config CPU_S3C2412_ONLY
        bool
-       depends on ARCH_S3C24XX && !CPU_S3C2410 && \
-                  !CPU_S3C2416 && !CPU_S3C2440 && !CPU_S3C2442 && \
-                  !CPU_S3C2443 && CPU_S3C2412
+       depends on !CPU_S3C2410 && !CPU_S3C2416 && !CPU_S3C2440 && \
+                  !CPU_S3C2442 && !CPU_S3C2443
        default y
 
 config S3C2412_CPUFREQ
        bool
-       depends on CPU_FREQ_S3C24XX && CPU_S3C2412
+       depends on CPU_FREQ_S3C24XX
        default y
        select S3C2412_IOTIMING
        help
@@ -401,6 +401,7 @@ config S3C2412_DMA
 config S3C2412_PM
        bool
        select S3C2412_PM_SLEEP
+       select SAMSUNG_WAKEMASK
        help
          Internal config node to apply S3C2412 power management
 
@@ -642,7 +643,6 @@ comment "S3C2442 Boards"
 config MACH_NEO1973_GTA02
        bool "Openmoko GTA02 / Freerunner phone"
        select I2C
-       select MACH_NEO1973
        select MFD_PCF50633
        select PCF50633_GPIO
        select POWER_SUPPLY
@@ -663,10 +663,7 @@ config MACH_RX1950
        help
           Say Y here if you're using HP iPAQ rx1950
 
-config SMDK2440_CPU2442
-       bool "SMDM2440 with S3C2442 CPU module"
-
-endif  # CPU_S3C2440
+endif  # CPU_S3C2442
 
 if CPU_S3C2443 || CPU_S3C2416