105 files changed, 1060 insertions, 577 deletions

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 0531da8e5216..3e988f6b45bc 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -1145,7 +1145,7 @@ config DEBUG_UART_8250_FLOW_CONTROL
 
 config DEBUG_UNCOMPRESS
         bool
-        depends on ARCH_MULTIPLATFORM || ARCH_MSM
+        depends on ARCH_MULTIPLATFORM || ARCH_MSM || ARCH_EXYNOS
         default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \
                      (!DEBUG_TEGRA_UART || !ZBOOT_ROM)
         help
@@ -1161,7 +1161,8 @@ config DEBUG_UNCOMPRESS
 
 config UNCOMPRESS_INCLUDE
         string
-        default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM
+        default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \
+                                        ARCH_EXYNOS
         default "mach/uncompress.h"
 
 config EARLY_PRINTK
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 08452e183b57..28b5ec79f339 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -19,6 +19,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <dt-bindings/clock/exynos4.h>
 #include "skeleton.dtsi"
 
 / {
@@ -119,7 +120,7 @@
                         compatible = "samsung,exynos4210-fimc";
                         reg = <0x11800000 0x1000>;
                         interrupts = <0 84 0>;
-                        clocks = <&clock 256>, <&clock 128>;
+                        clocks = <&clock CLK_FIMC0>, <&clock CLK_SCLK_FIMC0>;
                         clock-names = "fimc", "sclk_fimc";
                         samsung,power-domain = <&pd_cam>;
                         samsung,sysreg = <&sys_reg>;
@@ -130,7 +131,7 @@
                         compatible = "samsung,exynos4210-fimc";
                         reg = <0x11810000 0x1000>;
                         interrupts = <0 85 0>;
-                        clocks = <&clock 257>, <&clock 129>;
+                        clocks = <&clock CLK_FIMC1>, <&clock CLK_SCLK_FIMC1>;
                         clock-names = "fimc", "sclk_fimc";
                         samsung,power-domain = <&pd_cam>;
                         samsung,sysreg = <&sys_reg>;
@@ -141,7 +142,7 @@
                         compatible = "samsung,exynos4210-fimc";
                         reg = <0x11820000 0x1000>;
                         interrupts = <0 86 0>;
-                        clocks = <&clock 258>, <&clock 130>;
+                        clocks = <&clock CLK_FIMC2>, <&clock CLK_SCLK_FIMC2>;
                         clock-names = "fimc", "sclk_fimc";
                         samsung,power-domain = <&pd_cam>;
                         samsung,sysreg = <&sys_reg>;
@@ -152,7 +153,7 @@
                         compatible = "samsung,exynos4210-fimc";
                         reg = <0x11830000 0x1000>;
                         interrupts = <0 87 0>;
-                        clocks = <&clock 259>, <&clock 131>;
+                        clocks = <&clock CLK_FIMC3>, <&clock CLK_SCLK_FIMC3>;
                         clock-names = "fimc", "sclk_fimc";
                         samsung,power-domain = <&pd_cam>;
                         samsung,sysreg = <&sys_reg>;
@@ -163,7 +164,7 @@
                         compatible = "samsung,exynos4210-csis";
                         reg = <0x11880000 0x4000>;
                         interrupts = <0 78 0>;
-                        clocks = <&clock 260>, <&clock 134>;
+                        clocks = <&clock CLK_CSIS0>, <&clock CLK_SCLK_CSIS0>;
                         clock-names = "csis", "sclk_csis";
                         bus-width = <4>;
                         samsung,power-domain = <&pd_cam>;
@@ -178,7 +179,7 @@
                         compatible = "samsung,exynos4210-csis";
                         reg = <0x11890000 0x4000>;
                         interrupts = <0 80 0>;
-                        clocks = <&clock 261>, <&clock 135>;
+                        clocks = <&clock CLK_CSIS1>, <&clock CLK_SCLK_CSIS1>;
                         clock-names = "csis", "sclk_csis";
                         bus-width = <2>;
                         samsung,power-domain = <&pd_cam>;
@@ -194,7 +195,7 @@
                 compatible = "samsung,s3c2410-wdt";
                 reg = <0x10060000 0x100>;
                 interrupts = <0 43 0>;
-                clocks = <&clock 345>;
+                clocks = <&clock CLK_WDT>;
                 clock-names = "watchdog";
                 status = "disabled";
         };
@@ -203,7 +204,7 @@
                 compatible = "samsung,s3c6410-rtc";
                 reg = <0x10070000 0x100>;
                 interrupts = <0 44 0>, <0 45 0>;
-                clocks = <&clock 346>;
+                clocks = <&clock CLK_RTC>;
                 clock-names = "rtc";
                 status = "disabled";
         };
@@ -212,7 +213,7 @@
                 compatible = "samsung,s5pv210-keypad";
                 reg = <0x100A0000 0x100>;
                 interrupts = <0 109 0>;
-                clocks = <&clock 347>;
+                clocks = <&clock CLK_KEYIF>;
                 clock-names = "keypad";
                 status = "disabled";
         };
@@ -221,7 +222,7 @@
                 compatible = "samsung,exynos4210-sdhci";
                 reg = <0x12510000 0x100>;
                 interrupts = <0 73 0>;
-                clocks = <&clock 297>, <&clock 145>;
+                clocks = <&clock CLK_SDMMC0>, <&clock CLK_SCLK_MMC0>;
                 clock-names = "hsmmc", "mmc_busclk.2";
                 status = "disabled";
         };
@@ -230,7 +231,7 @@
                 compatible = "samsung,exynos4210-sdhci";
                 reg = <0x12520000 0x100>;
                 interrupts = <0 74 0>;
-                clocks = <&clock 298>, <&clock 146>;
+                clocks = <&clock CLK_SDMMC1>, <&clock CLK_SCLK_MMC1>;
                 clock-names = "hsmmc", "mmc_busclk.2";
                 status = "disabled";
         };
@@ -239,7 +240,7 @@
                 compatible = "samsung,exynos4210-sdhci";
                 reg = <0x12530000 0x100>;
                 interrupts = <0 75 0>;
-                clocks = <&clock 299>, <&clock 147>;
+                clocks = <&clock CLK_SDMMC2>, <&clock CLK_SCLK_MMC2>;
                 clock-names = "hsmmc", "mmc_busclk.2";
                 status = "disabled";
         };
@@ -248,7 +249,7 @@
                 compatible = "samsung,exynos4210-sdhci";
                 reg = <0x12540000 0x100>;
                 interrupts = <0 76 0>;
-                clocks = <&clock 300>, <&clock 148>;
+                clocks = <&clock CLK_SDMMC3>, <&clock CLK_SCLK_MMC3>;
                 clock-names = "hsmmc", "mmc_busclk.2";
                 status = "disabled";
         };
@@ -257,7 +258,7 @@
                 compatible = "samsung,exynos4210-ehci";
                 reg = <0x12580000 0x100>;
                 interrupts = <0 70 0>;
-                clocks = <&clock 304>;
+                clocks = <&clock CLK_USB_HOST>;
                 clock-names = "usbhost";
                 status = "disabled";
         };
@@ -266,7 +267,7 @@
                 compatible = "samsung,exynos4210-ohci";
                 reg = <0x12590000 0x100>;
                 interrupts = <0 70 0>;
-                clocks = <&clock 304>;
+                clocks = <&clock CLK_USB_HOST>;
                 clock-names = "usbhost";
                 status = "disabled";
         };
@@ -276,7 +277,7 @@
                 reg = <0x13400000 0x10000>;
                 interrupts = <0 94 0>;
                 samsung,power-domain = <&pd_mfc>;
-                clocks = <&clock 273>;
+                clocks = <&clock CLK_MFC>;
                 clock-names = "mfc";
                 status = "disabled";
         };
@@ -285,7 +286,7 @@
                 compatible = "samsung,exynos4210-uart";
                 reg = <0x13800000 0x100>;
                 interrupts = <0 52 0>;
-                clocks = <&clock 312>, <&clock 151>;
+                clocks = <&clock CLK_UART0>, <&clock CLK_SCLK_UART0>;
                 clock-names = "uart", "clk_uart_baud0";
                 status = "disabled";
         };
@@ -294,7 +295,7 @@
                 compatible = "samsung,exynos4210-uart";
                 reg = <0x13810000 0x100>;
                 interrupts = <0 53 0>;
-                clocks = <&clock 313>, <&clock 152>;
+                clocks = <&clock CLK_UART1>, <&clock CLK_SCLK_UART1>;
                 clock-names = "uart", "clk_uart_baud0";
                 status = "disabled";
         };
@@ -303,7 +304,7 @@
                 compatible = "samsung,exynos4210-uart";
                 reg = <0x13820000 0x100>;
                 interrupts = <0 54 0>;
-                clocks = <&clock 314>, <&clock 153>;
+                clocks = <&clock CLK_UART2>, <&clock CLK_SCLK_UART2>;
                 clock-names = "uart", "clk_uart_baud0";
                 status = "disabled";
         };
@@ -312,7 +313,7 @@
                 compatible = "samsung,exynos4210-uart";
                 reg = <0x13830000 0x100>;
                 interrupts = <0 55 0>;
-                clocks = <&clock 315>, <&clock 154>;
+                clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>;
                 clock-names = "uart", "clk_uart_baud0";
                 status = "disabled";
         };
@@ -323,7 +324,7 @@
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x13860000 0x100>;
                 interrupts = <0 58 0>;
-                clocks = <&clock 317>;
+                clocks = <&clock CLK_I2C0>;
                 clock-names = "i2c";
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c0_bus>;
@@ -336,7 +337,7 @@
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x13870000 0x100>;
                 interrupts = <0 59 0>;
-                clocks = <&clock 318>;
+                clocks = <&clock CLK_I2C1>;
                 clock-names = "i2c";
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c1_bus>;
@@ -349,7 +350,7 @@
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x13880000 0x100>;
                 interrupts = <0 60 0>;
-                clocks = <&clock 319>;
+                clocks = <&clock CLK_I2C2>;
                 clock-names = "i2c";
                 status = "disabled";
         };
@@ -360,7 +361,7 @@
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x13890000 0x100>;
                 interrupts = <0 61 0>;
-                clocks = <&clock 320>;
+                clocks = <&clock CLK_I2C3>;
                 clock-names = "i2c";
                 status = "disabled";
         };
@@ -371,7 +372,7 @@
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x138A0000 0x100>;
                 interrupts = <0 62 0>;
-                clocks = <&clock 321>;
+                clocks = <&clock CLK_I2C4>;
                 clock-names = "i2c";
                 status = "disabled";
         };
@@ -382,7 +383,7 @@
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x138B0000 0x100>;
                 interrupts = <0 63 0>;
-                clocks = <&clock 322>;
+                clocks = <&clock CLK_I2C5>;
                 clock-names = "i2c";
                 status = "disabled";
         };
@@ -393,7 +394,7 @@
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x138C0000 0x100>;
                 interrupts = <0 64 0>;
-                clocks = <&clock 323>;
+                clocks = <&clock CLK_I2C6>;
                 clock-names = "i2c";
                 status = "disabled";
         };
@@ -404,7 +405,7 @@
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x138D0000 0x100>;
                 interrupts = <0 65 0>;
-                clocks = <&clock 324>;
+                clocks = <&clock CLK_I2C7>;
                 clock-names = "i2c";
                 status = "disabled";
         };
@@ -417,7 +418,7 @@
                 dma-names = "tx", "rx";
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 327>, <&clock 159>;
+                clocks = <&clock CLK_SPI0>, <&clock CLK_SCLK_SPI0>;
                 clock-names = "spi", "spi_busclk0";
                 pinctrl-names = "default";
                 pinctrl-0 = <&spi0_bus>;
@@ -432,7 +433,7 @@
                 dma-names = "tx", "rx";
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 328>, <&clock 160>;
+                clocks = <&clock CLK_SPI1>, <&clock CLK_SCLK_SPI1>;
                 clock-names = "spi", "spi_busclk0";
                 pinctrl-names = "default";
                 pinctrl-0 = <&spi1_bus>;
@@ -447,7 +448,7 @@
                 dma-names = "tx", "rx";
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 329>, <&clock 161>;
+                clocks = <&clock CLK_SPI2>, <&clock CLK_SCLK_SPI2>;
                 clock-names = "spi", "spi_busclk0";
                 pinctrl-names = "default";
                 pinctrl-0 = <&spi2_bus>;
@@ -458,7 +459,7 @@
                 compatible = "samsung,exynos4210-pwm";
                 reg = <0x139D0000 0x1000>;
                 interrupts = <0 37 0>, <0 38 0>, <0 39 0>, <0 40 0>, <0 41 0>;
-                clocks = <&clock 336>;
+                clocks = <&clock CLK_PWM>;
                 clock-names = "timers";
                 #pwm-cells = <2>;
                 status = "disabled";
@@ -475,7 +476,7 @@
                         compatible = "arm,pl330", "arm,primecell";
                         reg = <0x12680000 0x1000>;
                         interrupts = <0 35 0>;
-                        clocks = <&clock 292>;
+                        clocks = <&clock CLK_PDMA0>;
                         clock-names = "apb_pclk";
                         #dma-cells = <1>;
                         #dma-channels = <8>;
@@ -486,7 +487,7 @@
                         compatible = "arm,pl330", "arm,primecell";
                         reg = <0x12690000 0x1000>;
                         interrupts = <0 36 0>;
-                        clocks = <&clock 293>;
+                        clocks = <&clock CLK_PDMA1>;
                         clock-names = "apb_pclk";
                         #dma-cells = <1>;
                         #dma-channels = <8>;
@@ -497,7 +498,7 @@
                         compatible = "arm,pl330", "arm,primecell";
                         reg = <0x12850000 0x1000>;
                         interrupts = <0 34 0>;
-                        clocks = <&clock 279>;
+                        clocks = <&clock CLK_MDMA>;
                         clock-names = "apb_pclk";
                         #dma-cells = <1>;
                         #dma-channels = <8>;
@@ -511,7 +512,7 @@
                 reg = <0x11c00000 0x20000>;
                 interrupt-names = "fifo", "vsync", "lcd_sys";
                 interrupts = <11 0>, <11 1>, <11 2>;
-                clocks = <&clock 140>, <&clock 283>;
+                clocks = <&clock CLK_SCLK_FIMD0>, <&clock CLK_FIMD0>;
                 clock-names = "sclk_fimd", "fimd";
                 samsung,power-domain = <&pd_lcd0>;
                 status = "disabled";
diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index 48ecd7a755ab..cb0e768dc6d4 100644
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -53,7 +53,7 @@
                 reg = <0x10050000 0x800>;
                 interrupt-parent = <&mct_map>;
                 interrupts = <0>, <1>, <2>, <3>, <4>, <5>;
-                clocks = <&clock 3>, <&clock 344>;
+                clocks = <&clock CLK_FIN_PLL>, <&clock CLK_MCT>;
                 clock-names = "fin_pll", "mct";
 
                 mct_map: mct-map {
@@ -109,7 +109,7 @@
                 interrupt-parent = <&combiner>;
                 reg = <0x100C0000 0x100>;
                 interrupts = <2 4>;
-                clocks = <&clock 383>;
+                clocks = <&clock CLK_TMU_APBIF>;
                 clock-names = "tmu_apbif";
                 status = "disabled";
         };
@@ -118,13 +118,14 @@
                 compatible = "samsung,s5pv210-g2d";
                 reg = <0x12800000 0x1000>;
                 interrupts = <0 89 0>;
