1 files changed, 13 insertions, 57 deletions

diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index 40cf50b9940c..04284de7aca5 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -18,6 +18,8 @@ config PLAT_S3C24XX
         help
           Base platform code for any Samsung S3C24XX device
 
+
+
 menu "SAMSUNG S3C24XX SoCs Support"
 
 comment "S3C24XX SoCs"
@@ -26,8 +28,7 @@ config CPU_S3C2410
         bool "SAMSUNG S3C2410"
         default y
         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,7 +40,7 @@ config CPU_S3C2410
 config CPU_S3C2412
         bool "SAMSUNG S3C2412"
         select CPU_ARM926T
-        select CPU_LLSERIAL_S3C2440
+        select S3C2412_COMMON_CLK
         select S3C2412_DMA if S3C24XX_DMA
         select S3C2412_PM if PM
         help
@@ -48,19 +49,16 @@ config CPU_S3C2412
 config CPU_S3C2416
         bool "SAMSUNG S3C2416/S3C2450"
         select CPU_ARM926T
-        select CPU_LLSERIAL_S3C2440
         select S3C2416_PM if PM
-        select S3C2443_COMMON
+        select S3C2443_COMMON_CLK
         select S3C2443_DMA if S3C24XX_DMA
-        select SAMSUNG_CLKSRC
         help
           Support for the S3C2416 SoC from the S3C24XX line
 
 config CPU_S3C2440
         bool "SAMSUNG S3C2440"
         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
@@ -69,8 +67,7 @@ config CPU_S3C2440
 config CPU_S3C2442
         bool "SAMSUNG S3C2442"
         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
@@ -84,26 +81,13 @@ config CPU_S3C244X
 config CPU_S3C2443
         bool "SAMSUNG S3C2443"
         select CPU_ARM920T
-        select CPU_LLSERIAL_S3C2440
-        select S3C2443_COMMON
+        select S3C2443_COMMON_CLK
         select S3C2443_DMA if S3C24XX_DMA
-        select SAMSUNG_CLKSRC
         help
           Support for the S3C2443 SoC from the S3C24XX line
 
 # 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
@@ -158,28 +142,6 @@ config S3C2410_PM
         help
           Power Management code common to S3C2410 and better
 
-# low-level serial option nodes
-
-config CPU_LLSERIAL_S3C2410_ONLY
-        bool
-        default y if CPU_LLSERIAL_S3C2410 && !CPU_LLSERIAL_S3C2440
-
-config CPU_LLSERIAL_S3C2440_ONLY
-        bool
-        default y if CPU_LLSERIAL_S3C2440 && !CPU_LLSERIAL_S3C2410
-
-config CPU_LLSERIAL_S3C2410
-        bool
-        help
-          Selected if there is an S3C2410 (or register compatible) serial
-          low-level implementation needed
-
-config CPU_LLSERIAL_S3C2440
-        bool
-        help
-          Selected if there is an S3C2440 (or register compatible) serial
-          low-level implementation needed
-
 config S3C24XX_PLL
         bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)"
         depends on ARM_S3C24XX_CPUFREQ
@@ -258,8 +220,8 @@ config ARCH_BAST
         bool "Simtec Electronics BAST (EB2410ITX)"
         select ISA
         select MACH_BAST_IDE
+        select S3C2410_COMMON_DCLK
         select S3C2410_IOTIMING if ARM_S3C2410_CPUFREQ
-        select S3C24XX_DCLK
         select S3C24XX_SIMTEC_NOR
         select S3C24XX_SIMTEC_PM if PM
         select S3C24XX_SIMTEC_USB
@@ -340,7 +302,7 @@ config MACH_TCT_HAMMER
 config MACH_VR1000
         bool "Thorcom VR1000"
         select MACH_BAST_IDE
-        select S3C24XX_DCLK
+        select S3C2410_COMMON_DCLK
         select S3C24XX_SIMTEC_NOR
         select S3C24XX_SIMTEC_PM if PM
         select S3C24XX_SIMTEC_USB
@@ -519,8 +481,8 @@ comment "S3C2440 Boards"
 config MACH_ANUBIS
         bool "Simtec Electronics ANUBIS"
         select HAVE_PATA_PLATFORM
+        select S3C2410_COMMON_DCLK
         select S3C2440_XTAL_12000000
-        select S3C24XX_DCLK
         select S3C24XX_SIMTEC_PM if PM
         select S3C_DEV_USB_HOST
         help
@@ -558,9 +520,9 @@ config MACH_NEXCODER_2440
 
 config MACH_OSIRIS
         bool "Simtec IM2440D20 (OSIRIS) module"
+        select S3C2410_COMMON_DCLK
         select S3C2410_IOTIMING if ARM_S3C2440_CPUFREQ
         select S3C2440_XTAL_12000000
-        select S3C24XX_DCLK
         select S3C24XX_SIMTEC_PM if PM
         select S3C_DEV_NAND
         select S3C_DEV_USB_HOST
@@ -629,9 +591,9 @@ config MACH_RX1950
         bool "HP iPAQ rx1950"
         select I2C
         select PM_H1940 if PM
+        select S3C2410_COMMON_DCLK
         select S3C2410_IOTIMING if ARM_S3C2440_CPUFREQ
         select S3C2440_XTAL_16934400
-        select S3C24XX_DCLK
         select S3C24XX_PWM
         select S3C_DEV_NAND
         help
@@ -641,12 +603,6 @@ endif	# CPU_S3C2442
 
 if CPU_S3C2443 || CPU_S3C2416
 
-config S3C2443_COMMON
-        bool
-        help
-          Common code for the S3C2443 and similar processors, which includes
-          the S3C2416 and S3C2450.
-
 config S3C2443_DMA
         bool
         help