Merge branch 'v3.16-next/cleanup-samsung' into v3.16-next/platform-exynos

[cascardo/linux.git] / arch / arm / mach-s3c24xx / Kconfig

diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index 45a7026..04284de 100644 (file)
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -18,17 +18,7 @@ config PLAT_S3C24XX
        help
          Base platform code for any Samsung S3C24XX device
 
-config S3C2410_COMMON_CLK
-       bool
-       help
-         Build the s3c2410 clock driver based on the common clock framework.
 
-config S3C2410_COMMON_DCLK
-       bool
-       select REGMAP_MMIO
-       help
-         Temporary symbol to build the dclk driver based on the common clock
-         framework.
 
 menu "SAMSUNG S3C24XX SoCs Support"
 
@@ -37,7 +27,6 @@ comment "S3C24XX SoCs"
 config CPU_S3C2410
        bool "SAMSUNG S3C2410"
        default y
-       select COMMON_CLK
        select CPU_ARM920T
        select S3C2410_COMMON_CLK
        select S3C2410_DMA if S3C24XX_DMA
@@ -50,7 +39,6 @@ config CPU_S3C2410
 
 config CPU_S3C2412
        bool "SAMSUNG S3C2412"
-       select COMMON_CLK
        select CPU_ARM926T
        select S3C2412_COMMON_CLK
        select S3C2412_DMA if S3C24XX_DMA
@@ -60,7 +48,6 @@ config CPU_S3C2412
 
 config CPU_S3C2416
        bool "SAMSUNG S3C2416/S3C2450"
-       select COMMON_CLK
        select CPU_ARM926T
        select S3C2416_PM if PM
        select S3C2443_COMMON_CLK
@@ -70,7 +57,6 @@ config CPU_S3C2416
 
 config CPU_S3C2440
        bool "SAMSUNG S3C2440"
-       select COMMON_CLK
        select CPU_ARM920T
        select S3C2410_COMMON_CLK
        select S3C2410_PM if PM
@@ -80,7 +66,6 @@ config CPU_S3C2440
 
 config CPU_S3C2442
        bool "SAMSUNG S3C2442"
-       select COMMON_CLK
        select CPU_ARM920T
        select S3C2410_COMMON_CLK
        select S3C2410_DMA if S3C24XX_DMA
@@ -95,7 +80,6 @@ config CPU_S3C244X
 
 config CPU_S3C2443
        bool "SAMSUNG S3C2443"
-       select COMMON_CLK
        select CPU_ARM920T
        select S3C2443_COMMON_CLK
        select S3C2443_DMA if S3C24XX_DMA
@@ -236,7 +220,7 @@ config ARCH_BAST
        bool "Simtec Electronics BAST (EB2410ITX)"
        select ISA
        select MACH_BAST_IDE
-       select S3C2410_COMMON_DCLK if COMMON_CLK
+       select S3C2410_COMMON_DCLK
        select S3C2410_IOTIMING if ARM_S3C2410_CPUFREQ
        select S3C24XX_SIMTEC_NOR
        select S3C24XX_SIMTEC_PM if PM
@@ -318,7 +302,7 @@ config MACH_TCT_HAMMER
 config MACH_VR1000
        bool "Thorcom VR1000"
        select MACH_BAST_IDE
-       select S3C2410_COMMON_DCLK if COMMON_CLK
+       select S3C2410_COMMON_DCLK
        select S3C24XX_SIMTEC_NOR
        select S3C24XX_SIMTEC_PM if PM
        select S3C24XX_SIMTEC_USB
@@ -337,11 +321,6 @@ config S3C2412_PM_SLEEP
 
 if CPU_S3C2412
 
-config S3C2412_COMMON_CLK
-       bool
-       help
-         Build the s3c2412 clock driver based on the common clock framework.
-
 config CPU_S3C2412_ONLY
        bool
        depends on !CPU_S3C2410 && !CPU_S3C2416 && !CPU_S3C2440 && \
@@ -502,7 +481,7 @@ comment "S3C2440 Boards"
 config MACH_ANUBIS
        bool "Simtec Electronics ANUBIS"
        select HAVE_PATA_PLATFORM
-       select S3C2410_COMMON_DCLK if COMMON_CLK
+       select S3C2410_COMMON_DCLK
        select S3C2440_XTAL_12000000
        select S3C24XX_SIMTEC_PM if PM
        select S3C_DEV_USB_HOST
@@ -541,7 +520,7 @@ config MACH_NEXCODER_2440
 
 config MACH_OSIRIS
        bool "Simtec IM2440D20 (OSIRIS) module"
-       select S3C2410_COMMON_DCLK if COMMON_CLK
+       select S3C2410_COMMON_DCLK
        select S3C2410_IOTIMING if ARM_S3C2440_CPUFREQ
        select S3C2440_XTAL_12000000
        select S3C24XX_SIMTEC_PM if PM
@@ -612,7 +591,7 @@ config MACH_RX1950
        bool "HP iPAQ rx1950"
        select I2C
        select PM_H1940 if PM
-       select S3C2410_COMMON_DCLK if COMMON_CLK
+       select S3C2410_COMMON_DCLK
        select S3C2410_IOTIMING if ARM_S3C2440_CPUFREQ
        select S3C2440_XTAL_16934400
        select S3C24XX_PWM
@@ -624,12 +603,6 @@ endif      # CPU_S3C2442
 
 if CPU_S3C2443 || CPU_S3C2416
 
-config S3C2443_COMMON_CLK
-       bool
-       help
-         Temporary symbol to build the clock driver based on the common clock
-         framework.
-
 config S3C2443_DMA
        bool
        help