-                clocks = <&clock 177>, <&clock 277>;
+                clocks = <&clock CLK_SCLK_FIMG2D>, <&clock CLK_G2D>;
                 clock-names = "sclk_fimg2d", "fimg2d";
                 status = "disabled";
         };
 
         camera {
-                clocks = <&clock 132>, <&clock 133>, <&clock 351>, <&clock 352>;
+                clocks = <&clock CLK_SCLK_CAM0>, <&clock CLK_SCLK_CAM1>,
+                         <&clock CLK_PIXELASYNCM0>, <&clock CLK_PIXELASYNCM1>;
                 clock-names = "sclk_cam0", "sclk_cam1", "pxl_async0", "pxl_async1";
 
                 fimc_0: fimc@11800000 {
diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts
index 9804fcb71f8c..12459b01cca3 100644
--- a/arch/arm/boot/dts/exynos4412-odroidx.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx.dts
@@ -251,7 +251,7 @@
                                 buck2_reg: BUCK2 {
                                         regulator-name = "vdd_arm";
                                         regulator-min-microvolt = <900000>;
-                                        regulator-max-microvolt = <1300000>;
+                                        regulator-max-microvolt = <1350000>;
                                         regulator-always-on;
                                         regulator-boot-on;
                                 };
diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index 6bc053924e9e..388f03579661 100644
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -459,8 +459,8 @@
 
                                 buck2_reg: BUCK2 {
                                         regulator-name = "vdd_arm";
-                                        regulator-min-microvolt = <925000>;
-                                        regulator-max-microvolt = <1300000>;
+                                        regulator-min-microvolt = <900000>;
+                                        regulator-max-microvolt = <1350000>;
                                         regulator-always-on;
                                         regulator-boot-on;
                                         op_mode = <1>; /* Normal Mode */
diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi
index 5c412aa14738..e0eb6bb64c34 100644
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@ -47,7 +47,7 @@
                 reg = <0x10050000 0x800>;
                 interrupt-parent = <&mct_map>;
                 interrupts = <0>, <1>, <2>, <3>, <4>;
-                clocks = <&clock 3>, <&clock 344>;
+                clocks = <&clock CLK_FIN_PLL>, <&clock CLK_MCT>;
                 clock-names = "fin_pll", "mct";
 
                 mct_map: mct-map {
@@ -97,13 +97,14 @@
                 compatible = "samsung,exynos4212-g2d";
                 reg = <0x10800000 0x1000>;
                 interrupts = <0 89 0>;
-                clocks = <&clock 177>, <&clock 277>;
+                clocks = <&clock CLK_SCLK_FIMG2D>, <&clock CLK_G2D>;
                 clock-names = "sclk_fimg2d", "fimg2d";
                 status = "disabled";
         };
 
         camera {
-                clocks = <&clock 132>, <&clock 133>, <&clock 351>, <&clock 352>;
+                clocks = <&clock CLK_SCLK_CAM0>, <&clock CLK_SCLK_CAM1>,
+                         <&clock CLK_PIXELASYNCM0>, <&clock CLK_PIXELASYNCM1>;
                 clock-names = "sclk_cam0", "sclk_cam1", "pxl_async0", "pxl_async1";
 
                 fimc_0: fimc@11800000 {
@@ -145,7 +146,7 @@
                         reg = <0x12390000 0x1000>;
                         interrupts = <0 105 0>;
                         samsung,power-domain = <&pd_isp>;
-                        clocks = <&clock 353>;
+                        clocks = <&clock CLK_FIMC_LITE0>;
                         clock-names = "flite";
                         status = "disabled";
                 };
@@ -155,7 +156,7 @@
                         reg = <0x123A0000 0x1000>;
                         interrupts = <0 106 0>;
                         samsung,power-domain = <&pd_isp>;
-                        clocks = <&clock 354>;
+                        clocks = <&clock CLK_FIMC_LITE1>;
                         clock-names = "flite";
                         status = "disabled";
                 };
@@ -165,12 +166,19 @@
                         reg = <0x12000000 0x260000>;
                         interrupts = <0 90 0>, <0 95 0>;
                         samsung,power-domain = <&pd_isp>;
-                        clocks = <&clock 353>, <&clock 354>, <&clock 355>,
-                                <&clock 356>, <&clock 17>, <&clock 357>,
-                                <&clock 358>, <&clock 359>, <&clock 360>,
-                                <&clock 450>,<&clock 451>, <&clock 452>,
-                                <&clock 453>, <&clock 176>, <&clock 13>,
-                                <&clock 454>, <&clock 395>, <&clock 455>;
+                        clocks = <&clock CLK_FIMC_LITE0>,
+                                 <&clock CLK_FIMC_LITE1>, <&clock CLK_PPMUISPX>,
+                                 <&clock CLK_PPMUISPMX>,
+                                 <&clock CLK_MOUT_MPLL_USER_T>,
+                                 <&clock CLK_FIMC_ISP>, <&clock CLK_FIMC_DRC>,
+                                 <&clock CLK_FIMC_FD>, <&clock CLK_MCUISP>,
+                                 <&clock CLK_DIV_ISP0>,<&clock CLK_DIV_ISP1>,
+                                 <&clock CLK_DIV_MCUISP0>,
+                                 <&clock CLK_DIV_MCUISP1>,
+                                 <&clock CLK_SCLK_UART_ISP>,
+                                 <&clock CLK_ACLK200>, <&clock CLK_DIV_ACLK200>,
+                                 <&clock CLK_ACLK400_MCUISP>,
+                                 <&clock CLK_DIV_ACLK400_MCUISP>;
                         clock-names = "lite0", "lite1", "ppmuispx",
                                       "ppmuispmx", "mpll", "isp",
                                       "drc", "fd", "mcuisp",
@@ -190,7 +198,7 @@
                         i2c1_isp: i2c-isp@12140000 {
                                 compatible = "samsung,exynos4212-i2c-isp";
                                 reg = <0x12140000 0x100>;
-                                clocks = <&clock 370>;
+                                clocks = <&clock CLK_I2C1_ISP>;
                                 clock-names = "i2c_isp";
                                 #address-cells = <1>;
                                 #size-cells = <0>;
@@ -205,7 +213,7 @@
                 #address-cells = <1>;
                 #size-cells = <0>;
                 fifo-depth = <0x80>;
-                clocks = <&clock 301>, <&clock 149>;
+                clocks = <&clock CLK_SDMMC4>, <&clock CLK_SCLK_MMC4>;
                 clock-names = "biu", "ciu";
                 status = "disabled";
         };
diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi
index 258dca441f36..79d0608d6dcc 100644
--- a/arch/arm/boot/dts/exynos5.dtsi
+++ b/arch/arm/boot/dts/exynos5.dtsi
@@ -81,13 +81,6 @@
                 status = "disabled";
         };
 
-        watchdog {
-                compatible = "samsung,s3c2410-wdt";
-                reg = <0x101D0000 0x100>;
-                interrupts = <0 42 0>;
-                status = "disabled";
-        };
-
         fimd@14400000 {
                 compatible = "samsung,exynos5250-fimd";
                 interrupt-parent = <&combiner>;
diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index b42e658876e5..56c40783c3eb 100644
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -25,6 +25,10 @@
                 bootargs = "console=ttySAC2,115200";
         };
 
+        rtc@101E0000 {
+                status = "okay";
+        };
+
         codec@11000000 {
                 samsung,mfc-r = <0x43000000 0x800000>;
                 samsung,mfc-l = <0x51000000 0x800000>;
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 3e69837c435c..f76946e97e6a 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -27,6 +27,10 @@
                 bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc";
         };
 
+        rtc@101E0000 {
+                status = "okay";
+        };
+
         i2c@12C60000 {
                 samsung,i2c-sda-delay = <100>;
                 samsung,i2c-max-bus-freq = <20000>;
@@ -36,6 +40,148 @@
                         compatible = "samsung,s524ad0xd1";
                         reg = <0x50>;
                 };
+
+                max77686@09 {
+                        compatible = "maxim,max77686";
+                        reg = <0x09>;
+
+                        voltage-regulators {
+                                ldo1_reg: LDO1 {
+                                        regulator-name = "P1.0V_LDO_OUT1";
+                                        regulator-min-microvolt = <1000000>;
+                                        regulator-max-microvolt = <1000000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo2_reg: LDO2 {
+                                        regulator-name = "P1.2V_LDO_OUT2";
+                                        regulator-min-microvolt = <1200000>;
+                                        regulator-max-microvolt = <1200000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo3_reg: LDO3 {
+                                        regulator-name = "P1.8V_LDO_OUT3";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo4_reg: LDO4 {
+                                        regulator-name = "P2.8V_LDO_OUT4";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <2800000>;
+                                };
+
+                                ldo5_reg: LDO5 {
+                                        regulator-name = "P1.8V_LDO_OUT5";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                };
+
+                                ldo6_reg: LDO6 {
+                                        regulator-name = "P1.1V_LDO_OUT6";
+                                        regulator-min-microvolt = <1100000>;
+                                        regulator-max-microvolt = <1100000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo7_reg: LDO7 {
+                                        regulator-name = "P1.1V_LDO_OUT7";
+                                        regulator-min-microvolt = <1100000>;
+                                        regulator-max-microvolt = <1100000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo8_reg: LDO8 {
+                                        regulator-name = "P1.0V_LDO_OUT8";
+                                        regulator-min-microvolt = <1000000>;
+                                        regulator-max-microvolt = <1000000>;
+                                };
+
+                                ldo10_reg: LDO10 {
+                                        regulator-name = "P1.8V_LDO_OUT10";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                };
+
+                                ldo11_reg: LDO11 {
+                                        regulator-name = "P1.8V_LDO_OUT11";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                };
+
+                                ldo12_reg: LDO12 {
+                                        regulator-name = "P3.0V_LDO_OUT12";
+                                        regulator-min-microvolt = <3000000>;
+                                        regulator-max-microvolt = <3000000>;
+                                };
+
+                                ldo13_reg: LDO13 {
+                                        regulator-name = "P1.8V_LDO_OUT13";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                };
+
+                                ldo14_reg: LDO14 {
+                                        regulator-name = "P1.8V_LDO_OUT14";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                };
+
+                                ldo15_reg: LDO15 {
+                                        regulator-name = "P1.0V_LDO_OUT15";
+                                        regulator-min-microvolt = <1000000>;
+                                        regulator-max-microvolt = <1000000>;
+                                };
+
+                                ldo16_reg: LDO16 {
+                                        regulator-name = "P1.8V_LDO_OUT16";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                };
+
+                                buck1_reg: BUCK1 {
+                                        regulator-name = "vdd_mif";
+                                        regulator-min-microvolt = <950000>;
+                                        regulator-max-microvolt = <1300000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                buck2_reg: BUCK2 {
+                                        regulator-name = "vdd_arm";
+                                        regulator-min-microvolt = <850000>;
+                                        regulator-max-microvolt = <1350000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                buck3_reg: BUCK3 {
+                                        regulator-name = "vdd_int";
+                                        regulator-min-microvolt = <900000>;
+                                        regulator-max-microvolt = <1200000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                buck4_reg: BUCK4 {
+                                        regulator-name = "vdd_g3d";
+                                        regulator-min-microvolt = <850000>;
+                                        regulator-max-microvolt = <1300000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                buck5_reg: BUCK5 {
+                                        regulator-name = "P1.8V_BUCK_OUT5";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+                        };
+                };
         };
 
         vdd: fixed-regulator@0 {
diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
index 7e45eea2d78f..b13bf499f5e2 100644
--- a/arch/arm/boot/dts/exynos5250-snow.dts
+++ b/arch/arm/boot/dts/exynos5250-snow.dts
@@ -20,6 +20,10 @@
                 i2c104 = &i2c_104;
         };
 
+        rtc@101E0000 {
+                status = "okay";
+        };
+
         pinctrl@11400000 {
                 sd3_clk: sd3-clk {
                         samsung,pin-drv = <0>;
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index b7dec41e32af..987cfbe9634b 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -17,6 +17,7 @@
  * published by the Free Software Foundation.
 */
 
+#include <dt-bindings/clock/exynos5250.h>
 #include "exynos5.dtsi"
 #include "exynos5250-pinctrl.dtsi"
 
@@ -90,7 +91,8 @@
                 compatible = "samsung,exynos5250-audss-clock";
                 reg = <0x03810000 0x0C>;
                 #clock-cells = <1>;
-                clocks = <&clock 1>, <&clock 7>, <&clock 138>, <&clock 160>;
+                clocks = <&clock CLK_FIN_PLL>, <&clock CLK_FOUT_EPLL>,
+                         <&clock CLK_SCLK_AUDIO0>, <&clock CLK_DIV_PCM0>;
                 clock-names = "pll_ref", "pll_in", "sclk_audio", "sclk_pcm_in";
         };
 
@@ -115,7 +117,7 @@
                 interrupt-parent = <&mct_map>;
                 interrupts = <0 0>, <1 0>, <2 0>, <3 0>,
                              <4 0>, <5 0>;
-                clocks = <&clock 1>, <&clock 335>;
+                clocks = <&clock CLK_FIN_PLL>, <&clock CLK_MCT>;
                 clock-names = "fin_pll", "mct";
 
                 mct_map: mct-map {
@@ -167,16 +169,25 @@
                 interrupts = <0 47 0>;
         };
 
-        watchdog {
-                clocks = <&clock 336>;
+        pmu_system_controller: system-controller@10040000 {
+                compatible = "samsung,exynos5250-pmu", "syscon";
+                reg = <0x10040000 0x5000>;
+        };
+
+        watchdog@101D0000 {
+                compatible = "samsung,exynos5250-wdt";
+                reg = <0x101D0000 0x100>;
+                interrupts = <0 42 0>;
+                clocks = <&clock CLK_WDT>;
                 clock-names = "watchdog";
+                samsung,syscon-phandle = <&pmu_system_controller>;
         };
 
         g2d@10850000 {
                 compatible = "samsung,exynos5250-g2d";
                 reg = <0x10850000 0x1000>;
                 interrupts = <0 91 0>;
-                clocks = <&clock 345>;
+                clocks = <&clock CLK_G2D>;
                 clock-names = "fimg2d";
         };
 
@@ -185,41 +196,41 @@
                 reg = <0x11000000 0x10000>;
                 interrupts = <0 96 0>;
                 samsung,power-domain = <&pd_mfc>;
-                clocks = <&clock 266>;
+                clocks = <&clock CLK_MFC>;
                 clock-names = "mfc";
         };
 
         rtc@101E0000 {
-                clocks = <&clock 337>;
+                clocks = <&clock CLK_RTC>;
                 clock-names = "rtc";
-                status = "okay";
+                status = "disabled";
         };
 
         tmu@10060000 {
                 compatible = "samsung,exynos5250-tmu";
                 reg = <0x10060000 0x100>;
                 interrupts = <0 65 0>;
-                clocks = <&clock 338>;
+                clocks = <&clock CLK_TMU>;
                 clock-names = "tmu_apbif";
         };
 
         serial@12C00000 {
-                clocks = <&clock 289>, <&clock 146>;
+                clocks = <&clock CLK_UART0>, <&clock CLK_SCLK_UART0>;
                 clock-names = "uart", "clk_uart_baud0";
         };
 
         serial@12C10000 {
-                clocks = <&clock 290>, <&clock 147>;
+                clocks = <&clock CLK_UART1>, <&clock CLK_SCLK_UART1>;
                 clock-names = "uart", "clk_uart_baud0";
         };
 
         serial@12C20000 {
-                clocks = <&clock 291>, <&clock 148>;
+                clocks = <&clock CLK_UART2>, <&clock CLK_SCLK_UART2>;
                 clock-names = "uart", "clk_uart_baud0";
         };
 
         serial@12C30000 {
-                clocks = <&clock 292>, <&clock 149>;
+                clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>;
                 clock-names = "uart", "clk_uart_baud0";
         };
 
@@ -227,7 +238,7 @@
                 compatible = "samsung,exynos5-sata-ahci";
                 reg = <0x122F0000 0x1ff>;
                 interrupts = <0 115 0>;
-                clocks = <&clock 277>, <&clock 143>;
+                clocks = <&clock CLK_SATA>, <&clock CLK_SCLK_SATA>;
                 clock-names = "sata", "sclk_sata";
         };
 
@@ -242,7 +253,7 @@
                 interrupts = <0 56 0>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 294>;
+                clocks = <&clock CLK_I2C0>;
                 clock-names = "i2c";
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c0_bus>;
@@ -255,7 +266,7 @@
                 interrupts = <0 57 0>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 295>;
+                clocks = <&clock CLK_I2C1>;
                 clock-names = "i2c";
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c1_bus>;
@@ -268,7 +279,7 @@
                 interrupts = <0 58 0>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 296>;
+                clocks = <&clock CLK_I2C2>;
                 clock-names = "i2c";
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c2_bus>;
@@ -281,7 +292,7 @@
                 interrupts = <0 59 0>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 297>;
+                clocks = <&clock CLK_I2C3>;
                 clock-names = "i2c";
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c3_bus>;
@@ -294,7 +305,7 @@
                 interrupts = <0 60 0>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 298>;
+                clocks = <&clock CLK_I2C4>;
                 clock-names = "i2c";
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c4_bus>;
@@ -307,7 +318,7 @@
                 interrupts = <0 61 0>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 299>;
+                clocks = <&clock CLK_I2C5>;
                 clock-names = "i2c";
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c5_bus>;
@@ -320,7 +331,7 @@
                 interrupts = <0 62 0>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 300>;
+                clocks = <&clock CLK_I2C6>;
                 clock-names = "i2c";
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c6_bus>;
@@ -333,7 +344,7 @@
                 interrupts = <0 63 0>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 301>;
+                clocks = <&clock CLK_I2C7>;
                 clock-names = "i2c";
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c7_bus>;
@@ -346,7 +357,7 @@
                 interrupts = <0 64 0>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 302>;
+                clocks = <&clock CLK_I2C_HDMI>;
                 clock-names = "i2c";
                 status = "disabled";
         };
@@ -356,7 +367,7 @@
                 reg = <0x121D0000 0x100>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 288>;
+                clocks = <&clock CLK_SATA_PHYI2C>;
                 clock-names = "i2c";
                 status = "disabled";
         };
@@ -371,7 +382,7 @@
                 dma-names = "tx", "rx";
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 304>, <&clock 154>;
+                clocks = <&clock CLK_SPI0>, <&clock CLK_SCLK_SPI0>;
                 clock-names = "spi", "spi_busclk0";
                 pinctrl-names = "default";
                 pinctrl-0 = <&spi0_bus>;
@@ -387,7 +398,7 @@
                 dma-names = "tx", "rx";
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 305>, <&clock 155>;
+                clocks = <&clock CLK_SPI1>, <&clock CLK_SCLK_SPI1>;
                 clock-names = "spi", "spi_busclk0";
                 pinctrl-names = "default";
                 pinctrl-0 = <&spi1_bus>;
@@ -403,7 +414,7 @@
                 dma-names = "tx", "rx";
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 306>, <&clock 156>;
+                clocks = <&clock CLK_SPI2>, <&clock CLK_SCLK_SPI2>;
                 clock-names = "spi", "spi_busclk0";
                 pinctrl-names = "default";
                 pinctrl-0 = <&spi2_bus>;
@@ -415,7 +426,7 @@
                 #address-cells = <1>;
                 #size-cells = <0>;
                 reg = <0x12200000 0x1000>;
-                clocks = <&clock 280>, <&clock 139>;
+                clocks = <&clock CLK_SDMMC0>, <&clock CLK_SCLK_MMC0>;
                 clock-names = "biu", "ciu";
                 fifo-depth = <0x80>;
                 status = "disabled";
@@ -427,7 +438,7 @@
                 #address-cells = <1>;
                 #size-cells = <0>;
                 reg = <0x12210000 0x1000>;
-                clocks = <&clock 281>, <&clock 140>;
+                clocks = <&clock CLK_SDMMC1>, <&clock CLK_SCLK_MMC1>;
                 clock-names = "biu", "ciu";
                 fifo-depth = <0x80>;
                 status = "disabled";
@@ -439,7 +450,7 @@
                 #address-cells = <1>;
                 #size-cells = <0>;
                 reg = <0x12220000 0x1000>;
-                clocks = <&clock 282>, <&clock 141>;
+                clocks = <&clock CLK_SDMMC2>, <&clock CLK_SCLK_MMC2>;
                 clock-names = "biu", "ciu";
                 fifo-depth = <0x80>;
                 status = "disabled";
@@ -451,7 +462,7 @@
                 interrupts = <0 78 0>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 283>, <&clock 142>;
+                clocks = <&clock CLK_SDMMC3>, <&clock CLK_SCLK_MMC3>;
                 clock-names = "biu", "ciu";
                 fifo-depth = <0x80>;
                 status = "disabled";
@@ -481,7 +492,7 @@
                 dmas = <&pdma1 12
                         &pdma1 11>;
                 dma-names = "tx", "rx";
-                clocks = <&clock 307>, <&clock 157>;
+                clocks = <&clock CLK_I2S1>, <&clock CLK_DIV_I2S1>;
                 clock-names = "iis", "i2s_opclk0";
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2s1_bus>;
@@ -494,7 +505,7 @@
                 dmas = <&pdma0 12
                         &pdma0 11>;
                 dma-names = "tx", "rx";
-                clocks = <&clock 308>, <&clock 158>;
+                clocks = <&clock CLK_I2S2>, <&clock CLK_DIV_I2S2>;
                 clock-names = "iis", "i2s_opclk0";
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2s2_bus>;
@@ -502,7 +513,7 @@
 
         usb@12000000 {
                 compatible = "samsung,exynos5250-dwusb3";
-                clocks = <&clock 286>;
+                clocks = <&clock CLK_USB3>;
                 clock-names = "usbdrd30";
                 #address-cells = <1>;
                 #size-cells = <1>;
@@ -519,7 +530,7 @@
         usb3_phy: usbphy@12100000 {
                 compatible = "samsung,exynos5250-usb3phy";
                 reg = <0x12100000 0x100>;
-                clocks = <&clock 1>, <&clock 286>;
+                clocks = <&clock CLK_FIN_PLL>, <&clock CLK_USB3>;
                 clock-names = "ext_xtal", "usbdrd30";
                 #address-cells = <1>;
                 #size-cells = <1>;
@@ -535,7 +546,7 @@
                 reg = <0x12110000 0x100>;
                 interrupts = <0 71 0>;
 
-                clocks = <&clock 285>;
+                clocks = <&clock CLK_USB2>;
                 clock-names = "usbhost";
         };
 
@@ -544,14 +555,14 @@
                 reg = <0x12120000 0x100>;
                 interrupts = <0 71 0>;
 
-                clocks = <&clock 285>;
+                clocks = <&clock CLK_USB2>;
                 clock-names = "usbhost";
         };
 
         usb2_phy: usbphy@12130000 {
                 compatible = "samsung,exynos5250-usb2phy";
                 reg = <0x12130000 0x100>;
-                clocks = <&clock 1>, <&clock 285>;
+                clocks = <&clock CLK_FIN_PLL>, <&clock CLK_USB2>;
                 clock-names = "ext_xtal", "usbhost";
                 #address-cells = <1>;
                 #size-cells = <1>;
@@ -568,7 +579,7 @@
                 reg = <0x12dd0000 0x100>;
                 samsung,pwm-outputs = <0>, <1>, <2>, <3>;
                 #pwm-cells = <3>;
-                clocks = <&clock 311>;
+                clocks = <&clock CLK_PWM>;
                 clock-names = "timers";
         };
 
@@ -583,7 +594,7 @@
                         compatible = "arm,pl330", "arm,primecell";
                         reg = <0x121A0000 0x1000>;
                         interrupts = <0 34 0>;
-                        clocks = <&clock 275>;
+                        clocks = <&clock CLK_PDMA0>;
                         clock-names = "apb_pclk";
                         #dma-cells = <1>;
                         #dma-channels = <8>;
@@ -594,7 +605,7 @@
                         compatible = "arm,pl330", "arm,primecell";
                         reg = <0x121B0000 0x1000>;
                         interrupts = <0 35 0>;
-                        clocks = <&clock 276>;
+                        clocks = <&clock CLK_PDMA1>;
                         clock-names = "apb_pclk";
                         #dma-cells = <1>;
                         #dma-channels = <8>;
@@ -605,7 +616,7 @@
                         compatible = "arm,pl330", "arm,primecell";
                         reg = <0x10800000 0x1000>;
                         interrupts = <0 33 0>;
-                        clocks = <&clock 346>;
+                        clocks = <&clock CLK_MDMA0>;
                         clock-names = "apb_pclk";
                         #dma-cells = <1>;
                         #dma-channels = <8>;
@@ -616,7 +627,7 @@
                         compatible = "arm,pl330", "arm,primecell";
                         reg = <0x11C10000 0x1000>;
                         interrupts = <0 124 0>;
-                        clocks = <&clock 271>;
+                        clocks = <&clock CLK_MDMA1>;
                         clock-names = "apb_pclk";
                         #dma-cells = <1>;
                         #dma-channels = <8>;
@@ -629,7 +640,7 @@
                 reg = <0x13e00000 0x1000>;
                 interrupts = <0 85 0>;
                 samsung,power-domain = <&pd_gsc>;
-                clocks = <&clock 256>;
+                clocks = <&clock CLK_GSCL0>;
                 clock-names = "gscl";
         };
 
@@ -638,7 +649,7 @@
                 reg = <0x13e10000 0x1000>;
                 interrupts = <0 86 0>;
                 samsung,power-domain = <&pd_gsc>;
-                clocks = <&clock 257>;
+                clocks = <&clock CLK_GSCL1>;
                 clock-names = "gscl";
         };
 
@@ -647,7 +658,7 @@
                 reg = <0x13e20000 0x1000>;
                 interrupts = <0 87 0>;
                 samsung,power-domain = <&pd_gsc>;
-                clocks = <&clock 258>;
+                clocks = <&clock CLK_GSCL2>;
                 clock-names = "gscl";
         };
 
@@ -656,7 +667,7 @@
                 reg = <0x13e30000 0x1000>;
                 interrupts = <0 88 0>;
                 samsung,power-domain = <&pd_gsc>;
-                clocks = <&clock 259>;
+                clocks = <&clock CLK_GSCL3>;
                 clock-names = "gscl";
         };
 
@@ -664,8 +675,9 @@
                 compatible = "samsung,exynos4212-hdmi";
                 reg = <0x14530000 0x70000>;
                 interrupts = <0 95 0>;
-                clocks = <&clock 344>, <&clock 136>, <&clock 137>,
-                                <&clock 159>, <&clock 1024>;
+                clocks = <&clock CLK_HDMI>, <&clock CLK_SCLK_HDMI>,
+                         <&clock CLK_SCLK_PIXEL>, <&clock CLK_SCLK_HDMIPHY>,
+                         <&clock CLK_MOUT_HDMI>;
                 clock-names = "hdmi", "sclk_hdmi", "sclk_pixel",
                                 "sclk_hdmiphy", "mout_hdmi";
         };
@@ -674,7 +686,7 @@
                 compatible = "samsung,exynos5250-mixer";
                 reg = <0x14450000 0x10000>;
                 interrupts = <0 94 0>;
-                clocks = <&clock 343>, <&clock 136>;
+                clocks = <&clock CLK_MIXER>, <&clock CLK_SCLK_HDMI>;
                 clock-names = "mixer", "sclk_hdmi";
         };
 
@@ -685,14 +697,14 @@
         };
 
         dp-controller@145B0000 {
-                clocks = <&clock 342>;
+                clocks = <&clock CLK_DP>;
                 clock-names = "dp";
                 phys = <&dp_phy>;
                 phy-names = "dp";
         };
 
         fimd@14400000 {
-                clocks = <&clock 133>, <&clock 339>;
+                clocks = <&clock CLK_SCLK_FIMD1>, <&clock CLK_FIMD1>;
                 clock-names = "sclk_fimd", "fimd";
         };
 
@@ -700,7 +712,7 @@
                 compatible = "samsung,exynos-adc-v1";
                 reg = <0x12D10000 0x100>, <0x10040718 0x4>;
                 interrupts = <0 106 0>;
-                clocks = <&clock 303>;
+                clocks = <&clock CLK_ADC>;
                 clock-names = "adc";
                 #io-channel-cells = <1>;
                 io-channel-ranges;
diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
index 7340745ff979..f509e8fc290f 100644
--- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
+++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
@@ -11,6 +11,8 @@
 
 /dts-v1/;
 #include "exynos5420.dtsi"
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/input/input.h>
 
 / {
         model = "Insignal Arndale Octa evaluation board based on EXYNOS5420";
@@ -31,6 +33,10 @@
                 };
         };
 
+        rtc@101E0000 {
+                status = "okay";
+        };
+
         mmc@12200000 {
                 status = "okay";
                 broken-cd;
@@ -41,6 +47,7 @@
                 samsung,dw-mshc-ddr-timing = <0 2>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
+                vmmc-supply = <&ldo10_reg>;
 
                 slot@0 {
                         reg = <0>;
@@ -57,10 +64,301 @@
                 samsung,dw-mshc-ddr-timing = <1 2>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
+                vmmc-supply = <&ldo10_reg>;
 
                 slot@0 {
                         reg = <0>;
                         bus-width = <4>;
                 };
         };
+
+        hsi2c_4: i2c@12CA0000 {
+                status = "okay";
+
+                s2mps11_pmic@66 {
+                        compatible = "samsung,s2mps11-pmic";
+                        reg = <0x66>;
+                        s2mps11,buck2-ramp-delay = <12>;
+                        s2mps11,buck34-ramp-delay = <12>;
+                        s2mps11,buck16-ramp-delay = <12>;
+                        s2mps11,buck6-ramp-enable = <1>;
+                        s2mps11,buck2-ramp-enable = <1>;
+                        s2mps11,buck3-ramp-enable = <1>;
+                        s2mps11,buck4-ramp-enable = <1>;
+
+                        interrupt-parent = <&gpx3>;
+                        interrupts = <2 IRQ_TYPE_LEVEL_HIGH>;
+
+                        s2mps11_osc: clocks {
+                                #clock-cells = <1>;
+                                clock-output-names = "s2mps11_ap",
+                                                "s2mps11_cp", "s2mps11_bt";
+                        };
+
+                        regulators {
+                                ldo1_reg: LDO1 {
+                                        regulator-name = "PVDD_ALIVE_1V0";
+                                        regulator-min-microvolt = <1000000>;
+                                        regulator-max-microvolt = <1000000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo2_reg: LDO2 {
+                                        regulator-name = "PVDD_APIO_1V8";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                };
+
+                                ldo3_reg: LDO3 {
+                                        regulator-name = "PVDD_APIO_MMCON_1V8";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                };
+
+                                ldo4_reg: LDO4 {
+                                        regulator-name = "PVDD_ADC_1V8";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                };
+
+                                ldo5_reg: LDO5 {
+                                        regulator-name = "PVDD_PLL_1V8";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo6_reg: LDO6 {
+                                        regulator-name = "PVDD_ANAIP_1V0";
+                                        regulator-min-microvolt = <1000000>;
+                                        regulator-max-microvolt = <1000000>;
+                                };
+
+                                ldo7_reg: LDO7 {
+                                        regulator-name = "PVDD_ANAIP_1V8";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                };
+
+                                ldo8_reg: LDO8 {
+                                        regulator-name = "PVDD_ABB_1V8";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                };
+
+                                ldo9_reg: LDO9 {
+                                        regulator-name = "PVDD_USB_3V3";
+                                        regulator-min-microvolt = <3000000>;
+                                        regulator-max-microvolt = <3000000>;
+                                };
+
+                                ldo10_reg: LDO10 {
+                                        regulator-name = "PVDD_PRE_1V8";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo11_reg: LDO11 {
+                                        regulator-name = "PVDD_USB_1V0";
+                                        regulator-min-microvolt = <1000000>;
+                                        regulator-max-microvolt = <1000000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo12_reg: LDO12 {
+                                        regulator-name = "PVDD_HSIC_1V8";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                };
+
+                                ldo13_reg: LDO13 {
+                                        regulator-name = "PVDD_APIO_MMCOFF_2V8";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <2800000>;
+                                };
+
+                                ldo15_reg: LDO15 {
+                                        regulator-name = "PVDD_PERI_2V8";
+                                        regulator-min-microvolt = <3300000>;
+                                        regulator-max-microvolt = <3300000>;
+                                };
+
+                                ldo16_reg: LDO16 {
+                                        regulator-name = "PVDD_PERI_3V3";
+                                        regulator-min-microvolt = <2200000>;
+                                        regulator-max-microvolt = <2200000>;
+                                };
+
+                                ldo18_reg: LDO18 {
+                                        regulator-name = "PVDD_EMMC_1V8";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                };
+
+                                ldo19_reg: LDO19 {
+                                        regulator-name = "PVDD_TFLASH_2V8";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <2800000>;
+                                };
+
+                                ldo20_reg: LDO20 {
+                                        regulator-name = "PVDD_BTWIFI_1V8";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                };
+
+                                ldo21_reg: LDO21 {
+                                        regulator-name = "PVDD_CAM1IO_1V8";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                };
+
+                                ldo23_reg: LDO23 {
+                                        regulator-name = "PVDD_MIFS_1V1";
+                                        regulator-min-microvolt = <1200000>;
+                                        regulator-max-microvolt = <1200000>;
+                                };
+
+                                ldo24_reg: LDO24 {
+                                        regulator-name = "PVDD_CAM1_AVDD_2V8";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <2800000>;
+                                };
+
+                                ldo26_reg: LDO26 {
+                                        regulator-name = "PVDD_CAM0_AF_2V8";
+                                        regulator-min-microvolt = <3000000>;
+                                        regulator-max-microvolt = <3000000>;
+                                };
+
+                                ldo27_reg: LDO27 {
+                                        regulator-name = "PVDD_G3DS_1V0";
+                                        regulator-min-microvolt = <1200000>;
+                                        regulator-max-microvolt = <1200000>;
+                                };
+
+                                ldo28_reg: LDO28 {
+                                        regulator-name = "PVDD_TSP_3V3";
+                                        regulator-min-microvolt = <3300000>;
+                                        regulator-max-microvolt = <3300000>;
+                                };
+
+                                ldo29_reg: LDO29 {
+                                        regulator-name = "PVDD_AUDIO_1V8";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                };
+
+                                ldo31_reg: LDO31 {
+                                        regulator-name = "PVDD_PERI_1V8";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                };
+
+                                ldo32_reg: LDO32 {
+                                        regulator-name = "PVDD_LCD_1V8";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                };
+
+                                ldo33_reg: LDO33 {
+                                        regulator-name = "PVDD_CAM0IO_1V8";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                };
+
+                                ldo35_reg: LDO35 {
+                                        regulator-name = "PVDD_CAM0_DVDD_1V2";
+                                        regulator-min-microvolt = <1200000>;
+                                        regulator-max-microvolt = <1200000>;
+                                };
+
+                                ldo38_reg: LDO38 {
+                                        regulator-name = "PVDD_CAM0_AVDD_2V8";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <2800000>;
+                                };
+
+                                buck1_reg: BUCK1 {
+                                        regulator-name = "PVDD_MIF_1V1";
+                                        regulator-min-microvolt = <800000>;
+                                        regulator-max-microvolt = <1100000>;
+                                        regulator-always-on;
+                                };
+
+                                buck2_reg: BUCK2 {
+                                        regulator-name = "vdd_arm";
+                                        regulator-min-microvolt = <800000>;
+                                        regulator-max-microvolt = <1000000>;
+                                        regulator-always-on;
+                                };
+
+                                buck3_reg: BUCK3 {
+                                        regulator-name = "PVDD_INT_1V0";
+                                        regulator-min-microvolt = <800000>;
+                                        regulator-max-microvolt = <1000000>;
+                                        regulator-always-on;
+                                };
+
+                                buck4_reg: BUCK4 {
+                                        regulator-name = "PVDD_G3D_1V0";
+                                        regulator-min-microvolt = <800000>;
+                                        regulator-max-microvolt = <1000000>;
+                                };
+
+                                buck5_reg: BUCK5 {
+                                        regulator-name = "PVDD_LPDDR3_1V2";
+                                        regulator-min-microvolt = <800000>;
+                                        regulator-max-microvolt = <1200000>;
+                                        regulator-always-on;
+                                };
+
+                                buck6_reg: BUCK6 {
+                                        regulator-name = "PVDD_KFC_1V0";
+                                        regulator-min-microvolt = <800000>;
+                                        regulator-max-microvolt = <1000000>;
+                                        regulator-always-on;
+                                };
+
+                                buck7_reg: BUCK7 {
+                                        regulator-name = "VIN_LLDO_1V4";
+                                        regulator-min-microvolt = <800000>;
+                                        regulator-max-microvolt = <1400000>;
+                                        regulator-always-on;
+                                };
+
+                                buck8_reg: BUCK8 {
+                                        regulator-name = "VIN_MLDO_2V0";
+                                        regulator-min-microvolt = <800000>;
+                                        regulator-max-microvolt = <2000000>;
+                                        regulator-always-on;
+                                };
+
+                                buck9_reg: BUCK9 {
+                                        regulator-name = "VIN_HLDO_3V5";
+                                        regulator-min-microvolt = <3000000>;
+                                        regulator-max-microvolt = <3500000>;
+                                        regulator-always-on;
+                                };
+
+                                buck10_reg: BUCK10 {
+                                        regulator-name = "PVDD_EMMCF_2V8";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <2800000>;
+                                };
+                        };
+                };
+        };
+
+        gpio_keys {
+                compatible = "gpio-keys";
+
+                wakeup {
+                        label = "SW-TACT1";
+                        gpios = <&gpx2 7 1>;
+                        linux,code = <KEY_WAKEUP>;
+                        gpio-key,wakeup;
+                };
+        };
 };
diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts
index fb5a1e25c632..ae1ee0470fca 100644
--- a/arch/arm/boot/dts/exynos5420-smdk5420.dts
+++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts
@@ -31,6 +31,43 @@
                 };
         };
 
+        regulators {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                vdd: fixed-regulator@0 {
+                        compatible = "regulator-fixed";
+                        reg = <0>;
+                        regulator-name = "vdd-supply";
+                        regulator-min-microvolt = <1800000>;
+                        regulator-max-microvolt = <1800000>;
+                        regulator-always-on;
+                };
+
+                dbvdd: fixed-regulator@1 {
+                        compatible = "regulator-fixed";
+                        reg = <1>;
+                        regulator-name = "dbvdd-supply";
+                        regulator-min-microvolt = <3300000>;
+                        regulator-max-microvolt = <3300000>;
+                        regulator-always-on;
+                };
+
+                spkvdd: fixed-regulator@2 {
+                        compatible = "regulator-fixed";
+                        reg = <2>;
+                        regulator-name = "spkvdd-supply";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        regulator-always-on;
+                };
+        };
+
+        rtc@101E0000 {
+                status = "okay";
+        };
+
         mmc@12200000 {
                 status = "okay";
                 broken-cd;
@@ -120,4 +157,220 @@
                         reg = <0x50>;
                 };
         };
+
+        hsi2c_4: i2c@12CA0000 {
+                status = "okay";
+
+                s2mps11_pmic@66 {
+                        compatible = "samsung,s2mps11-pmic";
+                        reg = <0x66>;
+                        s2mps11,buck2-ramp-delay = <12>;
+                        s2mps11,buck34-ramp-delay = <12>;
+                        s2mps11,buck16-ramp-delay = <12>;
+                        s2mps11,buck6-ramp-enable = <1>;
+                        s2mps11,buck2-ramp-enable = <1>;
+                        s2mps11,buck3-ramp-enable = <1>;
+                        s2mps11,buck4-ramp-enable = <1>;
+
+                        s2mps11_osc: clocks {
+                                #clock-cells = <1>;
+                                clock-output-names = "s2mps11_ap",
+                                                "s2mps11_cp", "s2mps11_bt";
+                        };
+
+                        regulators {
+                                ldo1_reg: LDO1 {
+                                        regulator-name = "vdd_ldo1";
+                                        regulator-min-microvolt = <1000000>;
+                                        regulator-max-microvolt = <1000000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo3_reg: LDO3 {
+                                        regulator-name = "vdd_ldo3";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo5_reg: LDO5 {
+                                        regulator-name = "vdd_ldo5";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo6_reg: LDO6 {
+                                        regulator-name = "vdd_ldo6";
+                                        regulator-min-microvolt = <1000000>;
+                                        regulator-max-microvolt = <1000000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo7_reg: LDO7 {
+                                        regulator-name = "vdd_ldo7";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo8_reg: LDO8 {
+                                        regulator-name = "vdd_ldo8";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo9_reg: LDO9 {
+                                        regulator-name = "vdd_ldo9";
+                                        regulator-min-microvolt = <3000000>;
+                                        regulator-max-microvolt = <3000000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo10_reg: LDO10 {
+                                        regulator-name = "vdd_ldo10";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo11_reg: LDO11 {
+                                        regulator-name = "vdd_ldo11";
+                                        regulator-min-microvolt = <1000000>;
+                                        regulator-max-microvolt = <1000000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo12_reg: LDO12 {
+                                        regulator-name = "vdd_ldo12";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo13_reg: LDO13 {
+                                        regulator-name = "vdd_ldo13";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <2800000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo15_reg: LDO15 {
+                                        regulator-name = "vdd_ldo15";
+                                        regulator-min-microvolt = <3100000>;
+                                        regulator-max-microvolt = <3100000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo16_reg: LDO16 {
+                                        regulator-name = "vdd_ldo16";
+                                        regulator-min-microvolt = <2200000>;
+                                        regulator-max-microvolt = <2200000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo17_reg: LDO17 {
+                                        regulator-name = "tsp_avdd";
+                                        regulator-min-microvolt = <3300000>;
+                                        regulator-max-microvolt = <3300000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo19_reg: LDO19 {
+                                        regulator-name = "vdd_sd";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <2800000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo24_reg: LDO24 {
+                                        regulator-name = "tsp_io";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <2800000>;
+                                        regulator-always-on;
+                                };
+
+                                buck1_reg: BUCK1 {
+                                        regulator-name = "vdd_mif";
+                                        regulator-min-microvolt = <800000>;
+                                        regulator-max-microvolt = <1300000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                buck2_reg: BUCK2 {
+                                        regulator-name = "vdd_arm";
+                                        regulator-min-microvolt = <800000>;
+                                        regulator-max-microvolt = <1500000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                buck3_reg: BUCK3 {
+                                        regulator-name = "vdd_int";
+                                        regulator-min-microvolt = <800000>;
+                                        regulator-max-microvolt = <1400000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                buck4_reg: BUCK4 {
+                                        regulator-name = "vdd_g3d";
+                                        regulator-min-microvolt = <800000>;
+                                        regulator-max-microvolt = <1400000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                buck5_reg: BUCK5 {
+                                        regulator-name = "vdd_mem";
+                                        regulator-min-microvolt = <800000>;
+                                        regulator-max-microvolt = <1400000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                buck6_reg: BUCK6 {
+                                        regulator-name = "vdd_kfc";
+                                        regulator-min-microvolt = <800000>;
+                                        regulator-max-microvolt = <1500000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                buck7_reg: BUCK7 {
+                                        regulator-name = "vdd_1.0v_ldo";
+                                        regulator-min-microvolt = <800000>;
+                                        regulator-max-microvolt = <1500000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                buck8_reg: BUCK8 {
+                                        regulator-name = "vdd_1.8v_ldo";
+                                        regulator-min-microvolt = <800000>;
+                                        regulator-max-microvolt = <1500000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                buck9_reg: BUCK9 {
+                                        regulator-name = "vdd_2.8v_ldo";
+                                        regulator-min-microvolt = <3000000>;
+                                        regulator-max-microvolt = <3750000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                buck10_reg: BUCK10 {
+                                        regulator-name = "vdd_vmem";
+                                        regulator-min-microvolt = <2850000>;
+                                        regulator-max-microvolt = <2850000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+                        };
+                };
+        };
 };
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 8db792b26f79..e3329afbd8c4 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -13,6 +13,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <dt-bindings/clock/exynos5420.h>
 #include "exynos5.dtsi"
 #include "exynos5420-pinctrl.dtsi"
 
@@ -119,7 +120,8 @@
                 compatible = "samsung,exynos5420-audss-clock";
                 reg = <0x03810000 0x0C>;
                 #clock-cells = <1>;
-                clocks = <&clock 1>, <&clock 5>, <&clock 148>, <&clock 149>;
+                clocks = <&clock CLK_FIN_PLL>, <&clock CLK_FOUT_EPLL>,
+                         <&clock CLK_SCLK_MAUDIO0>, <&clock CLK_SCLK_MAUPCM0>;
                 clock-names = "pll_ref", "pll_in", "sclk_audio", "sclk_pcm_in";
         };
 
@@ -127,7 +129,7 @@
                 compatible = "samsung,mfc-v7";
                 reg = <0x11000000 0x10000>;
                 interrupts = <0 96 0>;
-                clocks = <&clock 401>;
+                clocks = <&clock CLK_MFC>;
                 clock-names = "mfc";
         };
 
@@ -137,7 +139,7 @@
                 #address-cells = <1>;
                 #size-cells = <0>;
                 reg = <0x12200000 0x2000>;
-                clocks = <&clock 351>, <&clock 132>;
+                clocks = <&clock CLK_MMC0>, <&clock CLK_SCLK_MMC0>;
                 clock-names = "biu", "ciu";
                 fifo-depth = <0x40>;
                 status = "disabled";
@@ -149,7 +151,7 @@
                 #address-cells = <1>;
                 #size-cells = <0>;
                 reg = <0x12210000 0x2000>;
-                clocks = <&clock 352>, <&clock 133>;
+                clocks = <&clock CLK_MMC1>, <&clock CLK_SCLK_MMC1>;
                 clock-names = "biu", "ciu";
                 fifo-depth = <0x40>;
                 status = "disabled";
@@ -161,7 +163,7 @@
                 #address-cells = <1>;
                 #size-cells = <0>;
                 reg = <0x12220000 0x1000>;
-                clocks = <&clock 353>, <&clock 134>;
+                clocks = <&clock CLK_MMC2>, <&clock CLK_SCLK_MMC2>;
                 clock-names = "biu", "ciu";
                 fifo-depth = <0x40>;
                 status = "disabled";
@@ -175,7 +177,7 @@
                 interrupt-parent = <&mct_map>;
                 interrupts = <0>, <1>, <2>, <3>, <4>, <5>, <6>, <7>,
                                 <8>, <9>, <10>, <11>;
-                clocks = <&clock 1>, <&clock 315>;
+                clocks = <&clock CLK_FIN_PLL>, <&clock CLK_MCT>;
                 clock-names = "fin_pll", "mct";
 
                 mct_map: mct-map {
@@ -269,9 +271,9 @@
         };
 
         rtc@101E0000 {
-                clocks = <&clock 317>;
+                clocks = <&clock CLK_RTC>;
                 clock-names = "rtc";
-                status = "okay";
+                status = "disabled";
         };
 
         amba {
@@ -281,11 +283,22 @@
                 interrupt-parent = <&gic>;
                 ranges;
 
+                adma: adma@03880000 {
+                        compatible = "arm,pl330", "arm,primecell";
+                        reg = <0x03880000 0x1000>;
+                        interrupts = <0 110 0>;
+                        clocks = <&clock_audss EXYNOS_ADMA>;
+                        clock-names = "apb_pclk";
+                        #dma-cells = <1>;
+                        #dma-channels = <6>;
+                        #dma-requests = <16>;
+                };
+
                 pdma0: pdma@121A0000 {
                         compatible = "arm,pl330", "arm,primecell";
                         reg = <0x121A0000 0x1000>;
                         interrupts = <0 34 0>;
-                        clocks = <&clock 362>;
+                        clocks = <&clock CLK_PDMA0>;
                         clock-names = "apb_pclk";
                         #dma-cells = <1>;
                         #dma-channels = <8>;
@@ -296,7 +309,7 @@
                         compatible = "arm,pl330", "arm,primecell";
                         reg = <0x121B0000 0x1000>;
                         interrupts = <0 35 0>;
-                        clocks = <&clock 363>;
+                        clocks = <&clock CLK_PDMA1>;
                         clock-names = "apb_pclk";
                         #dma-cells = <1>;
                         #dma-channels = <8>;
@@ -307,7 +320,7 @@
                         compatible = "arm,pl330", "arm,primecell";
                         reg = <0x10800000 0x1000>;
                         interrupts = <0 33 0>;
-                        clocks = <&clock 473>;
+                        clocks = <&clock CLK_MDMA0>;
                         clock-names = "apb_pclk";
                         #dma-cells = <1>;
                         #dma-channels = <8>;
@@ -318,7 +331,7 @@
                         compatible = "arm,pl330", "arm,primecell";
                         reg = <0x11C10000 0x1000>;
                         interrupts = <0 124 0>;
-                        clocks = <&clock 442>;
+                        clocks = <&clock CLK_MDMA1>;
                         clock-names = "apb_pclk";
                         #dma-cells = <1>;
                         #dma-channels = <8>;
@@ -326,6 +339,49 @@
                 };
         };
 
+        i2s0: i2s@03830000 {
+                compatible = "samsung,exynos5420-i2s";
+                reg = <0x03830000 0x100>;
+                dmas = <&adma 0
+                        &adma 2
+                        &adma 1>;
+                dma-names = "tx", "rx", "tx-sec";
+                clocks = <&clock_audss EXYNOS_I2S_BUS>,
+                        <&clock_audss EXYNOS_I2S_BUS>,
+                        <&clock_audss EXYNOS_SCLK_I2S>;
+                clock-names = "iis", "i2s_opclk0", "i2s_opclk1";
+                samsung,idma-addr = <0x03000000>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&i2s0_bus>;
+                status = "disabled";
+        };
+
+        i2s1: i2s@12D60000 {
+                compatible = "samsung,exynos5420-i2s";
+                reg = <0x12D60000 0x100>;
+                dmas = <&pdma1 12
+                        &pdma1 11>;
+                dma-names = "tx", "rx";
+                clocks = <&clock CLK_I2S1>, <&clock CLK_SCLK_I2S1>;
+                clock-names = "iis", "i2s_opclk0";
+                pinctrl-names = "default";
+                pinctrl-0 = <&i2s1_bus>;
+                status = "disabled";
+        };
+
+        i2s2: i2s@12D70000 {
+                compatible = "samsung,exynos5420-i2s";
+                reg = <0x12D70000 0x100>;
+                dmas = <&pdma0 12
+                        &pdma0 11>;
+                dma-names = "tx", "rx";
+                clocks = <&clock CLK_I2S2>, <&clock CLK_SCLK_I2S2>;
+                clock-names = "iis", "i2s_opclk0";
+                pinctrl-names = "default";
+                pinctrl-0 = <&i2s2_bus>;
+                status = "disabled";
+        };
+
         spi_0: spi@12d20000 {
                 compatible = "samsung,exynos4210-spi";
                 reg = <0x12d20000 0x100>;
@@ -337,7 +393,7 @@
                 #size-cells = <0>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&spi0_bus>;
-                clocks = <&clock 271>, <&clock 135>;
+                clocks = <&clock CLK_SPI0>, <&clock CLK_SCLK_SPI0>;
                 clock-names = "spi", "spi_busclk0";
                 status = "disabled";
         };
@@ -353,7 +409,7 @@
                 #size-cells = <0>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&spi1_bus>;
-                clocks = <&clock 272>, <&clock 136>;
+                clocks = <&clock CLK_SPI1>, <&clock CLK_SCLK_SPI1>;
                 clock-names = "spi", "spi_busclk0";
                 status = "disabled";
         };
@@ -369,28 +425,28 @@
                 #size-cells = <0>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&spi2_bus>;
-                clocks = <&clock 273>, <&clock 137>;
+                clocks = <&clock CLK_SPI2>, <&clock CLK_SCLK_SPI2>;
                 clock-names = "spi", "spi_busclk0";
                 status = "disabled";
         };
 
         serial@12C00000 {
-                clocks = <&clock 257>, <&clock 128>;
+                clocks = <&clock CLK_UART0>, <&clock CLK_SCLK_UART0>;
                 clock-names = "uart", "clk_uart_baud0";
         };
 
         serial@12C10000 {
-                clocks = <&clock 258>, <&clock 129>;
+                clocks = <&clock CLK_UART1>, <&clock CLK_SCLK_UART1>;
                 clock-names = "uart", "clk_uart_baud0";
         };
 
         serial@12C20000 {
-                clocks = <&clock 259>, <&clock 130>;
+                clocks = <&clock CLK_UART2>, <&clock CLK_SCLK_UART2>;
                 clock-names = "uart", "clk_uart_baud0";
         };
 
         serial@12C30000 {
-                clocks = <&clock 260>, <&clock 131>;
+                clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>;
                 clock-names = "uart", "clk_uart_baud0";
         };
 
@@ -399,7 +455,7 @@
                 reg = <0x12dd0000 0x100>;
                 samsung,pwm-outputs = <0>, <1>, <2>, <3>;
                 #pwm-cells = <3>;
-                clocks = <&clock 279>;
+                clocks = <&clock CLK_PWM>;
                 clock-names = "timers";
         };
 
@@ -410,7 +466,7 @@
         };
 
         dp-controller@145B0000 {
-                clocks = <&clock 412>;
+                clocks = <&clock CLK_DP1>;
                 clock-names = "dp";
                 phys = <&dp_phy>;
                 phy-names = "dp";
@@ -418,7 +474,7 @@
 
         fimd@14400000 {
                 samsung,power-domain = <&disp_pd>;
-                clocks = <&clock 147>, <&clock 421>;
+                clocks = <&clock CLK_SCLK_FIMD1>, <&clock CLK_FIMD1>;
                 clock-names = "sclk_fimd", "fimd";
         };
 
@@ -426,7 +482,7 @@
                 compatible = "samsung,exynos-adc-v2";
                 reg = <0x12D10000 0x100>, <0x10040720 0x4>;
                 interrupts = <0 106 0>;
-                clocks = <&clock 270>;
+                clocks = <&clock CLK_TSADC>;
                 clock-names = "adc";
                 #io-channel-cells = <1>;
                 io-channel-ranges;
@@ -439,7 +495,7 @@
                 interrupts = <0 56 0>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 261>;
+                clocks = <&clock CLK_I2C0>;
                 clock-names = "i2c";
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c0_bus>;
@@ -452,7 +508,7 @@
                 interrupts = <0 57 0>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 262>;
+                clocks = <&clock CLK_I2C1>;
                 clock-names = "i2c";
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c1_bus>;
@@ -465,7 +521,7 @@
                 interrupts = <0 58 0>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 263>;
+                clocks = <&clock CLK_I2C2>;
                 clock-names = "i2c";
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c2_bus>;
@@ -478,7 +534,7 @@
                 interrupts = <0 59 0>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 264>;
+                clocks = <&clock CLK_I2C3>;
                 clock-names = "i2c";
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c3_bus>;
@@ -493,7 +549,7 @@
                 #size-cells = <0>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c4_hs_bus>;
-                clocks = <&clock 265>;
+                clocks = <&clock CLK_I2C4>;
                 clock-names = "hsi2c";
                 status = "disabled";
         };
@@ -506,7 +562,7 @@
                 #size-cells = <0>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c5_hs_bus>;
-                clocks = <&clock 266>;
+                clocks = <&clock CLK_I2C5>;
                 clock-names = "hsi2c";
                 status = "disabled";
         };
@@ -519,7 +575,7 @@
                 #size-cells = <0>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c6_hs_bus>;
-                clocks = <&clock 267>;
+                clocks = <&clock CLK_I2C6>;
                 clock-names = "hsi2c";
                 status = "disabled";
         };
@@ -532,7 +588,7 @@
                 #size-cells = <0>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c7_hs_bus>;
-                clocks = <&clock 268>;
+                clocks = <&clock CLK_I2C7>;
                 clock-names = "hsi2c";
                 status = "disabled";
         };
@@ -545,7 +601,7 @@
                 #size-cells = <0>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c8_hs_bus>;
-                clocks = <&clock 281>;
+                clocks = <&clock CLK_I2C8>;
                 clock-names = "hsi2c";
                 status = "disabled";
         };
@@ -558,7 +614,7 @@
                 #size-cells = <0>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c9_hs_bus>;
-                clocks = <&clock 282>;
+                clocks = <&clock CLK_I2C9>;
                 clock-names = "hsi2c";
                 status = "disabled";
         };
@@ -571,7 +627,7 @@
                 #size-cells = <0>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c10_hs_bus>;
-                clocks = <&clock 283>;
+                clocks = <&clock CLK_I2C10>;
                 clock-names = "hsi2c";
                 status = "disabled";
         };
@@ -580,8 +636,9 @@
                 compatible = "samsung,exynos4212-hdmi";
                 reg = <0x14530000 0x70000>;
                 interrupts = <0 95 0>;
-                clocks = <&clock 413>, <&clock 143>, <&clock 768>,
-                        <&clock 158>, <&clock 640>;
+                clocks = <&clock CLK_HDMI>, <&clock CLK_SCLK_HDMI>,
+                         <&clock CLK_DOUT_PIXEL>, <&clock CLK_SCLK_HDMIPHY>,
+                         <&clock CLK_MOUT_HDMI>;
                 clock-names = "hdmi", "sclk_hdmi", "sclk_pixel",
                         "sclk_hdmiphy", "mout_hdmi";
                 status = "disabled";
@@ -591,7 +648,7 @@
                 compatible = "samsung,exynos5420-mixer";
                 reg = <0x14450000 0x10000>;
                 interrupts = <0 94 0>;
-                clocks = <&clock 431>, <&clock 143>;
+                clocks = <&clock CLK_MIXER>, <&clock CLK_SCLK_HDMI>;
                 clock-names = "mixer", "sclk_hdmi";
         };
 
@@ -599,7 +656,7 @@
                 compatible = "samsung,exynos5-gsc";
                 reg = <0x13e00000 0x1000>;
                 interrupts = <0 85 0>;
-                clocks = <&clock 465>;
+                clocks = <&clock CLK_GSCL0>;
                 clock-names = "gscl";
                 samsung,power-domain = <&gsc_pd>;
         };
@@ -608,16 +665,21 @@
                 compatible = "samsung,exynos5-gsc";
                 reg = <0x13e10000 0x1000>;
                 interrupts = <0 86 0>;
-                clocks = <&clock 466>;
+                clocks = <&clock CLK_GSCL1>;
                 clock-names = "gscl";
                 samsung,power-domain = <&gsc_pd>;
         };
 
+        pmu_system_controller: system-controller@10040000 {
+                compatible = "samsung,exynos5420-pmu", "syscon";
+                reg = <0x10040000 0x5000>;
+        };
+
         tmu_cpu0: tmu@10060000 {
                 compatible = "samsung,exynos5420-tmu";
                 reg = <0x10060000 0x100>;
                 interrupts = <0 65 0>;
-                clocks = <&clock 318>;
+                clocks = <&clock CLK_TMU>;
                 clock-names = "tmu_apbif";
         };
 
@@ -625,7 +687,7 @@
                 compatible = "samsung,exynos5420-tmu";
                 reg = <0x10064000 0x100>;
                 interrupts = <0 183 0>;
-                clocks = <&clock 318>;
+                clocks = <&clock CLK_TMU>;
                 clock-names = "tmu_apbif";
         };
 
@@ -633,7 +695,7 @@
                 compatible = "samsung,exynos5420-tmu-ext-triminfo";
                 reg = <0x10068000 0x100>, <0x1006c000 0x4>;
                 interrupts = <0 184 0>;
-                clocks = <&clock 318>, <&clock 318>;
+                clocks = <&clock CLK_TMU>, <&clock CLK_TMU>;
                 clock-names = "tmu_apbif", "tmu_triminfo_apbif";
         };
 
@@ -641,7 +703,7 @@
                 compatible = "samsung,exynos5420-tmu-ext-triminfo";
                 reg = <0x1006c000 0x100>, <0x100a0000 0x4>;
                 interrupts = <0 185 0>;
-                clocks = <&clock 318>, <&clock 319>;
+                clocks = <&clock CLK_TMU>, <&clock CLK_TMU_GPU>;
                 clock-names = "tmu_apbif", "tmu_triminfo_apbif";
         };
 
@@ -649,7 +711,16 @@
                 compatible = "samsung,exynos5420-tmu-ext-triminfo";
                 reg = <0x100a0000 0x100>, <0x10068000 0x4>;
                 interrupts = <0 215 0>;
-                clocks = <&clock 319>, <&clock 318>;
+                clocks = <&clock CLK_TMU_GPU>, <&clock CLK_TMU>;
                 clock-names = "tmu_apbif", "tmu_triminfo_apbif";
         };
+
+        watchdog@101D0000 {
+                compatible = "samsung,exynos5420-wdt";
+                reg = <0x101D0000 0x100>;
+                interrupts = <0 42 0>;
+                clocks = <&clock CLK_WDT>;
+                clock-names = "watchdog";
+                samsung,syscon-phandle = <&pmu_system_controller>;
+        };
 };
diff --git a/arch/arm/boot/dts/exynos5440.dtsi b/arch/arm/boot/dts/exynos5440.dtsi
index 02a0a1226cef..75c7b89cec2f 100644
--- a/arch/arm/boot/dts/exynos5440.dtsi
+++ b/arch/arm/boot/dts/exynos5440.dtsi
@@ -9,6 +9,7 @@
  * published by the Free Software Foundation.
 */
 
+#include <dt-bindings/clock/exynos5440.h>
 #include "skeleton.dtsi"
 
 / {
@@ -105,7 +106,7 @@
                 compatible = "samsung,exynos4210-uart";
                 reg = <0xB0000 0x1000>;
                 interrupts = <0 2 0>;
-                clocks = <&clock 21>, <&clock 21>;
+                clocks = <&clock CLK_B_125>, <&clock CLK_B_125>;
                 clock-names = "uart", "clk_uart_baud0";
         };
 
@@ -113,7 +114,7 @@
                 compatible = "samsung,exynos4210-uart";
                 reg = <0xC0000 0x1000>;
                 interrupts = <0 3 0>;
-                clocks = <&clock 21>, <&clock 21>;
+                clocks = <&clock CLK_B_125>, <&clock CLK_B_125>;
                 clock-names = "uart", "clk_uart_baud0";
         };
 
@@ -125,7 +126,7 @@
                 #size-cells = <0>;
                 samsung,spi-src-clk = <0>;
                 num-cs = <1>;
-                clocks = <&clock 21>, <&clock 16>;
+                clocks = <&clock CLK_B_125>, <&clock CLK_SPI_BAUD>;
                 clock-names = "spi", "spi_busclk0";
         };
 
@@ -161,7 +162,7 @@
                 interrupts = <0 5 0>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 21>;
+                clocks = <&clock CLK_B_125>;
                 clock-names = "i2c";
         };
 
@@ -171,7 +172,7 @@
                 interrupts = <0 6 0>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 21>;
+                clocks = <&clock CLK_B_125>;
                 clock-names = "i2c";
         };
 
@@ -179,7 +180,7 @@
                 compatible = "samsung,s3c2410-wdt";
                 reg = <0x110000 0x1000>;
                 interrupts = <0 1 0>;
-                clocks = <&clock 21>;
+                clocks = <&clock CLK_B_125>;
                 clock-names = "watchdog";
         };
 
@@ -190,7 +191,7 @@
                 interrupts = <0 31 4>;
                 interrupt-names = "macirq";
                 phy-mode = "sgmii";
-                clocks = <&clock 25>;
+                clocks = <&clock CLK_GMAC0>;
                 clock-names = "stmmaceth";
         };
 
