1 files changed, 15 insertions, 63 deletions

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 964158c1844f..41cd625b6020 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -17,14 +17,13 @@
  * published by the Free Software Foundation.
 */
 
-#include "skeleton.dtsi"
+#include "exynos5.dtsi"
 #include "exynos5250-pinctrl.dtsi"
 
 #include <dt-bindings/clk/exynos-audss-clk.h>
 
 / {
         compatible = "samsung,exynos5250";
-        interrupt-parent = <&gic>;
 
         aliases {
                 spi0 = &spi_0;
@@ -53,9 +52,20 @@
                 pinctrl3 = &pinctrl_3;
         };
 
-        chipid@10000000 {
-                compatible = "samsung,exynos4210-chipid";
-                reg = <0x10000000 0x100>;
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu@0 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a15";
+                        reg = <0>;
+                };
+                cpu@1 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a15";
+                        reg = <1>;
+                };
         };
 
         pd_gsc: gsc-power-domain@0x10044000 {
@@ -80,17 +90,6 @@
                 #clock-cells = <1>;
         };
 
-        gic:interrupt-controller@10481000 {
-                compatible = "arm,cortex-a15-gic", "arm,cortex-a9-gic";
-                #interrupt-cells = <3>;
-                interrupt-controller;
-                reg = <0x10481000 0x1000>,
-                      <0x10482000 0x1000>,
-                      <0x10484000 0x2000>,
-                      <0x10486000 0x2000>;
-                interrupts = <1 9 0xf04>;
-        };
-
         timer {
                 compatible = "arm,armv7-timer";
                 interrupts = <1 13 0xf08>,
@@ -99,22 +98,6 @@
                              <1 10 0xf08>;
         };
 
-        combiner:interrupt-controller@10440000 {
-                compatible = "samsung,exynos4210-combiner";
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                samsung,combiner-nr = <32>;
-                reg = <0x10440000 0x1000>;
-                interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>,
-                             <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>,
-                             <0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>,
-                             <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>,
-                             <0 16 0>, <0 17 0>, <0 18 0>, <0 19 0>,
-                             <0 20 0>, <0 21 0>, <0 22 0>, <0 23 0>,
-                             <0 24 0>, <0 25 0>, <0 26 0>, <0 27 0>,
-                             <0 28 0>, <0 29 0>, <0 30 0>, <0 31 0>;
-        };
-
         mct@101C0000 {
                 compatible = "samsung,exynos4210-mct";
                 reg = <0x101C0000 0x800>;
@@ -176,9 +159,6 @@
         };
 
         watchdog {
-                compatible = "samsung,s3c2410-wdt";
-                reg = <0x101D0000 0x100>;
-                interrupts = <0 42 0>;
                 clocks = <&clock 336>;
                 clock-names = "watchdog";
         };
@@ -191,12 +171,8 @@
         };
 
         rtc {
-                compatible = "samsung,s3c6410-rtc";
-                reg = <0x101E0000 0x100>;
-                interrupts = <0 43 0>, <0 44 0>;
                 clocks = <&clock 337>;
                 clock-names = "rtc";
-                status = "disabled";
         };
 
         tmu@10060000 {
@@ -208,33 +184,21 @@
         };
 
         serial@12C00000 {
-                compatible = "samsung,exynos4210-uart";
-                reg = <0x12C00000 0x100>;
-                interrupts = <0 51 0>;
                 clocks = <&clock 289>, <&clock 146>;
                 clock-names = "uart", "clk_uart_baud0";
         };
 
         serial@12C10000 {
-                compatible = "samsung,exynos4210-uart";
-                reg = <0x12C10000 0x100>;
-                interrupts = <0 52 0>;
                 clocks = <&clock 290>, <&clock 147>;
                 clock-names = "uart", "clk_uart_baud0";
         };
 
         serial@12C20000 {
-                compatible = "samsung,exynos4210-uart";
-                reg = <0x12C20000 0x100>;
-                interrupts = <0 53 0>;
                 clocks = <&clock 291>, <&clock 148>;
                 clock-names = "uart", "clk_uart_baud0";
         };
 
         serial@12C30000 {
-                compatible = "samsung,exynos4210-uart";
-                reg = <0x12C30000 0x100>;
-                interrupts = <0 54 0>;
                 clocks = <&clock 292>, <&clock 149>;
                 clock-names = "uart", "clk_uart_baud0";
         };
@@ -413,31 +377,19 @@
         };
 
         dwmmc_0: dwmmc0@12200000 {
-                compatible = "samsung,exynos5250-dw-mshc";
                 reg = <0x12200000 0x1000>;
-                interrupts = <0 75 0>;
-                #address-cells = <1>;
-                #size-cells = <0>;
                 clocks = <&clock 280>, <&clock 139>;
                 clock-names = "biu", "ciu";
         };
 
         dwmmc_1: dwmmc1@12210000 {
-                compatible = "samsung,exynos5250-dw-mshc";
                 reg = <0x12210000 0x1000>;
-                interrupts = <0 76 0>;
-                #address-cells = <1>;
-                #size-cells = <0>;
                 clocks = <&clock 281>, <&clock 140>;
                 clock-names = "biu", "ciu";
         };
 
         dwmmc_2: dwmmc2@12220000 {
-                compatible = "samsung,exynos5250-dw-mshc";
                 reg = <0x12220000 0x1000>;
-                interrupts = <0 77 0>;
-                #address-cells = <1>;
-                #size-cells = <0>;
                 clocks = <&clock 282>, <&clock 141>;
                 clock-names = "biu", "ciu";
         };