3 files changed, 14 insertions, 41 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index db3c5414223e..044e32be02b5 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -755,7 +755,7 @@ config ARCH_S3C64XX
         select ATAGS
         select CLKDEV_LOOKUP
         select CLKSRC_SAMSUNG_PWM
-        select COMMON_CLK
+        select COMMON_CLK_SAMSUNG
         select CPU_V6K
         select GENERIC_CLOCKEVENTS
         select GPIO_SAMSUNG
@@ -836,7 +836,7 @@ config ARCH_EXYNOS
         select ARCH_REQUIRE_GPIOLIB
         select ARCH_SPARSEMEM_ENABLE
         select ARM_GIC
-        select COMMON_CLK
+        select COMMON_CLK_SAMSUNG
         select CPU_V7
         select GENERIC_CLOCKEVENTS
         select HAVE_S3C2410_I2C if I2C
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 418f2506aaf0..d433fe4d00f0 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -546,7 +546,7 @@
                 #size-cells = <0>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c4_hs_bus>;
-                clocks = <&clock CLK_I2C4>;
+                clocks = <&clock CLK_USI0>;
                 clock-names = "hsi2c";
                 status = "disabled";
         };
@@ -559,7 +559,7 @@
                 #size-cells = <0>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c5_hs_bus>;
-                clocks = <&clock CLK_I2C5>;
+                clocks = <&clock CLK_USI1>;
                 clock-names = "hsi2c";
                 status = "disabled";
         };
@@ -572,7 +572,7 @@
                 #size-cells = <0>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c6_hs_bus>;
-                clocks = <&clock CLK_I2C6>;
+                clocks = <&clock CLK_USI2>;
                 clock-names = "hsi2c";
                 status = "disabled";
         };
@@ -585,7 +585,7 @@
                 #size-cells = <0>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c7_hs_bus>;
-                clocks = <&clock CLK_I2C7>;
+                clocks = <&clock CLK_USI3>;
                 clock-names = "hsi2c";
                 status = "disabled";
         };
@@ -598,7 +598,7 @@
                 #size-cells = <0>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c8_hs_bus>;
-                clocks = <&clock CLK_I2C8>;
+                clocks = <&clock CLK_USI4>;
                 clock-names = "hsi2c";
                 status = "disabled";
         };
@@ -611,7 +611,7 @@
                 #size-cells = <0>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c9_hs_bus>;
-                clocks = <&clock CLK_I2C9>;
+                clocks = <&clock CLK_USI5>;
                 clock-names = "hsi2c";
                 status = "disabled";
         };
@@ -624,7 +624,7 @@
                 #size-cells = <0>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c10_hs_bus>;
-                clocks = <&clock CLK_I2C10>;
+                clocks = <&clock CLK_USI6>;
                 clock-names = "hsi2c";
                 status = "disabled";
         };
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index 45a7026e9419..04284de7aca5 100644
--- 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