@@ -206,7 +207,7 @@
                 compatible = "samsung,s3c6410-rtc";
                 reg = <0x130000 0x1000>;
                 interrupts = <0 17 0>, <0 16 0>;
-                clocks = <&clock 21>;
+                clocks = <&clock CLK_B_125>;
                 clock-names = "rtc";
         };
 
@@ -214,7 +215,7 @@
                 compatible = "samsung,exynos5440-tmu";
                 reg = <0x160118 0x230>, <0x160368 0x10>;
                 interrupts = <0 58 0>;
-                clocks = <&clock 21>;
+                clocks = <&clock CLK_B_125>;
                 clock-names = "tmu_apbif";
         };
 
@@ -222,7 +223,7 @@
                 compatible = "samsung,exynos5440-tmu";
                 reg = <0x16011C 0x230>, <0x160368 0x10>;
                 interrupts = <0 58 0>;
-                clocks = <&clock 21>;
+                clocks = <&clock CLK_B_125>;
                 clock-names = "tmu_apbif";
         };
 
@@ -230,7 +231,7 @@
                 compatible = "samsung,exynos5440-tmu";
                 reg = <0x160120 0x230>, <0x160368 0x10>;
                 interrupts = <0 58 0>;
-                clocks = <&clock 21>;
+                clocks = <&clock CLK_B_125>;
                 clock-names = "tmu_apbif";
         };
 
