ARM: S3C24XX: prevent conflicts between ccf and non-ccf s3c24xx-socs

As the conversion to the common-clock-framework is done in multiple
steps, it is necessary to prevent conflicts between the different
struct clk implementations.

For this include the s3c24xx_setup_clocks function only when
SAMSUNG_CLOCK is selected and make the socs we don't convert this
time explicitly depend on SAMSUNG_CLOCK, which gets only selected
automatically if COMMON_CLK is not enabled.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

1 files changed, 4 insertions, 0 deletions

diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index abf9179c9d03..f10af7faec98 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -25,6 +25,7 @@ comment "S3C24XX SoCs"
 config CPU_S3C2410
         bool "SAMSUNG S3C2410"
         default y
+        depends on SAMSUNG_CLOCK
         select CPU_ARM920T
         select CPU_LLSERIAL_S3C2410
         select S3C2410_CLOCK
@@ -38,6 +39,7 @@ config CPU_S3C2410
 
 config CPU_S3C2412
         bool "SAMSUNG S3C2412"
+        depends on SAMSUNG_CLOCK
         select CPU_ARM926T
         select CPU_LLSERIAL_S3C2440
         select S3C2412_DMA if S3C24XX_DMA
@@ -58,6 +60,7 @@ config CPU_S3C2416
 
 config CPU_S3C2440
         bool "SAMSUNG S3C2440"
+        depends on SAMSUNG_CLOCK
         select CPU_ARM920T
         select CPU_LLSERIAL_S3C2440
         select S3C2410_CLOCK
@@ -68,6 +71,7 @@ config CPU_S3C2440
 
 config CPU_S3C2442
         bool "SAMSUNG S3C2442"
+        depends on SAMSUNG_CLOCK
         select CPU_ARM920T
         select CPU_LLSERIAL_S3C2440
         select S3C2410_CLOCK