ARM: S3C24XX: move S3C24XX clock Kconfig options to Samsung clock Kconfig file

This patch moves S3C24XX specific clock Kconfig options into
"clk/samsung/Kconfig" and also removes COMMON_CLK selection from
"mach-s3c24xx/Kconfig" as S3C24XX_COMMON_CLK is selecting it's dependency.

CC: Ben Dooks <ben-linux@fluff.org>
CC: Kukjin Kim <kgene.kim@samsung.com>
CC: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com>
Signed-off-by: Tomasz Figa <t.figa@samsung.com>

diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index ab2866b4794e4e9213b9bbe33a1694cda9ed2234..1e52b6926374761f63e19488756e54e25b9cff17 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 CPU_LLSERIAL_S3C2410
        select S3C2410_COMMON_CLK
@@ -51,7 +40,6 @@ config CPU_S3C2410
 
 config CPU_S3C2412
        bool "SAMSUNG S3C2412"
-       select COMMON_CLK
        select CPU_ARM926T
        select CPU_LLSERIAL_S3C2440
        select S3C2412_COMMON_CLK
@@ -62,7 +50,6 @@ config CPU_S3C2412
 
 config CPU_S3C2416
        bool "SAMSUNG S3C2416/S3C2450"
-       select COMMON_CLK
        select CPU_ARM926T
        select CPU_LLSERIAL_S3C2440
        select S3C2416_PM if PM
@@ -73,7 +60,6 @@ config CPU_S3C2416
 
 config CPU_S3C2440
        bool "SAMSUNG S3C2440"
-       select COMMON_CLK
        select CPU_ARM920T
        select CPU_LLSERIAL_S3C2440
        select S3C2410_COMMON_CLK
@@ -84,7 +70,6 @@ config CPU_S3C2440
 
 config CPU_S3C2442
        bool "SAMSUNG S3C2442"
-       select COMMON_CLK
        select CPU_ARM920T
        select CPU_LLSERIAL_S3C2440
        select S3C2410_COMMON_CLK
@@ -100,7 +85,6 @@ config CPU_S3C244X
 
 config CPU_S3C2443
        bool "SAMSUNG S3C2443"
-       select COMMON_CLK
        select CPU_ARM920T
        select CPU_LLSERIAL_S3C2440
        select S3C2443_COMMON_CLK
@@ -365,11 +349,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 && \
@@ -652,12 +631,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

diff --git a/drivers/clk/samsung/Kconfig b/drivers/clk/samsung/Kconfig
index fc8696b0954f63f5b538113829b4250cddbc3af7..84196ecdaa12f5df319f6fafe2e9b6bd664bc9d5 100644 (file)
--- a/drivers/clk/samsung/Kconfig
+++ b/drivers/clk/samsung/Kconfig
@@ -1,3 +1,26 @@
 config COMMON_CLK_SAMSUNG
        bool
        select COMMON_CLK
+
+config S3C2410_COMMON_CLK
+       bool
+       select COMMON_CLK_SAMSUNG
+       help
+         Build the s3c2410 clock driver based on the common clock framework.
+
+config S3C2410_COMMON_DCLK
+       bool
+       select COMMON_CLK_SAMSUNG
+       select REGMAP_MMIO
+       help
+         Temporary symbol to build the dclk driver based on the common clock
+         framework.
+
+config S3C2412_COMMON_CLK
+       bool
+       select COMMON_CLK_SAMSUNG
+
+config S3C2443_COMMON_CLK
+       bool
+       select COMMON_CLK_SAMSUNG
+