@@ -238,7 +239,7 @@
                 compatible = "snps,exynos5440-ahci";
                 reg = <0x210000 0x10000>;
                 interrupts = <0 30 0>;
-                clocks = <&clock 23>;
+                clocks = <&clock CLK_SATA>;
                 clock-names = "sata";
         };
 
@@ -246,7 +247,7 @@
                 compatible = "samsung,exynos5440-ohci";
                 reg = <0x220000 0x1000>;
                 interrupts = <0 29 0>;
-                clocks = <&clock 24>;
+                clocks = <&clock CLK_USB>;
                 clock-names = "usbhost";
         };
 
@@ -254,7 +255,7 @@
                 compatible = "samsung,exynos5440-ehci";
                 reg = <0x221000 0x1000>;
                 interrupts = <0 29 0>;
-                clocks = <&clock 24>;
+                clocks = <&clock CLK_USB>;
                 clock-names = "usbhost";
         };
 
@@ -264,7 +265,7 @@
                         0x270000 0x1000
                         0x271000 0x40>;
                 interrupts = <0 20 0>, <0 21 0>, <0 22 0>;
-                clocks = <&clock 28>, <&clock 27>;
+                clocks = <&clock CLK_PR0_250_O>, <&clock CLK_PB0_250_O>;
                 clock-names = "pcie", "pcie_bus";
                 #address-cells = <3>;
                 #size-cells = <2>;
