ARM: S3C24XX: remove legacy clock code

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-s3c24xx / Kconfig

diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index 52f1c40ccf0719463b2473e5962caac23c3a9924..f9bb1ea14fe4d9d2d49a484ed5983d876cbed57c 100644 (file)
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -18,6 +18,18 @@ 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"
 
 comment "S3C24XX SoCs"
@@ -25,10 +37,10 @@ comment "S3C24XX SoCs"
 config CPU_S3C2410
        bool "SAMSUNG S3C2410"
        default y
-       depends on SAMSUNG_CLOCK
+       select COMMON_CLK
        select CPU_ARM920T
        select CPU_LLSERIAL_S3C2410
-       select S3C2410_CLOCK
+       select S3C2410_COMMON_CLK
        select S3C2410_DMA if S3C24XX_DMA
        select ARM_S3C2410_CPUFREQ if ARM_S3C24XX_CPUFREQ
        select S3C2410_PM if PM
@@ -39,9 +51,10 @@ config CPU_S3C2410
 
 config CPU_S3C2412
        bool "SAMSUNG S3C2412"
-       depends on SAMSUNG_CLOCK
+       select COMMON_CLK
        select CPU_ARM926T
        select CPU_LLSERIAL_S3C2440
+       select S3C2412_COMMON_CLK
        select S3C2412_DMA if S3C24XX_DMA
        select S3C2412_PM if PM
        help
@@ -60,10 +73,10 @@ config CPU_S3C2416
 
 config CPU_S3C2440
        bool "SAMSUNG S3C2440"
-       depends on SAMSUNG_CLOCK
+       select COMMON_CLK
        select CPU_ARM920T
        select CPU_LLSERIAL_S3C2440
-       select S3C2410_CLOCK
+       select S3C2410_COMMON_CLK
        select S3C2410_PM if PM
        select S3C2440_DMA if S3C24XX_DMA
        help
@@ -71,10 +84,10 @@ config CPU_S3C2440
 
 config CPU_S3C2442
        bool "SAMSUNG S3C2442"
-       depends on SAMSUNG_CLOCK
+       select COMMON_CLK
        select CPU_ARM920T
        select CPU_LLSERIAL_S3C2440
-       select S3C2410_CLOCK
+       select S3C2410_COMMON_CLK
        select S3C2410_DMA if S3C24XX_DMA
        select S3C2410_PM if PM
        help
@@ -97,17 +110,6 @@ config CPU_S3C2443
 
 # common code
 
-config S3C2410_CLOCK
-       bool
-       help
-         Clock code for the S3C2410, and similar processors which
-         is currently includes the S3C2410, S3C2440, S3C2442.
-
-config S3C24XX_DCLK
-       bool
-       help
-         Clock code for supporting DCLK/CLKOUT on S3C24XX architectures
-
 config S3C24XX_SMDK
        bool
        help
@@ -262,8 +264,9 @@ config ARCH_BAST
        bool "Simtec Electronics BAST (EB2410ITX)"
        select ISA
        select MACH_BAST_IDE
+       select S3C2410_COMMON_DCLK if COMMON_CLK
        select S3C2410_IOTIMING if ARM_S3C2410_CPUFREQ
-       select S3C24XX_DCLK
+       select S3C24XX_DCLK if SAMSUNG_CLOCK
        select S3C24XX_SIMTEC_NOR
        select S3C24XX_SIMTEC_PM if PM
        select S3C24XX_SIMTEC_USB
@@ -344,7 +347,8 @@ config MACH_TCT_HAMMER
 config MACH_VR1000
        bool "Thorcom VR1000"
        select MACH_BAST_IDE
-       select S3C24XX_DCLK
+       select S3C2410_COMMON_DCLK if COMMON_CLK
+       select S3C24XX_DCLK if SAMSUNG_CLOCK
        select S3C24XX_SIMTEC_NOR
        select S3C24XX_SIMTEC_PM if PM
        select S3C24XX_SIMTEC_USB
@@ -363,6 +367,11 @@ 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 && \
@@ -523,8 +532,9 @@ comment "S3C2440 Boards"
 config MACH_ANUBIS
        bool "Simtec Electronics ANUBIS"
        select HAVE_PATA_PLATFORM
+       select S3C2410_COMMON_DCLK if COMMON_CLK
        select S3C2440_XTAL_12000000
-       select S3C24XX_DCLK
+       select S3C24XX_DCLK if SAMSUNG_CLOCK
        select S3C24XX_SIMTEC_PM if PM
        select S3C_DEV_USB_HOST
        help
@@ -562,9 +572,10 @@ config MACH_NEXCODER_2440
 
 config MACH_OSIRIS
        bool "Simtec IM2440D20 (OSIRIS) module"
+       select S3C2410_COMMON_DCLK if COMMON_CLK
        select S3C2410_IOTIMING if ARM_S3C2440_CPUFREQ
        select S3C2440_XTAL_12000000
-       select S3C24XX_DCLK
+       select S3C24XX_DCLK if SAMSUNG_CLOCK
        select S3C24XX_SIMTEC_PM if PM
        select S3C_DEV_NAND
        select S3C_DEV_USB_HOST
@@ -633,9 +644,10 @@ config MACH_RX1950
        bool "HP iPAQ rx1950"
        select I2C
        select PM_H1940 if PM
+       select S3C2410_COMMON_DCLK if COMMON_CLK
        select S3C2410_IOTIMING if ARM_S3C2440_CPUFREQ
        select S3C2440_XTAL_16934400
-       select S3C24XX_DCLK
+       select S3C24XX_DCLK if SAMSUNG_CLOCK
        select S3C24XX_PWM
        select S3C_DEV_NAND
        help