@@ -285,7 +286,7 @@
                         0x272000 0x1000
                         0x271040 0x40>;
                 interrupts = <0 23 0>, <0 24 0>, <0 25 0>;
-                clocks = <&clock 29>, <&clock 27>;
+                clocks = <&clock CLK_PR1_250_O>, <&clock CLK_PB0_250_O>;
                 clock-names = "pcie", "pcie_bus";
                 #address-cells = <3>;
                 #size-cells = <2>;
diff --git a/arch/arm/include/debug/samsung.S b/arch/arm/include/debug/samsung.S
index f3a9cff6d5d4..8d8d922e5e44 100644
--- a/arch/arm/include/debug/samsung.S
+++ b/arch/arm/include/debug/samsung.S
@@ -9,7 +9,7 @@
  * published by the Free Software Foundation.
 */
 
-#include <plat/regs-serial.h>
+#include <linux/serial_s3c.h>
 
 /* The S5PV210/S5PC110 implementations are as belows. */
 
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
index f18be40e5b21..025fd8215ca3 100644
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@ -20,6 +20,7 @@
 #include <clocksource/samsung_pwm.h>
 #include <linux/sched.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/of.h>
 #include <linux/of_fdt.h>
 #include <linux/of_irq.h>
@@ -40,7 +41,6 @@
 
 #include <plat/cpu.h>
 #include <plat/pm.h>
-#include <plat/regs-serial.h>
 
 #include "common.h"
 #include "regs-pmu.h"
diff --git a/arch/arm/mach-exynos/include/mach/uncompress.h b/arch/arm/mach-exynos/include/mach/uncompress.h
deleted file mode 100644
index 5d7ce36be46f..000000000000
--- a/arch/arm/mach-exynos/include/mach/uncompress.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2010-2012 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * EXYNOS - uncompress code
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#ifndef __ASM_ARCH_UNCOMPRESS_H
-#define __ASM_ARCH_UNCOMPRESS_H __FILE__
-
-#include <asm/mach-types.h>
-
-#include <mach/map.h>
-#include <plat/uncompress.h>
-
-static unsigned int __raw_readl(unsigned int ptr)
-{
-        return *((volatile unsigned int *)ptr);
-}
-
-static void arch_detect_cpu(void)
-{
-        u32 chip_id = __raw_readl(EXYNOS_PA_CHIPID);
-
-        /*
-         * product_id is bits 31:12
-         * bits 23:20 describe the exynosX family
-         * bits 27:24 describe the exynosX family in exynos5420
-         */
-        chip_id >>= 20;
-
-        if ((chip_id & 0x0f) == 0x5 || (chip_id & 0xf0) == 0x50)
-                uart_base = (volatile u8 *)EXYNOS5_PA_UART + (S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT);
-        else
-                uart_base = (volatile u8 *)EXYNOS4_PA_UART + (S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT);
-
-        /*
-         * For preventing FIFO overrun or infinite loop of UART console,
-         * fifo_max should be the minimum fifo size of all of the UART channels
-         */
-        fifo_mask = S5PV210_UFSTAT_TXMASK;
-        fifo_max = 15 << S5PV210_UFSTAT_TXSHIFT;
-}
-#endif /* __ASM_ARCH_UNCOMPRESS_H */
diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c
index e00025bbbe89..ba18214c9aca 100644
--- a/arch/arm/mach-exynos/pm.c
+++ b/arch/arm/mach-exynos/pm.c
@@ -35,56 +35,6 @@
 #include "common.h"
 #include "regs-pmu.h"
 
-#define EXYNOS4_EPLL_LOCK                       (S5P_VA_CMU + 0x0C010)
-#define EXYNOS4_VPLL_LOCK                       (S5P_VA_CMU + 0x0C020)
-
-#define EXYNOS4_EPLL_CON0                       (S5P_VA_CMU + 0x0C110)
-#define EXYNOS4_EPLL_CON1                       (S5P_VA_CMU + 0x0C114)
-#define EXYNOS4_VPLL_CON0                       (S5P_VA_CMU + 0x0C120)
-#define EXYNOS4_VPLL_CON1                       (S5P_VA_CMU + 0x0C124)
-
-#define EXYNOS4_CLKSRC_MASK_TOP                 (S5P_VA_CMU + 0x0C310)
-#define EXYNOS4_CLKSRC_MASK_CAM                 (S5P_VA_CMU + 0x0C320)
-#define EXYNOS4_CLKSRC_MASK_TV                  (S5P_VA_CMU + 0x0C324)
-#define EXYNOS4_CLKSRC_MASK_LCD0                (S5P_VA_CMU + 0x0C334)
-#define EXYNOS4_CLKSRC_MASK_MAUDIO              (S5P_VA_CMU + 0x0C33C)
-#define EXYNOS4_CLKSRC_MASK_FSYS                (S5P_VA_CMU + 0x0C340)
-#define EXYNOS4_CLKSRC_MASK_PERIL0              (S5P_VA_CMU + 0x0C350)
-#define EXYNOS4_CLKSRC_MASK_PERIL1              (S5P_VA_CMU + 0x0C354)
-
-#define EXYNOS4_CLKSRC_MASK_DMC                 (S5P_VA_CMU + 0x10300)
-
-#define EXYNOS4_EPLLCON0_LOCKED_SHIFT           (29)
-#define EXYNOS4_VPLLCON0_LOCKED_SHIFT           (29)
-
-#define EXYNOS4210_CLKSRC_MASK_LCD1             (S5P_VA_CMU + 0x0C338)
-
-static const struct sleep_save exynos4_set_clksrc[] = {
-        { .reg = EXYNOS4_CLKSRC_MASK_TOP                , .val = 0x00000001, },
-        { .reg = EXYNOS4_CLKSRC_MASK_CAM                , .val = 0x11111111, },
-        { .reg = EXYNOS4_CLKSRC_MASK_TV                 , .val = 0x00000111, },
-        { .reg = EXYNOS4_CLKSRC_MASK_LCD0               , .val = 0x00001111, },
-        { .reg = EXYNOS4_CLKSRC_MASK_MAUDIO             , .val = 0x00000001, },
-        { .reg = EXYNOS4_CLKSRC_MASK_FSYS               , .val = 0x01011111, },
-        { .reg = EXYNOS4_CLKSRC_MASK_PERIL0             , .val = 0x01111111, },
-        { .reg = EXYNOS4_CLKSRC_MASK_PERIL1             , .val = 0x01110111, },
-        { .reg = EXYNOS4_CLKSRC_MASK_DMC                , .val = 0x00010000, },
-};
-
-static const struct sleep_save exynos4210_set_clksrc[] = {
-        { .reg = EXYNOS4210_CLKSRC_MASK_LCD1            , .val = 0x00001111, },
-};
-
-static struct sleep_save exynos4_epll_save[] = {
-        SAVE_ITEM(EXYNOS4_EPLL_CON0),
-        SAVE_ITEM(EXYNOS4_EPLL_CON1),
-};
-
-static struct sleep_save exynos4_vpll_save[] = {
-        SAVE_ITEM(EXYNOS4_VPLL_CON0),
-        SAVE_ITEM(EXYNOS4_VPLL_CON1),
-};
-
 static struct sleep_save exynos5_sys_save[] = {
         SAVE_ITEM(EXYNOS5_SYS_I2C_CFG),
 };
@@ -124,10 +74,7 @@ static void exynos_pm_prepare(void)
 
         s3c_pm_do_save(exynos_core_save, ARRAY_SIZE(exynos_core_save));
 
-        if (!soc_is_exynos5250()) {
-                s3c_pm_do_save(exynos4_epll_save, ARRAY_SIZE(exynos4_epll_save));
-                s3c_pm_do_save(exynos4_vpll_save, ARRAY_SIZE(exynos4_vpll_save));
-        } else {
+        if (soc_is_exynos5250()) {
                 s3c_pm_do_save(exynos5_sys_save, ARRAY_SIZE(exynos5_sys_save));
                 /* Disable USE_RETENTION of JPEG_MEM_OPTION */
                 tmp = __raw_readl(EXYNOS5_JPEG_MEM_OPTION);
@@ -143,15 +90,6 @@ static void exynos_pm_prepare(void)
         /* ensure at least INFORM0 has the resume address */
 
         __raw_writel(virt_to_phys(s3c_cpu_resume), S5P_INFORM0);
-
-        /* Before enter central sequence mode, clock src register have to set */
-
-        if (!soc_is_exynos5250())
-                s3c_pm_do_restore_core(exynos4_set_clksrc, ARRAY_SIZE(exynos4_set_clksrc));
-
-        if (soc_is_exynos4210())
-                s3c_pm_do_restore_core(exynos4210_set_clksrc, ARRAY_SIZE(exynos4210_set_clksrc));
-
 }
 
 static int exynos_pm_add(struct device *dev, struct subsys_interface *sif)
@@ -162,73 +100,6 @@ static int exynos_pm_add(struct device *dev, struct subsys_interface *sif)
         return 0;
 }
 
-static unsigned long pll_base_rate;
-
-static void exynos4_restore_pll(void)
-{
-        unsigned long pll_con, locktime, lockcnt;
-        unsigned long pll_in_rate;
-        unsigned int p_div, epll_wait = 0, vpll_wait = 0;
-
-        if (pll_base_rate == 0)
-                return;
-
-        pll_in_rate = pll_base_rate;
-
-        /* EPLL */
-        pll_con = exynos4_epll_save[0].val;
-
-        if (pll_con & (1 << 31)) {
-                pll_con &= (PLL46XX_PDIV_MASK << PLL46XX_PDIV_SHIFT);
-                p_div = (pll_con >> PLL46XX_PDIV_SHIFT);
-
-                pll_in_rate /= 1000000;
-
-                locktime = (3000 / pll_in_rate) * p_div;
-                lockcnt = locktime * 10000 / (10000 / pll_in_rate);
-
-                __raw_writel(lockcnt, EXYNOS4_EPLL_LOCK);
-
-                s3c_pm_do_restore_core(exynos4_epll_save,
-                                        ARRAY_SIZE(exynos4_epll_save));
-                epll_wait = 1;
-        }
-
-        pll_in_rate = pll_base_rate;
-
-        /* VPLL */
-        pll_con = exynos4_vpll_save[0].val;
-
-        if (pll_con & (1 << 31)) {
-                pll_in_rate /= 1000000;
-                /* 750us */
-                locktime = 750;
-                lockcnt = locktime * 10000 / (10000 / pll_in_rate);
-
-                __raw_writel(lockcnt, EXYNOS4_VPLL_LOCK);
-
-                s3c_pm_do_restore_core(exynos4_vpll_save,
-                                        ARRAY_SIZE(exynos4_vpll_save));
-                vpll_wait = 1;
-        }
-
-        /* Wait PLL locking */
-
-        do {
-                if (epll_wait) {
-                        pll_con = __raw_readl(EXYNOS4_EPLL_CON0);
-                        if (pll_con & (1 << EXYNOS4_EPLLCON0_LOCKED_SHIFT))
-                                epll_wait = 0;
-                }
-
-                if (vpll_wait) {
-                        pll_con = __raw_readl(EXYNOS4_VPLL_CON0);
-                        if (pll_con & (1 << EXYNOS4_VPLLCON0_LOCKED_SHIFT))
-                                vpll_wait = 0;
-                }
-        } while (epll_wait || vpll_wait);
-}
-
 static struct subsys_interface exynos_pm_interface = {
         .name           = "exynos_pm",
         .subsys         = &exynos_subsys,
@@ -237,7 +108,6 @@ static struct subsys_interface exynos_pm_interface = {
 
 static __init int exynos_pm_drvinit(void)
 {
-        struct clk *pll_base;
         unsigned int tmp;
 
         if (soc_is_exynos5440())
@@ -251,15 +121,6 @@ static __init int exynos_pm_drvinit(void)
         tmp |= ((0xFF << 8) | (0x1F << 1));
         __raw_writel(tmp, S5P_WAKEUP_MASK);
 
-        if (!soc_is_exynos5250()) {
-                pll_base = clk_get(NULL, "xtal");
-
-                if (!IS_ERR(pll_base)) {
-                        pll_base_rate = clk_get_rate(pll_base);
-                        clk_put(pll_base);
-                }
-        }
-
         return subsys_interface_register(&exynos_pm_interface);
 }
 arch_initcall(exynos_pm_drvinit);
@@ -343,13 +204,8 @@ static void exynos_pm_resume(void)
 
         s3c_pm_do_restore_core(exynos_core_save, ARRAY_SIZE(exynos_core_save));
 
-        if (!soc_is_exynos5250()) {
-                exynos4_restore_pll();
-
-#ifdef CONFIG_SMP
+        if (IS_ENABLED(CONFIG_SMP) && !soc_is_exynos5250())
                 scu_enable(S5P_VA_SCU);
-#endif
-        }
 
 early_wakeup:
 
diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c
index 8fd24882f0b1..fe6570ebbdde 100644
--- a/arch/arm/mach-exynos/pm_domains.c
+++ b/arch/arm/mach-exynos/pm_domains.c
@@ -22,8 +22,6 @@
 #include <linux/of_platform.h>
 #include <linux/sched.h>
 
-#include <plat/devs.h>
-
 #include "regs-pmu.h"
 
 /*
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index d876431d64c0..bb1fa6032179 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -521,7 +521,6 @@ config MACH_ANUBIS
         select HAVE_PATA_PLATFORM
         select S3C2440_XTAL_12000000
         select S3C24XX_DCLK
-        select S3C24XX_GPIO_EXTRA64
         select S3C24XX_SIMTEC_PM if PM
         select S3C_DEV_USB_HOST
         help
@@ -562,7 +561,6 @@ config MACH_OSIRIS
         select S3C2410_IOTIMING if ARM_S3C2440_CPUFREQ
         select S3C2440_XTAL_12000000
         select S3C24XX_DCLK
-        select S3C24XX_GPIO_EXTRA128
         select S3C24XX_SIMTEC_PM if PM
         select S3C_DEV_NAND
         select S3C_DEV_USB_HOST
diff --git a/arch/arm/mach-s3c24xx/clock-s3c2410.c b/arch/arm/mach-s3c24xx/clock-s3c2410.c
index d39d3c787580..d1afcf9252d1 100644
--- a/arch/arm/mach-s3c24xx/clock-s3c2410.c
+++ b/arch/arm/mach-s3c24xx/clock-s3c2410.c
@@ -30,13 +30,12 @@
 #include <linux/mutex.h>
 #include <linux/delay.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/io.h>
 
 #include <asm/mach/map.h>
 
 #include <mach/hardware.h>
-
-#include <plat/regs-serial.h>
 #include <mach/regs-clock.h>
 #include <mach/regs-gpio.h>
 
diff --git a/arch/arm/mach-s3c24xx/clock-s3c2412.c b/arch/arm/mach-s3c24xx/clock-s3c2412.c
index 11b3b28457bb..192a5b2550b0 100644
--- a/arch/arm/mach-s3c24xx/clock-s3c2412.c
+++ b/arch/arm/mach-s3c24xx/clock-s3c2412.c
@@ -31,13 +31,12 @@
 #include <linux/mutex.h>
 #include <linux/delay.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/io.h>
 
 #include <asm/mach/map.h>
 
 #include <mach/hardware.h>
-
-#include <plat/regs-serial.h>
 #include <mach/regs-clock.h>
 #include <mach/regs-gpio.h>
 
diff --git a/arch/arm/mach-s3c24xx/clock-s3c2440.c b/arch/arm/mach-s3c24xx/clock-s3c2440.c
index aaf006d1d6dc..5527226fd61f 100644
--- a/arch/arm/mach-s3c24xx/clock-s3c2440.c
+++ b/arch/arm/mach-s3c24xx/clock-s3c2440.c
@@ -34,6 +34,7 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 
 #include <mach/hardware.h>
 #include <linux/atomic.h>
@@ -43,7 +44,6 @@
 
 #include <plat/clock.h>
 #include <plat/cpu.h>
-#include <plat/regs-serial.h>
 
 /* S3C2440 extended clock support */
 
diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c
index 4adaa4b43ffe..64b6eda380a4 100644
--- a/arch/arm/mach-s3c24xx/common.c
+++ b/arch/arm/mach-s3c24xx/common.c
@@ -27,6 +27,7 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <clocksource/samsung_pwm.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
@@ -44,7 +45,6 @@
 #include <asm/mach/map.h>
 
 #include <mach/regs-gpio.h>
-#include <plat/regs-serial.h>
 #include <mach/dma.h>
 
 #include <plat/cpu.h>
@@ -240,7 +240,6 @@ void __init s3c24xx_init_io(struct map_desc *mach_desc, int size)
         } else {
                 samsung_cpu_id = s3c24xx_read_idcode_v4();
         }
-        s3c24xx_init_cpu();
 
         s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));
 
diff --git a/arch/arm/mach-s3c24xx/dma-s3c2410.c b/arch/arm/mach-s3c24xx/dma-s3c2410.c
index 30aa53ff07a6..09aa12da1789 100644
--- a/arch/arm/mach-s3c24xx/dma-s3c2410.c
+++ b/arch/arm/mach-s3c24xx/dma-s3c2410.c
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 
 #include <mach/map.h>
 #include <mach/dma.h>
@@ -23,7 +24,6 @@
 #include <plat/cpu.h>
 #include <plat/dma-s3c24xx.h>
 
-#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 #include <plat/regs-dma.h>
 #include <mach/regs-lcd.h>
diff --git a/arch/arm/mach-s3c24xx/dma-s3c2412.c b/arch/arm/mach-s3c24xx/dma-s3c2412.c
index b7e094671522..0c0106d1a4d1 100644
--- a/arch/arm/mach-s3c24xx/dma-s3c2412.c
+++ b/arch/arm/mach-s3c24xx/dma-s3c2412.c
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/io.h>
 
 #include <mach/dma.h>
@@ -23,7 +24,6 @@
 #include <plat/dma-s3c24xx.h>
 #include <plat/cpu.h>
 
-#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 #include <plat/regs-dma.h>
 #include <mach/regs-lcd.h>
diff --git a/arch/arm/mach-s3c24xx/dma-s3c2440.c b/arch/arm/mach-s3c24xx/dma-s3c2440.c
index cd25de28804c..2f8e8a3017df 100644
--- a/arch/arm/mach-s3c24xx/dma-s3c2440.c
+++ b/arch/arm/mach-s3c24xx/dma-s3c2440.c
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 
 #include <mach/map.h>
 #include <mach/dma.h>
@@ -23,7 +24,6 @@
 #include <plat/dma-s3c24xx.h>
 #include <plat/cpu.h>
 
-#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 #include <plat/regs-dma.h>
 #include <mach/regs-lcd.h>
diff --git a/arch/arm/mach-s3c24xx/dma-s3c2443.c b/arch/arm/mach-s3c24xx/dma-s3c2443.c
index 95b9f759fe97..f4096ec0700a 100644
--- a/arch/arm/mach-s3c24xx/dma-s3c2443.c
+++ b/arch/arm/mach-s3c24xx/dma-s3c2443.c
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/io.h>
 
 #include <mach/dma.h>
@@ -23,7 +24,6 @@
 #include <plat/dma-s3c24xx.h>
 #include <plat/cpu.h>
 
-#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 #include <plat/regs-dma.h>
 #include <mach/regs-lcd.h>
diff --git a/arch/arm/mach-s3c24xx/include/mach/debug-macro.S b/arch/arm/mach-s3c24xx/include/mach/debug-macro.S
index 2558952e3147..2f39737544c0 100644
--- a/arch/arm/mach-s3c24xx/include/mach/debug-macro.S
+++ b/arch/arm/mach-s3c24xx/include/mach/debug-macro.S
@@ -14,7 +14,7 @@
 
 #include <mach/map.h>
 #include <mach/regs-gpio.h>
-#include <plat/regs-serial.h>
+#include <linux/serial_s3c.h>
 
 #define S3C2410_UART1_OFF (0x4000)
 #define SHIFT_2440TXF (14-9)
diff --git a/arch/arm/plat-samsung/include/plat/rtc-core.h b/arch/arm/mach-s3c24xx/include/mach/rtc-core.h
index 7b542f7b7938..4d5f5768f700 100644
--- a/arch/arm/plat-samsung/include/plat/rtc-core.h
+++ b/arch/arm/mach-s3c24xx/include/mach/rtc-core.h
@@ -1,5 +1,4 @@
-/* linux/arch/arm/plat-samsung/include/plat/rtc-core.h
- *
+/*
  * Copyright (c) 2011 Heiko Stuebner <heiko@sntech.de>
  *
  * Samsung RTC Controller core functions
@@ -9,19 +8,19 @@
  * published by the Free Software Foundation.
 */
 
-#ifndef __ASM_PLAT_RTC_CORE_H
-#define __ASM_PLAT_RTC_CORE_H __FILE__
+#ifndef __RTC_CORE_H
+#define __RTC_CORE_H __FILE__
 
 /* These functions are only for use with the core support code, such as
  * the cpu specific initialisation code
  */
 
+extern struct platform_device s3c_device_rtc;
+
 /* re-define device name depending on support. */
 static inline void s3c_rtc_setname(char *name)
 {
-#if defined(CONFIG_S3C_DEV_RTC) || defined(CONFIG_PLAT_S3C24XX)
         s3c_device_rtc.name = name;
-#endif
 }
 
-#endif /* __ASM_PLAT_RTC_CORE_H */
+#endif /* __RTC_CORE_H */
diff --git a/arch/arm/mach-s3c24xx/include/mach/tick.h b/arch/arm/mach-s3c24xx/include/mach/tick.h
deleted file mode 100644
index 544da41979db..000000000000
--- a/arch/arm/mach-s3c24xx/include/mach/tick.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* linux/arch/arm/mach-s3c2410/include/mach/tick.h
- *
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * S3C2410 - timer tick support
- */
-
-#define SRCPND_TIMER4 (1<<(IRQ_TIMER4 - IRQ_EINT0))
-
-static inline int s3c24xx_ostimer_pending(void)
-{
-        return __raw_readl(S3C2410_SRCPND) & SRCPND_TIMER4;
-}
diff --git a/arch/arm/mach-s3c24xx/mach-amlm5900.c b/arch/arm/mach-s3c24xx/mach-amlm5900.c
index 284ea1f44205..8ac9554aa996 100644
--- a/arch/arm/mach-s3c24xx/mach-amlm5900.c
+++ b/arch/arm/mach-s3c24xx/mach-amlm5900.c
@@ -37,6 +37,7 @@
 #include <linux/platform_device.h>
 #include <linux/proc_fs.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/io.h>
 
 #include <asm/mach/arch.h>
@@ -49,7 +50,6 @@
 #include <asm/mach-types.h>
 #include <mach/fb.h>
 
-#include <plat/regs-serial.h>
 #include <mach/regs-lcd.h>
 #include <mach/regs-gpio.h>
 #include <mach/gpio-samsung.h>
diff --git a/arch/arm/mach-s3c24xx/mach-anubis.c b/arch/arm/mach-s3c24xx/mach-anubis.c
index 2a16f8fb3584..81a270af2336 100644
--- a/arch/arm/mach-s3c24xx/mach-anubis.c
+++ b/arch/arm/mach-s3c24xx/mach-anubis.c
@@ -17,6 +17,7 @@
 #include <linux/init.h>
 #include <linux/gpio.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/ata_platform.h>
 #include <linux/i2c.h>
@@ -32,7 +33,6 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-lcd.h>
 #include <mach/gpio-samsung.h>
diff --git a/arch/arm/mach-s3c24xx/mach-at2440evb.c b/arch/arm/mach-s3c24xx/mach-at2440evb.c
index 6beab674c147..d8f6bb1096cb 100644
--- a/arch/arm/mach-s3c24xx/mach-at2440evb.c
+++ b/arch/arm/mach-s3c24xx/mach-at2440evb.c
@@ -21,6 +21,7 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/dm9000.h>
 #include <linux/platform_device.h>
 
@@ -33,7 +34,6 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-lcd.h>
 #include <mach/gpio-samsung.h>
diff --git a/arch/arm/mach-s3c24xx/mach-bast.c b/arch/arm/mach-s3c24xx/mach-bast.c
index 981ba1eb9fdc..e371ff53a408 100644
--- a/arch/arm/mach-s3c24xx/mach-bast.c
+++ b/arch/arm/mach-s3c24xx/mach-bast.c
@@ -19,6 +19,7 @@
 #include <linux/gpio.h>
 #include <linux/syscore_ops.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/dm9000.h>
 #include <linux/ata_platform.h>
@@ -55,7 +56,6 @@
 #include <plat/cpu-freq.h>
 #include <plat/devs.h>
 #include <plat/gpio-cfg.h>
-#include <plat/regs-serial.h>
 #include <plat/samsung-time.h>
 
 #include "bast.h"
diff --git a/arch/arm/mach-s3c24xx/mach-gta02.c b/arch/arm/mach-s3c24xx/mach-gta02.c
index d9170e9f8ccd..8e0581317f17 100644
--- a/arch/arm/mach-s3c24xx/mach-gta02.c
+++ b/arch/arm/mach-s3c24xx/mach-gta02.c
@@ -35,6 +35,7 @@
 #include <linux/workqueue.h>
 #include <linux/platform_device.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/input.h>
 #include <linux/io.h>
 #include <linux/i2c.h>
@@ -81,7 +82,6 @@
 #include <plat/devs.h>
 #include <plat/gpio-cfg.h>
 #include <plat/pm.h>
-#include <plat/regs-serial.h>
 #include <plat/samsung-time.h>
 
 #include "common.h"
diff --git a/arch/arm/mach-s3c24xx/mach-h1940.c b/arch/arm/mach-s3c24xx/mach-h1940.c
index de0832181d8c..e453acd92cbf 100644
--- a/arch/arm/mach-s3c24xx/mach-h1940.c
+++ b/arch/arm/mach-s3c24xx/mach-h1940.c
@@ -19,6 +19,7 @@
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/gpio.h>
@@ -62,7 +63,6 @@
 #include <plat/gpio-cfg.h>
 #include <plat/pll.h>
 #include <plat/pm.h>
-#include <plat/regs-serial.h>
 #include <plat/samsung-time.h>
 
 #include "common.h"
diff --git a/arch/arm/mach-s3c24xx/mach-jive.c b/arch/arm/mach-s3c24xx/mach-jive.c
index 67cb8e948b7e..5faa7239e7d6 100644
--- a/arch/arm/mach-s3c24xx/mach-jive.c
+++ b/arch/arm/mach-s3c24xx/mach-jive.c
@@ -19,6 +19,7 @@
 #include <linux/gpio.h>
 #include <linux/syscore_ops.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
 
@@ -31,7 +32,6 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <plat/regs-serial.h>
 #include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <linux/platform_data/i2c-s3c2410.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c b/arch/arm/mach-s3c24xx/mach-mini2440.c
index 1f1559713d8b..9e57fd9f4f3b 100644
--- a/arch/arm/mach-s3c24xx/mach-mini2440.c
+++ b/arch/arm/mach-s3c24xx/mach-mini2440.c
@@ -23,6 +23,7 @@
 #include <linux/input.h>
 #include <linux/io.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/dm9000.h>
 #include <linux/platform_data/at24.h>
 #include <linux/platform_device.h>
@@ -37,7 +38,6 @@
 #include <mach/fb.h>
 #include <asm/mach-types.h>
 
-#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 #include <linux/platform_data/leds-s3c24xx.h>
 #include <mach/regs-lcd.h>
diff --git a/arch/arm/mach-s3c24xx/mach-n30.c b/arch/arm/mach-s3c24xx/mach-n30.c
index 997684f17930..4cccaad34847 100644
--- a/arch/arm/mach-s3c24xx/mach-n30.c
+++ b/arch/arm/mach-s3c24xx/mach-n30.c
@@ -24,6 +24,7 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/timer.h>
 #include <linux/io.h>
 #include <linux/mmc/host.h>
@@ -43,7 +44,6 @@
 #include <asm/mach/map.h>
 
 #include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/regs-serial.h>
 
 #include <plat/clock.h>
 #include <plat/cpu.h>
diff --git a/arch/arm/mach-s3c24xx/mach-nexcoder.c b/arch/arm/mach-s3c24xx/mach-nexcoder.c
index 575d28c9e6c6..3066851f584d 100644
--- a/arch/arm/mach-s3c24xx/mach-nexcoder.c
+++ b/arch/arm/mach-s3c24xx/mach-nexcoder.c
@@ -21,6 +21,7 @@
 #include <linux/gpio.h>
 #include <linux/string.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
@@ -38,7 +39,6 @@
 //#include <asm/debug-ll.h>
 #include <mach/regs-gpio.h>
 #include <mach/gpio-samsung.h>
-#include <plat/regs-serial.h>
 #include <linux/platform_data/i2c-s3c2410.h>
 
 #include <plat/gpio-cfg.h>
diff --git a/arch/arm/mach-s3c24xx/mach-osiris.c b/arch/arm/mach-s3c24xx/mach-osiris.c
index f84f2a4c0c6d..a4ae4bb3666d 100644
--- a/arch/arm/mach-s3c24xx/mach-osiris.c
+++ b/arch/arm/mach-s3c24xx/mach-osiris.c
@@ -18,6 +18,7 @@
 #include <linux/device.h>
 #include <linux/syscore_ops.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/clk.h>
 #include <linux/i2c.h>
 #include <linux/io.h>
@@ -44,7 +45,6 @@
 #include <plat/cpu-freq.h>
 #include <plat/devs.h>
 #include <plat/gpio-cfg.h>
-#include <plat/regs-serial.h>
 #include <plat/samsung-time.h>
 
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-s3c24xx/mach-otom.c b/arch/arm/mach-s3c24xx/mach-otom.c
index 7e16b0740ec1..bdb3faac2d9b 100644
--- a/arch/arm/mach-s3c24xx/mach-otom.c
+++ b/arch/arm/mach-s3c24xx/mach-otom.c
@@ -15,6 +15,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
@@ -32,7 +33,6 @@
 #include <plat/clock.h>
 #include <plat/cpu.h>
 #include <plat/devs.h>
-#include <plat/regs-serial.h>
 #include <plat/samsung-time.h>
 
 #include "common.h"
diff --git a/arch/arm/mach-s3c24xx/mach-qt2410.c b/arch/arm/mach-s3c24xx/mach-qt2410.c
index b534b76812e3..8c12787a8fd3 100644
--- a/arch/arm/mach-s3c24xx/mach-qt2410.c
+++ b/arch/arm/mach-s3c24xx/mach-qt2410.c
@@ -31,6 +31,7 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/spi_gpio.h>
 #include <linux/io.h>
@@ -49,7 +50,6 @@
 
 #include <linux/platform_data/leds-s3c24xx.h>
 #include <mach/regs-lcd.h>
-#include <plat/regs-serial.h>
 #include <mach/fb.h>
 #include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <linux/platform_data/usb-s3c2410_udc.h>
diff --git a/arch/arm/mach-s3c24xx/mach-rx1950.c b/arch/arm/mach-s3c24xx/mach-rx1950.c
index 0a5456cda1bc..afb784e934c8 100644
--- a/arch/arm/mach-s3c24xx/mach-rx1950.c
+++ b/arch/arm/mach-s3c24xx/mach-rx1950.c
@@ -21,6 +21,7 @@
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
 #include <linux/device.h>
@@ -57,7 +58,6 @@
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/pm.h>
-#include <plat/regs-serial.h>
 #include <plat/samsung-time.h>
 #include <plat/gpio-cfg.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-rx3715.c b/arch/arm/mach-s3c24xx/mach-rx3715.c
index b36edce8b2b8..e6535ce1bc5c 100644
--- a/arch/arm/mach-s3c24xx/mach-rx3715.c
+++ b/arch/arm/mach-s3c24xx/mach-rx3715.c
@@ -23,6 +23,7 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/serial.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
@@ -49,7 +50,6 @@
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/pm.h>
-#include <plat/regs-serial.h>
 #include <plat/samsung-time.h>
 
 #include "common.h"
diff --git a/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c b/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c
index f50454a34f72..70f0900d4bca 100644
--- a/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c
+++ b/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c
@@ -19,13 +19,13 @@
 #include <linux/irqchip.h>
 #include <linux/of_platform.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 
 #include <asm/mach/arch.h>
 #include <mach/map.h>
 
 #include <plat/cpu.h>
 #include <plat/pm.h>
-#include <plat/regs-serial.h>
 
 #include "common.h"
 
diff --git a/arch/arm/mach-s3c24xx/mach-smdk2410.c b/arch/arm/mach-s3c24xx/mach-smdk2410.c
index a773789e4f38..f32924ee0e9f 100644
--- a/arch/arm/mach-s3c24xx/mach-smdk2410.c
+++ b/arch/arm/mach-s3c24xx/mach-smdk2410.c
@@ -35,6 +35,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
@@ -46,7 +47,6 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <plat/regs-serial.h>
 #include <linux/platform_data/i2c-s3c2410.h>
 
 #include <plat/devs.h>
diff --git a/arch/arm/mach-s3c24xx/mach-smdk2413.c b/arch/arm/mach-s3c24xx/mach-smdk2413.c
index f5bc721217e3..233fe52d2015 100644
--- a/arch/arm/mach-s3c24xx/mach-smdk2413.c
+++ b/arch/arm/mach-s3c24xx/mach-smdk2413.c
@@ -19,6 +19,7 @@
 #include <linux/init.h>
 #include <linux/gpio.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
@@ -33,7 +34,6 @@
 #include <asm/mach-types.h>
 
 //#include <asm/debug-ll.h>
-#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-lcd.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-smdk2416.c b/arch/arm/mach-s3c24xx/mach-smdk2416.c
index 12023cae4378..b3b54d8e1410 100644
--- a/arch/arm/mach-s3c24xx/mach-smdk2416.c
+++ b/arch/arm/mach-s3c24xx/mach-smdk2416.c
@@ -18,6 +18,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/mtd/partitions.h>
@@ -34,7 +35,6 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-lcd.h>
 #include <mach/regs-s3c2443-clock.h>
diff --git a/arch/arm/mach-s3c24xx/mach-smdk2440.c b/arch/arm/mach-s3c24xx/mach-smdk2440.c
index de2e5d39a847..d071dcfea548 100644
--- a/arch/arm/mach-s3c24xx/mach-smdk2440.c
+++ b/arch/arm/mach-s3c24xx/mach-smdk2440.c
@@ -20,6 +20,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
@@ -31,7 +32,6 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-lcd.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-smdk2443.c b/arch/arm/mach-s3c24xx/mach-smdk2443.c
index d9933fcc6cc8..06c4d77de3a5 100644
--- a/arch/arm/mach-s3c24xx/mach-smdk2443.c
+++ b/arch/arm/mach-s3c24xx/mach-smdk2443.c
@@ -20,6 +20,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
@@ -31,7 +32,6 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-lcd.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-tct_hammer.c b/arch/arm/mach-s3c24xx/mach-tct_hammer.c
index 7fad8f055cab..4108b2f0cede 100644
--- a/arch/arm/mach-s3c24xx/mach-tct_hammer.c
+++ b/arch/arm/mach-s3c24xx/mach-tct_hammer.c
@@ -33,6 +33,7 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/io.h>
 
 #include <asm/mach/arch.h>
@@ -44,7 +45,6 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <plat/regs-serial.h>
 #include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
diff --git a/arch/arm/mach-s3c24xx/mach-vr1000.c b/arch/arm/mach-s3c24xx/mach-vr1000.c
index 755df489a45f..1cc5b1bd51cd 100644
--- a/arch/arm/mach-s3c24xx/mach-vr1000.c
+++ b/arch/arm/mach-s3c24xx/mach-vr1000.c
@@ -25,6 +25,7 @@
 #include <linux/tty.h>
 #include <linux/serial_8250.h>
 #include <linux/serial_reg.h>
+#include <linux/serial_s3c.h>
 #include <linux/io.h>
 
 #include <asm/mach/arch.h>
@@ -45,7 +46,6 @@
 #include <plat/clock.h>
 #include <plat/cpu.h>
 #include <plat/devs.h>
-#include <plat/regs-serial.h>
 #include <plat/samsung-time.h>
 
 #include "bast.h"
diff --git a/arch/arm/mach-s3c24xx/mach-vstms.c b/arch/arm/mach-s3c24xx/mach-vstms.c
index f7ec9c550787..40868c0e0a68 100644
--- a/arch/arm/mach-s3c24xx/mach-vstms.c
+++ b/arch/arm/mach-s3c24xx/mach-vstms.c
@@ -16,6 +16,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
@@ -32,7 +33,6 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-lcd.h>
 
diff --git a/arch/arm/mach-s3c24xx/pm.c b/arch/arm/mach-s3c24xx/pm.c
index 052ca23393a7..68ea5b7e5dc7 100644
--- a/arch/arm/mach-s3c24xx/pm.c
+++ b/arch/arm/mach-s3c24xx/pm.c
@@ -33,9 +33,9 @@
 #include <linux/gpio.h>
 #include <linux/interrupt.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/io.h>
 
-#include <plat/regs-serial.h>
 #include <mach/regs-clock.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-irq.h>
diff --git a/arch/arm/mach-s3c24xx/s3c2410.c b/arch/arm/mach-s3c24xx/s3c2410.c
index ffb92cbca08c..04b58cb49888 100644
--- a/arch/arm/mach-s3c24xx/s3c2410.c
+++ b/arch/arm/mach-s3c24xx/s3c2410.c
@@ -21,6 +21,7 @@
 #include <linux/device.h>
 #include <linux/syscore_ops.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/reboot.h>
 #include <linux/io.h>
@@ -37,7 +38,6 @@
 #include <plat/cpu-freq.h>
 
 #include <mach/regs-clock.h>
-#include <plat/regs-serial.h>
 
 #include <plat/cpu.h>
 #include <plat/devs.h>
diff --git a/arch/arm/mach-s3c24xx/s3c2412.c b/arch/arm/mach-s3c24xx/s3c2412.c
index 0251650cbf80..657cbaca80ac 100644
--- a/arch/arm/mach-s3c24xx/s3c2412.c
+++ b/arch/arm/mach-s3c24xx/s3c2412.c
@@ -20,6 +20,7 @@
 #include <linux/device.h>
 #include <linux/syscore_ops.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/reboot.h>
@@ -43,7 +44,6 @@
 #include <plat/nand-core.h>
 #include <plat/pll.h>
 #include <plat/pm.h>
-#include <plat/regs-serial.h>
 #include <plat/regs-spi.h>
 
 #include "common.h"
diff --git a/arch/arm/mach-s3c24xx/s3c2416.c b/arch/arm/mach-s3c24xx/s3c2416.c
index 8e01b4f2df35..9fe260ae11e1 100644
--- a/arch/arm/mach-s3c24xx/s3c2416.c
+++ b/arch/arm/mach-s3c24xx/s3c2416.c
@@ -48,6 +48,7 @@
 #include <asm/system_misc.h>
 
 #include <mach/regs-s3c2443-clock.h>
+#include <mach/rtc-core.h>
 
 #include <plat/gpio-core.h>
 #include <plat/gpio-cfg.h>
@@ -61,7 +62,6 @@
 #include <plat/fb-core.h>
 #include <plat/nand-core.h>
 #include <plat/adc-core.h>
-#include <plat/rtc-core.h>
 #include <plat/spi-core.h>
 
 #include "common.h"
diff --git a/arch/arm/mach-s3c24xx/s3c2443.c b/arch/arm/mach-s3c24xx/s3c2443.c
index 886c2147062b..c7a804d0348e 100644
--- a/arch/arm/mach-s3c24xx/s3c2443.c
+++ b/arch/arm/mach-s3c24xx/s3c2443.c
@@ -34,6 +34,7 @@
 #include <asm/system_misc.h>
 
 #include <mach/regs-s3c2443-clock.h>
+#include <mach/rtc-core.h>
 
 #include <plat/gpio-core.h>
 #include <plat/gpio-cfg.h>
@@ -43,7 +44,6 @@
 #include <plat/fb-core.h>
 #include <plat/nand-core.h>
 #include <plat/adc-core.h>
-#include <plat/rtc-core.h>
 #include <plat/spi-core.h>
 
 static struct map_desc s3c2443_iodesc[] __initdata = {
diff --git a/arch/arm/mach-s3c24xx/s3c244x.c b/arch/arm/mach-s3c24xx/s3c244x.c
index 911b555029fc..fe30ebb234d2 100644
--- a/arch/arm/mach-s3c24xx/s3c244x.c
+++ b/arch/arm/mach-s3c24xx/s3c244x.c
@@ -17,6 +17,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/reboot.h>
 #include <linux/device.h>
@@ -35,7 +36,6 @@
 #include <plat/cpu-freq.h>
 
 #include <mach/regs-clock.h>
-#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 
 #include <plat/clock.h>
diff --git a/arch/arm/mach-s3c24xx/sleep-s3c2410.S b/arch/arm/mach-s3c24xx/sleep-s3c2410.S
index dd47c8fa07fa..c9b91223697c 100644
--- a/arch/arm/mach-s3c24xx/sleep-s3c2410.S
+++ b/arch/arm/mach-s3c24xx/sleep-s3c2410.S
@@ -25,13 +25,13 @@
 */
 
 #include <linux/linkage.h>
+#include <linux/serial_s3c.h>
 #include <asm/assembler.h>
 #include <mach/hardware.h>
 #include <mach/map.h>
 
 #include <mach/regs-gpio.h>
 #include <mach/regs-clock.h>
-#include <plat/regs-serial.h>
 
 #include "regs-mem.h"
 
diff --git a/arch/arm/mach-s3c24xx/sleep.S b/arch/arm/mach-s3c24xx/sleep.S
index 7f378b662da6..d833d616bd2e 100644
--- a/arch/arm/mach-s3c24xx/sleep.S
+++ b/arch/arm/mach-s3c24xx/sleep.S
@@ -25,13 +25,13 @@
 */
 
 #include <linux/linkage.h>
+#include <linux/serial_s3c.h>
 #include <asm/assembler.h>
 #include <mach/hardware.h>
 #include <mach/map.h>
 
 #include <mach/regs-gpio.h>
 #include <mach/regs-clock.h>
-#include <plat/regs-serial.h>
 
 /* CONFIG_DEBUG_RESUME is dangerous if your bootloader does not
  * reset the UART configuration, only enable if you really need this!
diff --git a/arch/arm/mach-s3c64xx/common.c b/arch/arm/mach-s3c64xx/common.c
index 76ab595d849b..5c45aae675b6 100644
--- a/arch/arm/mach-s3c64xx/common.c
+++ b/arch/arm/mach-s3c64xx/common.c
@@ -25,6 +25,7 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/reboot.h>
 #include <linux/io.h>
@@ -50,7 +51,6 @@
 #include <plat/irq-uart.h>
 #include <plat/pwm-core.h>
 #include <plat/regs-irqtype.h>
-#include <plat/regs-serial.h>
 #include <plat/watchdog-reset.h>
 
 #include "common.h"
diff --git a/arch/arm/mach-s3c64xx/include/mach/debug-macro.S b/arch/arm/mach-s3c64xx/include/mach/debug-macro.S
index dd9ccca5de1f..c9b95325b672 100644
--- a/arch/arm/mach-s3c64xx/include/mach/debug-macro.S
+++ b/arch/arm/mach-s3c64xx/include/mach/debug-macro.S
@@ -12,8 +12,8 @@
 
 /* pull in the relevant register and map files. */
 
+#include <linux/serial_s3c.h>
 #include <mach/map.h>
-#include <plat/regs-serial.h>
 
         /* note, for the boot process to work we have to keep the UART
          * virtual address aligned to an 1MiB boundary for the L1
diff --git a/arch/arm/mach-s3c64xx/include/mach/tick.h b/arch/arm/mach-s3c64xx/include/mach/tick.h
deleted file mode 100644
index db9c1b1d56a4..000000000000
--- a/arch/arm/mach-s3c64xx/include/mach/tick.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* linux/arch/arm/mach-s3c6400/include/mach/tick.h
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      http://armlinux.simtec.co.uk/
- *      Ben Dooks <ben@simtec.co.uk>
- *
- * S3C64XX - Timer tick support definitions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#ifndef __ASM_ARCH_TICK_H
-#define __ASM_ARCH_TICK_H __FILE__
-
-#include <linux/irqchip/arm-vic.h>
-
-/* note, the timer interrutps turn up in 2 places, the vic and then
- * the timer block. We take the VIC as the base at the moment.
- */
-static inline u32 s3c24xx_ostimer_pending(void)
-{
-        u32 pend = __raw_readl(VA_VIC0 + VIC_RAW_STATUS);
-        return pend & 1 << (IRQ_TIMER4_VIC - S3C64XX_IRQ_VIC0(0));
-}
-
-#define TICK_MAX        (0xffffffff)
-
-#endif /* __ASM_ARCH_6400_TICK_H */
diff --git a/arch/arm/mach-s3c64xx/irq-pm.c b/arch/arm/mach-s3c64xx/irq-pm.c
index 1649c0d1c1b8..a61247bb6e7a 100644
--- a/arch/arm/mach-s3c64xx/irq-pm.c
+++ b/arch/arm/mach-s3c64xx/irq-pm.c
@@ -20,13 +20,13 @@
 #include <linux/syscore_ops.h>
 #include <linux/interrupt.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/irq.h>
 #include <linux/io.h>
 #include <linux/of.h>
 
 #include <mach/map.h>
 
-#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 #include <plat/cpu.h>
 #include <plat/pm.h>
diff --git a/arch/arm/mach-s3c64xx/mach-anw6410.c b/arch/arm/mach-s3c64xx/mach-anw6410.c
index ddeb0e51a962..55eb6a69655b 100644
--- a/arch/arm/mach-s3c64xx/mach-anw6410.c
+++ b/arch/arm/mach-s3c64xx/mach-anw6410.c
@@ -20,6 +20,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/i2c.h>
@@ -41,7 +42,6 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <plat/regs-serial.h>
 #include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/fb.h>
 
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c
index 3df3c372ee1f..4b0199fff9f5 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/fb.h>
 #include <linux/io.h>
@@ -51,7 +52,6 @@
 #include <mach/regs-gpio.h>
 #include <mach/gpio-samsung.h>
 
-#include <plat/regs-serial.h>
 #include <plat/fb.h>
 #include <plat/sdhci.h>
 #include <plat/gpio-cfg.h>
diff --git a/arch/arm/mach-s3c64xx/mach-hmt.c b/arch/arm/mach-s3c64xx/mach-hmt.c
index 0431016925b9..72cee08c8bf5 100644
--- a/arch/arm/mach-s3c64xx/mach-hmt.c
+++ b/arch/arm/mach-s3c64xx/mach-hmt.c
@@ -11,6 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/i2c.h>
@@ -33,7 +34,6 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <plat/regs-serial.h>
 #include <linux/platform_data/i2c-s3c2410.h>
 #include <mach/gpio-samsung.h>
 #include <plat/fb.h>
diff --git a/arch/arm/mach-s3c64xx/mach-mini6410.c b/arch/arm/mach-s3c64xx/mach-mini6410.c
index 8d553a418e1c..9cbc07602ef3 100644
--- a/arch/arm/mach-s3c64xx/mach-mini6410.c
+++ b/arch/arm/mach-s3c64xx/mach-mini6410.c
@@ -22,6 +22,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/types.h>
 
 #include <asm/mach-types.h>
@@ -38,7 +39,6 @@
 #include <plat/fb.h>
 #include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <linux/platform_data/mmc-sdhci-s3c.h>
-#include <plat/regs-serial.h>
 #include <plat/sdhci.h>
 #include <linux/platform_data/touchscreen-s3c2410.h>
 
diff --git a/arch/arm/mach-s3c64xx/mach-ncp.c b/arch/arm/mach-s3c64xx/mach-ncp.c
index 2067b0bf55b4..67f06a9ae656 100644
--- a/arch/arm/mach-s3c64xx/mach-ncp.c
+++ b/arch/arm/mach-s3c64xx/mach-ncp.c
@@ -16,6 +16,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/i2c.h>
@@ -36,7 +37,6 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <plat/regs-serial.h>
 #include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/fb.h>
 
diff --git a/arch/arm/mach-s3c64xx/mach-real6410.c b/arch/arm/mach-s3c64xx/mach-real6410.c
index 5152026f0e19..fbad2af1ef16 100644
--- a/arch/arm/mach-s3c64xx/mach-real6410.c
+++ b/arch/arm/mach-s3c64xx/mach-real6410.c
@@ -23,6 +23,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/platform_device.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/types.h>
 
 #include <asm/mach-types.h>
@@ -38,7 +39,6 @@
 #include <plat/devs.h>
 #include <plat/fb.h>
 #include <linux/platform_data/mtd-nand-s3c2410.h>
-#include <plat/regs-serial.h>
 #include <linux/platform_data/touchscreen-s3c2410.h>
 
 #include <video/platform_lcd.h>
diff --git a/arch/arm/mach-s3c64xx/mach-smartq.c b/arch/arm/mach-s3c64xx/mach-smartq.c
index 6e72bd5c1d0c..78dd6f73c072 100644
--- a/arch/arm/mach-s3c64xx/mach-smartq.c
+++ b/arch/arm/mach-s3c64xx/mach-smartq.c
@@ -16,6 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/pwm_backlight.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/spi/spi_gpio.h>
 #include <linux/usb/gpio_vbus.h>
 #include <linux/platform_data/s3c-hsotg.h>
@@ -33,7 +34,6 @@
 #include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 #include <linux/platform_data/hwmon-s3c.h>
-#include <plat/regs-serial.h>
 #include <linux/platform_data/usb-ohci-s3c2410.h>
 #include <plat/sdhci.h>
 #include <linux/platform_data/touchscreen-s3c2410.h>
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6400.c b/arch/arm/mach-s3c64xx/mach-smdk6400.c
index 150f55fb9e33..c85d1cbe769f 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6400.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6400.c
@@ -16,6 +16,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
 #include <linux/io.h>
@@ -29,8 +30,6 @@
 #include <mach/hardware.h>
 #include <mach/map.h>
 
-#include <plat/regs-serial.h>
-
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c
index 43261d24a0a5..c6a8b2ab0240 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@ -19,6 +19,7 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/i2c.h>
@@ -55,7 +56,6 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 #include <mach/gpio-samsung.h>
 #include <linux/platform_data/ata-samsung_cf.h>
diff --git a/arch/arm/mach-s3c64xx/s3c6400.c b/arch/arm/mach-s3c64xx/s3c6400.c
index 3db0c98222f7..8c42807bf579 100644
--- a/arch/arm/mach-s3c64xx/s3c6400.c
+++ b/arch/arm/mach-s3c64xx/s3c6400.c
@@ -23,6 +23,7 @@
 #include <linux/io.h>
 #include <linux/device.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/of.h>
 
@@ -34,7 +35,6 @@
 #include <asm/irq.h>
 
 #include <plat/cpu-freq.h>
-#include <plat/regs-serial.h>
 #include <mach/regs-clock.h>
 
 #include <plat/cpu.h>
diff --git a/arch/arm/mach-s3c64xx/s3c6410.c b/arch/arm/mach-s3c64xx/s3c6410.c
index 72b2278953a8..5be3f09bac92 100644
--- a/arch/arm/mach-s3c64xx/s3c6410.c
+++ b/arch/arm/mach-s3c64xx/s3c6410.c
@@ -24,6 +24,7 @@
 #include <linux/io.h>
 #include <linux/device.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/of.h>
 
@@ -35,7 +36,6 @@
 #include <asm/irq.h>
 
 #include <plat/cpu-freq.h>
-#include <plat/regs-serial.h>
 #include <mach/regs-clock.h>
 
 #include <plat/cpu.h>
diff --git a/arch/arm/mach-s5p64x0/common.c b/arch/arm/mach-s5p64x0/common.c
index 42e14f2e7ca7..eb2ad14947f4 100644
--- a/arch/arm/mach-s5p64x0/common.c
+++ b/arch/arm/mach-s5p64x0/common.c
@@ -19,6 +19,7 @@
 #include <linux/io.h>
 #include <linux/device.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <clocksource/samsung_pwm.h>
 #include <linux/platform_device.h>
 #include <linux/sched.h>
@@ -50,7 +51,6 @@
 #include <plat/gpio-cfg.h>
 #include <plat/pwm-core.h>
 #include <plat/regs-irqtype.h>
-#include <plat/regs-serial.h>
 #include <plat/watchdog-reset.h>
 
 #include "common.h"
diff --git a/arch/arm/mach-s5p64x0/include/mach/debug-macro.S b/arch/arm/mach-s5p64x0/include/mach/debug-macro.S
index 5e2916fb19a9..8759e7882bcb 100644
--- a/arch/arm/mach-s5p64x0/include/mach/debug-macro.S
+++ b/arch/arm/mach-s5p64x0/include/mach/debug-macro.S
@@ -10,11 +10,10 @@
 
 /* pull in the relevant register and map files. */
 
+#include <linux/serial_s3c.h>
 #include <plat/map-base.h>
 #include <plat/map-s5p.h>
 
-#include <plat/regs-serial.h>
-
         .macro addruart, rp, rv, tmp
                 mov     \rp, #0xE0000000
                 orr     \rp, \rp, #0x00100000
diff --git a/arch/arm/mach-s5p64x0/irq-pm.c b/arch/arm/mach-s5p64x0/irq-pm.c
index 3e6f2456ee9d..1c83d2899625 100644
--- a/arch/arm/mach-s5p64x0/irq-pm.c
+++ b/arch/arm/mach-s5p64x0/irq-pm.c
@@ -14,9 +14,9 @@
 
 #include <linux/syscore_ops.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/io.h>
 
-#include <plat/regs-serial.h>
 #include <plat/pm.h>
 
 #include <mach/regs-gpio.h>
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6440.c b/arch/arm/mach-s5p64x0/mach-smdk6440.c
index 9efdcc03df3b..6840e197cb2d 100644
--- a/arch/arm/mach-s5p64x0/mach-smdk6440.c
+++ b/arch/arm/mach-s5p64x0/mach-smdk6440.c
@@ -17,6 +17,7 @@
 #include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/module.h>
@@ -39,7 +40,6 @@
 #include <mach/regs-clock.h>
 #include <mach/regs-gpio.h>
 
-#include <plat/regs-serial.h>
 #include <plat/gpio-cfg.h>
 #include <plat/clock.h>
 #include <plat/devs.h>
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-s5p64x0/mach-smdk6450.c
index c3cacc067efe..fa1341c074ca 100644
--- a/arch/arm/mach-s5p64x0/mach-smdk6450.c
+++ b/arch/arm/mach-s5p64x0/mach-smdk6450.c
@@ -17,6 +17,7 @@
 #include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/module.h>
@@ -39,7 +40,6 @@
 #include <mach/regs-clock.h>
 #include <mach/regs-gpio.h>
 
-#include <plat/regs-serial.h>
 #include <plat/gpio-cfg.h>
 #include <plat/clock.h>
 #include <plat/devs.h>
diff --git a/arch/arm/mach-s5pc100/common.c b/arch/arm/mach-s5pc100/common.c
index c5a8eeacf81c..6a41bf7dacf6 100644
--- a/arch/arm/mach-s5pc100/common.c
+++ b/arch/arm/mach-s5pc100/common.c
@@ -22,6 +22,7 @@
 #include <linux/io.h>
 #include <linux/device.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <clocksource/samsung_pwm.h>
 #include <linux/platform_device.h>
 #include <linux/sched.h>
@@ -49,7 +50,6 @@
 #include <plat/onenand-core.h>
 #include <plat/pwm-core.h>
 #include <plat/spi-core.h>
-#include <plat/regs-serial.h>
 #include <plat/watchdog-reset.h>
 
 #include "common.h"
diff --git a/arch/arm/mach-s5pc100/include/mach/debug-macro.S b/arch/arm/mach-s5pc100/include/mach/debug-macro.S
index 66cb7f16bf2a..22c23859e45e 100644
--- a/arch/arm/mach-s5pc100/include/mach/debug-macro.S
+++ b/arch/arm/mach-s5pc100/include/mach/debug-macro.S
@@ -13,8 +13,8 @@
 
 /* pull in the relevant register and map files. */
 
+#include <linux/serial_s3c.h>
 #include <mach/map.h>
-#include <plat/regs-serial.h>
 
         /* note, for the boot process to work we have to keep the UART
          * virtual address aligned to an 1MiB boundary for the L1
diff --git a/arch/arm/mach-s5pc100/include/mach/tick.h b/arch/arm/mach-s5pc100/include/mach/tick.h
deleted file mode 100644
index 0af8e41230ed..000000000000
--- a/arch/arm/mach-s5pc100/include/mach/tick.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* linux/arch/arm/mach-s5pc100/include/mach/tick.h
- *
- * Copyright 2009 Samsung Electronics Co.
- *      Byungho Min <bhmin@samsung.com>
- *
- * S3C64XX - Timer tick support definitions
- *
- * Based on mach-s3c6400/include/mach/tick.h
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#ifndef __ASM_ARCH_TICK_H
-#define __ASM_ARCH_TICK_H __FILE__
-
-#include <linux/irqchip/arm-vic.h>
-
-/* note, the timer interrutps turn up in 2 places, the vic and then
- * the timer block. We take the VIC as the base at the moment.
- */
-static inline u32 s3c24xx_ostimer_pending(void)
-{
-        u32 pend = __raw_readl(VA_VIC0 + VIC_RAW_STATUS);
-        return pend & (1 << (IRQ_TIMER4_VIC - S5P_IRQ_VIC0(0)));
-}
-
-#define TICK_MAX        (0xffffffff)
-
-#endif /* __ASM_ARCH_TICK_H */
diff --git a/arch/arm/mach-s5pc100/mach-smdkc100.c b/arch/arm/mach-s5pc100/mach-smdkc100.c
index 9e256b9fc930..668af3ac31f3 100644
--- a/arch/arm/mach-s5pc100/mach-smdkc100.c
+++ b/arch/arm/mach-s5pc100/mach-smdkc100.c
@@ -16,6 +16,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/gpio.h>
@@ -37,7 +38,6 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <plat/regs-serial.h>
 #include <plat/gpio-cfg.h>
 
 #include <plat/clock.h>
diff --git a/arch/arm/mach-s5pv210/common.c b/arch/arm/mach-s5pv210/common.c
index 26027a29b8a1..7024dcd0e40a 100644
--- a/arch/arm/mach-s5pv210/common.c
+++ b/arch/arm/mach-s5pv210/common.c
@@ -24,6 +24,7 @@
 #include <linux/sched.h>
 #include <linux/dma-mapping.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 
 #include <asm/proc-fns.h>
 #include <asm/mach/arch.h>
@@ -46,7 +47,6 @@
 #include <plat/pwm-core.h>
 #include <plat/tv-core.h>
 #include <plat/spi-core.h>
-#include <plat/regs-serial.h>
 
 #include "common.h"
 
diff --git a/arch/arm/mach-s5pv210/include/mach/debug-macro.S b/arch/arm/mach-s5pv210/include/mach/debug-macro.S
index 80c21996c943..30b511a580aa 100644
--- a/arch/arm/mach-s5pv210/include/mach/debug-macro.S
+++ b/arch/arm/mach-s5pv210/include/mach/debug-macro.S
@@ -12,8 +12,8 @@
 
 /* pull in the relevant register and map files. */
 
+#include <linux/serial_s3c.h>
 #include <mach/map.h>
-#include <plat/regs-serial.h>
 
         /* note, for the boot process to work we have to keep the UART
          * virtual address aligned to an 1MiB boundary for the L1
diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c
index ad40ab0f5dbd..cc37edacda26 100644
--- a/arch/arm/mach-s5pv210/mach-aquila.c
+++ b/arch/arm/mach-s5pv210/mach-aquila.c
@@ -12,6 +12,7 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/fb.h>
 #include <linux/i2c.h>
 #include <linux/i2c-gpio.h>
@@ -32,7 +33,6 @@
 #include <mach/regs-clock.h>
 
 #include <plat/gpio-cfg.h>
-#include <plat/regs-serial.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/fb.h>
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index e5cd9fbf19e9..b41a38a75844 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -12,6 +12,7 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/fb.h>
 #include <linux/i2c.h>
 #include <linux/i2c-gpio.h>
@@ -39,7 +40,6 @@
 #include <mach/regs-clock.h>
 
 #include <plat/gpio-cfg.h>
-#include <plat/regs-serial.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/fb.h>
diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c b/arch/arm/mach-s5pv210/mach-smdkc110.c
index 7c0ed07a78a3..448e1d2eeed6 100644
--- a/arch/arm/mach-s5pv210/mach-smdkc110.c
+++ b/arch/arm/mach-s5pv210/mach-smdkc110.c
@@ -12,6 +12,7 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/i2c.h>
 #include <linux/device.h>
 
@@ -23,7 +24,6 @@
 #include <mach/map.h>
 #include <mach/regs-clock.h>
 
-#include <plat/regs-serial.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <linux/platform_data/ata-samsung_cf.h>
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c
index f52cc15c2d85..2a6655fb63e7 100644
--- a/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
@@ -13,6 +13,7 @@
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/device.h>
 #include <linux/dm9000.h>
 #include <linux/fb.h>
@@ -32,7 +33,6 @@
 #include <mach/map.h>
 #include <mach/regs-clock.h>
 
-#include <plat/regs-serial.h>
 #include <plat/regs-srom.h>
 #include <plat/gpio-cfg.h>
 #include <plat/devs.h>
diff --git a/arch/arm/mach-s5pv210/mach-torbreck.c b/arch/arm/mach-s5pv210/mach-torbreck.c
index 579afe89842a..157805529f26 100644
--- a/arch/arm/mach-s5pv210/mach-torbreck.c
+++ b/arch/arm/mach-s5pv210/mach-torbreck.c
@@ -13,6 +13,7 @@
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -22,7 +23,6 @@
 #include <mach/map.h>
 #include <mach/regs-clock.h>
 
-#include <plat/regs-serial.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <linux/platform_data/i2c-s3c2410.h>
diff --git a/arch/arm/plat-samsung/clock.c b/arch/arm/plat-samsung/clock.c
index 47c9fad43f00..ddfebddb4105 100644
--- a/arch/arm/plat-samsung/clock.c
+++ b/arch/arm/plat-samsung/clock.c
@@ -52,7 +52,7 @@
 #include <plat/cpu.h>
 
 #include <linux/serial_core.h>
-#include <plat/regs-serial.h> /* for s3c24xx_uart_devs */
+#include <linux/serial_s3c.h> /* for s3c24xx_uart_devs */
 
 /* clock information */
 
diff --git a/arch/arm/plat-samsung/cpu.c b/arch/arm/plat-samsung/cpu.c
index 46b426e8aff5..364963a0a344 100644
--- a/arch/arm/plat-samsung/cpu.c
+++ b/arch/arm/plat-samsung/cpu.c
@@ -28,13 +28,6 @@ unsigned int samsung_rev(void)
 }
 EXPORT_SYMBOL(samsung_rev);
 
-void __init s3c24xx_init_cpu(void)
-{
-        /* nothing here yet */
-
-        samsung_cpu_rev = 0;
-}
-
 void __init s3c64xx_init_cpu(void)
 {
         samsung_cpu_id = __raw_readl(S3C_VA_SYS + 0x118);
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c
index ac07e871f6a7..c64a39ac1b04 100644
--- a/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c
@@ -18,6 +18,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/slab.h>
@@ -64,7 +65,6 @@
 #include <linux/platform_data/usb-s3c2410_udc.h>
 #include <linux/platform_data/usb-ohci-s3c2410.h>
 #include <plat/usb-phy.h>
-#include <plat/regs-serial.h>
 #include <plat/regs-spi.h>
 #include <linux/platform_data/spi-s3c64xx.h>
 
@@ -744,10 +744,7 @@ void __init s5p_i2c_hdmiphy_set_platdata(struct s3c2410_platform_i2c *pd)
         if (!pd) {
                 pd = &default_i2c_data;
 
-                if (soc_is_exynos4210() ||
-                    soc_is_exynos4212() || soc_is_exynos4412())
-                        pd->bus_num = 8;
-                else if (soc_is_s5pv210())
+                if (soc_is_s5pv210())
                         pd->bus_num = 3;
                 else
                         pd->bus_num = 0;
@@ -764,10 +761,7 @@ void __init s5p_hdmi_set_platdata(struct i2c_board_info *hdmiphy_info,
 {
         struct s5p_hdmi_platform_data *pd = &s5p_hdmi_def_platdata;
 
-        if (soc_is_exynos4210() ||
-            soc_is_exynos4212() || soc_is_exynos4412())
-                pd->hdmiphy_bus = 8;
-        else if (soc_is_s5pv210())
+        if (soc_is_s5pv210())
                 pd->hdmiphy_bus = 3;
         else
                 pd->hdmiphy_bus = 0;
diff --git a/arch/arm/plat-samsung/include/plat/cpu.h b/arch/arm/plat-samsung/include/plat/cpu.h
index 335beb341355..31164b34d4c4 100644
--- a/arch/arm/plat-samsung/include/plat/cpu.h
+++ b/arch/arm/plat-samsung/include/plat/cpu.h
@@ -199,7 +199,6 @@ extern void s5p_init_irq(u32 *vic, u32 num_vic);
 
 extern void s3c24xx_init_io(struct map_desc *mach_desc, int size);
 
-extern void s3c24xx_init_cpu(void);
 extern void s3c64xx_init_cpu(void);
 extern void s5p_init_cpu(void __iomem *cpuid_addr);
 
diff --git a/arch/arm/plat-samsung/include/plat/regs-serial.h b/arch/arm/plat-samsung/include/plat/regs-serial.h
deleted file mode 100644
index f05f2afa440d..000000000000
--- a/arch/arm/plat-samsung/include/plat/regs-serial.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <linux/serial_s3c.h>
diff --git a/arch/arm/plat-samsung/include/plat/uncompress.h b/arch/arm/plat-samsung/include/plat/uncompress.h
index f48dc0a4736c..61054fd88d43 100644
--- a/arch/arm/plat-samsung/include/plat/uncompress.h
+++ b/arch/arm/plat-samsung/include/plat/uncompress.h
@@ -29,7 +29,7 @@ static void arch_detect_cpu(void);
 
 /* defines for UART registers */
 
-#include <plat/regs-serial.h>
+#include <linux/serial_s3c.h>
 
 /* working in physical space... */
 #define S3C_WDOGREG(x)  ((S3C_PA_WDT + (x)))
diff --git a/arch/arm/plat-samsung/init.c b/arch/arm/plat-samsung/init.c
index aa9511b6914a..0ffc84aaf60e 100644
--- a/arch/arm/plat-samsung/init.c
+++ b/arch/arm/plat-samsung/init.c
@@ -21,6 +21,7 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/of.h>
 
@@ -33,8 +34,6 @@
 #include <plat/devs.h>
 #include <plat/clock.h>
 
-#include <plat/regs-serial.h>
-
 static struct cpu_table *cpu;
 
 static struct cpu_table * __init s3c_lookup_cpu(unsigned long idcode,
diff --git a/arch/arm/plat-samsung/pm-gpio.c b/arch/arm/plat-samsung/pm-gpio.c
index dd4c15d0d68f..da268813901b 100644
--- a/arch/arm/plat-samsung/pm-gpio.c
+++ b/arch/arm/plat-samsung/pm-gpio.c
@@ -196,8 +196,7 @@ struct samsung_gpio_pm samsung_gpio_pm_2bit = {
         .resume = samsung_gpio_pm_2bit_resume,
 };
 
-#if defined(CONFIG_ARCH_S3C64XX) || defined(CONFIG_PLAT_S5P) \
-        || defined(CONFIG_ARCH_EXYNOS)
+#if defined(CONFIG_ARCH_S3C64XX) || defined(CONFIG_PLAT_S5P)
 static void samsung_gpio_pm_4bit_save(struct samsung_gpio_chip *chip)
 {
         chip->pm_save[1] = __raw_readl(chip->base + OFFS_CON);
@@ -307,7 +306,7 @@ struct samsung_gpio_pm samsung_gpio_pm_4bit = {
         .save   = samsung_gpio_pm_4bit_save,
         .resume = samsung_gpio_pm_4bit_resume,
 };
-#endif /* CONFIG_ARCH_S3C64XX || CONFIG_PLAT_S5P || CONFIG_ARCH_EXYNOS */
+#endif /* CONFIG_ARCH_S3C64XX || CONFIG_PLAT_S5P */
 
 /**
  * samsung_pm_save_gpio() - save gpio chip data for suspend
diff --git a/arch/arm/plat-samsung/pm.c b/arch/arm/plat-samsung/pm.c
index e5b0f2c2d884..ae9baa2d6381 100644
--- a/arch/arm/plat-samsung/pm.c
+++ b/arch/arm/plat-samsung/pm.c
@@ -18,13 +18,12 @@
 #include <linux/delay.h>
 #include <linux/of.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/io.h>
 
 #include <asm/cacheflush.h>
 #include <asm/suspend.h>
 
-#include <plat/regs-serial.h>
-
 #ifdef CONFIG_SAMSUNG_ATAGS
 #include <mach/hardware.h>
 #include <mach/map.h>
diff --git a/arch/arm/plat-samsung/s5p-irq-pm.c b/arch/arm/plat-samsung/s5p-irq-pm.c
index 591498035916..52b16943617e 100644
--- a/arch/arm/plat-samsung/s5p-irq-pm.c
+++ b/arch/arm/plat-samsung/s5p-irq-pm.c
@@ -22,10 +22,7 @@
 #include <mach/map.h>
 
 #include <mach/regs-gpio.h>
-
-#ifndef CONFIG_ARCH_EXYNOS
 #include <mach/regs-irq.h>
-#endif
 
 /* state for IRQs over sleep */
 
@@ -43,18 +40,8 @@ int s3c_irq_wake(struct irq_data *data, unsigned int state)
         unsigned long irqbit;
         unsigned int irq_rtc_tic, irq_rtc_alarm;
 
-#ifdef CONFIG_ARCH_EXYNOS
-        if (soc_is_exynos5250()) {
-                irq_rtc_tic = EXYNOS5_IRQ_RTC_TIC;
-                irq_rtc_alarm = EXYNOS5_IRQ_RTC_ALARM;
-        } else {
-                irq_rtc_tic = EXYNOS4_IRQ_RTC_TIC;
-                irq_rtc_alarm = EXYNOS4_IRQ_RTC_ALARM;
-        }
-#else
         irq_rtc_tic = IRQ_RTC_TIC;
         irq_rtc_alarm = IRQ_RTC_ALARM;
-#endif
 
         if (data->irq == irq_rtc_tic || data->irq == irq_rtc_alarm) {
                 irqbit = 1 << (data->irq + 1 - irq_rtc_alarm);