Merge tag 'samsung-dt-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt

Pull "Samsung DeviceTree update for v4.9, second round" from Krzysztof Kozłowski:

1. Enable HDMI on Arndale Octa board.
2. Update list of clocks for FIMC-IS block on Exynos4x12.
3. Remove skeleton.dtsi thus fixing DT compiler warning:
	"Node /memory has a reg or ranges property, but no unit name"
   This is a tree-wide effort by various people. Javier Martinez Canillas did
   it for Exynos and S5PV210.

* tag 'samsung-dt-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: s5p: Add missing unit name to memory nodes for S5PV210 boards
  ARM: dts: s5p: Remove skeleton.dtsi inclusion for S5PV210
  ARM: dts: exynos: Add missing unit name to memory nodes in Exynos5 DTS
  ARM: dts: exynos: Add missing unit name to memory nodes in Exynos4 DTS
  ARM: dts: exynos: Add missing unit name to memory nodes in Exynos3 DTS
  ARM: dts: exynos: Remove skeleton.dtsi usage for Exynos5
  ARM: dts: exynos: Remove skeleton.dtsi usage for Exynos4
  ARM: dts: exynos: Remove skeleton.dtsi usage for Exynos3
  ARM: dts: exynos: Add missing memory node for Exynos5440 boards
  ARM: dts: exynos: Add all required FIMC-IS clocks to exynos4x12
  ARM: dts: exynos: Enable HDMI for Arndale Octa board

42 files changed, 101 insertions, 41 deletions

diff --git a/arch/arm/boot/dts/exynos3250-artik5.dtsi b/arch/arm/boot/dts/exynos3250-artik5.dtsi
index 130e946f1414..a70819b1b739 100644
--- a/arch/arm/boot/dts/exynos3250-artik5.dtsi
+++ b/arch/arm/boot/dts/exynos3250-artik5.dtsi
@@ -24,7 +24,8 @@
                 stdout-path = &serial_2;
         };
 
-        memory {
+        memory@40000000 {
+                device_type = "memory";
                 reg = <0x40000000 0x1ff00000>;
         };
 
diff --git a/arch/arm/boot/dts/exynos3250-monk.dts b/arch/arm/boot/dts/exynos3250-monk.dts
index 8c8906266310..66f04f6ba6bb 100644
--- a/arch/arm/boot/dts/exynos3250-monk.dts
+++ b/arch/arm/boot/dts/exynos3250-monk.dts
@@ -27,7 +27,8 @@
                 i2c7 = &i2c_max77836;
         };
 
-        memory {
+        memory@40000000 {
+                device_type = "memory";
                 reg =  <0x40000000 0x1ff00000>;
         };
 
diff --git a/arch/arm/boot/dts/exynos3250-rinato.dts b/arch/arm/boot/dts/exynos3250-rinato.dts
index a92181368e5b..3967ee5f7752 100644
--- a/arch/arm/boot/dts/exynos3250-rinato.dts
+++ b/arch/arm/boot/dts/exynos3250-rinato.dts
@@ -27,7 +27,8 @@
                 i2c7 = &i2c_max77836;
         };
 
-        memory {
+        memory@40000000 {
+                device_type = "memory";
                 reg =  <0x40000000 0x1ff00000>;
         };
 
diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
index 70e3aceab3a9..e9d2556c0dfd 100644
--- a/arch/arm/boot/dts/exynos3250.dtsi
+++ b/arch/arm/boot/dts/exynos3250.dtsi
@@ -17,7 +17,6 @@
  * published by the Free Software Foundation.
  */
 
-#include "skeleton.dtsi"
 #include "exynos4-cpu-thermal.dtsi"
 #include "exynos-syscon-restart.dtsi"
 #include <dt-bindings/clock/exynos3250.h>
@@ -25,6 +24,8 @@
 / {
         compatible = "samsung,exynos3250";
         interrupt-parent = <&gic>;
+        #address-cells = <1>;
+        #size-cells = <1>;
 
         aliases {
                 pinctrl0 = &pinctrl_0;
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 32f22e12c70b..5f034eb5a5e2 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -21,11 +21,12 @@
 
 #include <dt-bindings/clock/exynos4.h>
 #include <dt-bindings/clock/exynos-audss-clk.h>
-#include "skeleton.dtsi"
 #include "exynos-syscon-restart.dtsi"
 
 / {
         interrupt-parent = <&gic>;
+        #address-cells = <1>;
+        #size-cells = <1>;
 
         aliases {
                 spi0 = &spi_0;
diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts
index be2751eebaf8..a2c6a13fe67b 100644
--- a/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -24,7 +24,8 @@
         model = "Insignal Origen evaluation board based on Exynos4210";
         compatible = "insignal,origen", "samsung,exynos4210", "samsung,exynos4";
 
-        memory {
+        memory@40000000 {
+                device_type = "memory";
                 reg = <0x40000000 0x10000000
                        0x50000000 0x10000000
                        0x60000000 0x10000000
diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts
index 847fae3dd1f1..af6ef3e6214d 100644
--- a/arch/arm/boot/dts/exynos4210-smdkv310.dts
+++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts
@@ -23,7 +23,8 @@
         model = "Samsung smdkv310 evaluation board based on Exynos4210";
         compatible = "samsung,smdkv310", "samsung,exynos4210", "samsung,exynos4";
 
-        memory {
+        memory@40000000 {
+                device_type = "memory";
                 reg = <0x40000000 0x80000000>;
         };
 
diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts
index 79d983036560..0ca1b4d355f2 100644
--- a/arch/arm/boot/dts/exynos4210-trats.dts
+++ b/arch/arm/boot/dts/exynos4210-trats.dts
@@ -20,7 +20,8 @@
         model = "Samsung Trats based on Exynos4210";
         compatible = "samsung,trats", "samsung,exynos4210", "samsung,exynos4";
 
-        memory {
+        memory@40000000 {
+                device_type = "memory";
                 reg =  <0x40000000 0x10000000
                         0x50000000 0x10000000
                         0x60000000 0x10000000
diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts
index cf95202fa310..f1172be318cd 100644
--- a/arch/arm/boot/dts/exynos4210-universal_c210.dts
+++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts
@@ -20,7 +20,8 @@
         model = "Samsung Universal C210 based on Exynos4210 rev0";
         compatible = "samsung,universal_c210", "samsung,exynos4210", "samsung,exynos4";
 
-        memory {
+        memory@40000000 {
+                device_type = "memory";
                 reg =  <0x40000000 0x10000000
                         0x50000000 0x10000000>;
         };
diff --git a/arch/arm/boot/dts/exynos4412-odroidu3.dts b/arch/arm/boot/dts/exynos4412-odroidu3.dts
index d73aa6c58fe3..99634c54dca9 100644
--- a/arch/arm/boot/dts/exynos4412-odroidu3.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidu3.dts
@@ -18,7 +18,8 @@
         model = "Hardkernel ODROID-U3 board based on Exynos4412";
         compatible = "hardkernel,odroid-u3", "samsung,exynos4412", "samsung,exynos4";
 
-        memory {
+        memory@40000000 {
+                device_type = "memory";
                 reg = <0x40000000 0x7FF00000>;
         };
 
diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts
index 2af235151301..d0a07673ae8b 100644
--- a/arch/arm/boot/dts/exynos4412-odroidx.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx.dts
@@ -18,7 +18,8 @@
         model = "Hardkernel ODROID-X board based on Exynos4412";
         compatible = "hardkernel,odroid-x", "samsung,exynos4412", "samsung,exynos4";
 
-        memory {
+        memory@40000000 {
+                device_type = "memory";
                 reg = <0x40000000 0x3FF00000>;
         };
 
diff --git a/arch/arm/boot/dts/exynos4412-odroidx2.dts b/arch/arm/boot/dts/exynos4412-odroidx2.dts
index 3e3584270e00..4d228858f172 100644
--- a/arch/arm/boot/dts/exynos4412-odroidx2.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx2.dts
@@ -17,7 +17,8 @@
         model = "Hardkernel ODROID-X2 board based on Exynos4412";
         compatible = "hardkernel,odroid-x2", "samsung,exynos4412", "samsung,exynos4";
 
-        memory {
+        memory@40000000 {
+                device_type = "memory";
                 reg = <0x40000000 0x7FF00000>;
         };
 };
diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index 26a36fed9652..54a9f6906ed2 100644
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -22,7 +22,8 @@
         model = "Insignal Origen evaluation board based on Exynos4412";
         compatible = "insignal,origen4412", "samsung,exynos4412", "samsung,exynos4";
 
-        memory {
+        memory@40000000 {
+                device_type = "memory";
                 reg = <0x40000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/exynos4412-smdk4412.dts b/arch/arm/boot/dts/exynos4412-smdk4412.dts
index 231ffbdbf9d0..2e208d84ff6a 100644
--- a/arch/arm/boot/dts/exynos4412-smdk4412.dts
+++ b/arch/arm/boot/dts/exynos4412-smdk4412.dts
@@ -20,7 +20,8 @@
         model = "Samsung SMDK evaluation board based on Exynos4412";
         compatible = "samsung,smdk4412", "samsung,exynos4412", "samsung,exynos4";
 
-        memory {
+        memory@40000000 {
+                device_type = "memory";
                 reg = <0x40000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/exynos4412-tiny4412.dts b/arch/arm/boot/dts/exynos4412-tiny4412.dts
index 4840bbdaa9ec..5504398e6e37 100644
--- a/arch/arm/boot/dts/exynos4412-tiny4412.dts
+++ b/arch/arm/boot/dts/exynos4412-tiny4412.dts
@@ -23,7 +23,8 @@
                 stdout-path = &serial_0;
         };
 
-        memory {
+        memory@40000000 {
+                device_type = "memory";
                 reg = <0x40000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index 129e973a06a6..41ecd6d465a7 100644
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -30,7 +30,8 @@
                 i2c12 = &i2c_max77693_fuel;
         };
 
-        memory {
+        memory@40000000 {
+                device_type = "memory";
                 reg =  <0x40000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/exynos4415.dtsi b/arch/arm/boot/dts/exynos4415.dtsi
index 28b04b6795c9..3c40f8a956dd 100644
--- a/arch/arm/boot/dts/exynos4415.dtsi
+++ b/arch/arm/boot/dts/exynos4415.dtsi
@@ -16,13 +16,14 @@
  * published by the Free Software Foundation.
  */
 
-#include "skeleton.dtsi"
 #include <dt-bindings/clock/exynos4415.h>
 #include <dt-bindings/clock/exynos-audss-clk.h>
 
 / {
         compatible = "samsung,exynos4415";
         interrupt-parent = <&gic>;
+        #address-cells = <1>;
+        #size-cells = <1>;
 
         aliases {
                 pinctrl0 = &pinctrl_0;
diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi
index c452499ae8c9..3394bdcf10ae 100644
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@ -157,7 +157,9 @@
                                  <&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_GICISP>, <&clock CLK_MCUCTL_ISP>,
+                                 <&clock CLK_PWM_ISP>,
+                                 <&clock CLK_DIV_ISP0>, <&clock CLK_DIV_ISP1>,
                                  <&clock CLK_DIV_MCUISP0>,
                                  <&clock CLK_DIV_MCUISP1>,
                                  <&clock CLK_UART_ISP_SCLK>,
@@ -167,6 +169,7 @@
                         clock-names = "lite0", "lite1", "ppmuispx",
                                       "ppmuispmx", "mpll", "isp",
                                       "drc", "fd", "mcuisp",
+                                      "gicisp", "mcuctl_isp", "pwm_isp",
                                       "ispdiv0", "ispdiv1", "mcuispdiv0",
                                       "mcuispdiv1", "uart", "aclk200",
                                       "div_aclk200", "aclk400mcuisp",
diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi
index cab91782e20c..8f06609879f5 100644
--- a/arch/arm/boot/dts/exynos5.dtsi
+++ b/arch/arm/boot/dts/exynos5.dtsi
@@ -13,11 +13,12 @@
  * published by the Free Software Foundation.
  */
 
-#include "skeleton.dtsi"
 #include "exynos-syscon-restart.dtsi"
 
 / {
         interrupt-parent = <&gic>;
+        #address-cells = <1>;
+        #size-cells = <1>;
 
         aliases {
                 i2c0 = &i2c_0;
diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index 3d981f32874d..6098dacd09f1 100644
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -20,7 +20,8 @@
         model = "Insignal Arndale evaluation board based on EXYNOS5250";
         compatible = "insignal,arndale", "samsung,exynos5250", "samsung,exynos5";
 
-        memory {
+        memory@40000000 {
+                device_type = "memory";
                 reg = <0x40000000 0x80000000>;
         };
 
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 7f27263728a1..124e7bf1ed97 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -22,7 +22,8 @@
         aliases {
         };
 
-        memory {
+        memory@40000000 {
+                device_type = "memory";
                 reg = <0x40000000 0x80000000>;
         };
 
diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
index 1055d25c0ccc..9ddf5d2701c2 100644
--- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi
+++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
@@ -19,7 +19,8 @@
                 i2c104 = &i2c_104;
         };
 
-        memory {
+        memory@40000000 {
+                device_type = "memory";
                 reg = <0x40000000 0x80000000>;
         };
 
diff --git a/arch/arm/boot/dts/exynos5250-spring.dts b/arch/arm/boot/dts/exynos5250-spring.dts
index 1d52a79b2f18..103d8f94e1da 100644
--- a/arch/arm/boot/dts/exynos5250-spring.dts
+++ b/arch/arm/boot/dts/exynos5250-spring.dts
@@ -20,7 +20,8 @@
         model = "Google Spring";
         compatible = "google,spring", "samsung,exynos5250", "samsung,exynos5";
 
-        memory {
+        memory@40000000 {
+                device_type = "memory";
                 reg = <0x40000000 0x80000000>;
         };
 
diff --git a/arch/arm/boot/dts/exynos5260-xyref5260.dts b/arch/arm/boot/dts/exynos5260-xyref5260.dts
index 3daef94bee38..d75685cad627 100644
--- a/arch/arm/boot/dts/exynos5260-xyref5260.dts
+++ b/arch/arm/boot/dts/exynos5260-xyref5260.dts
@@ -16,7 +16,8 @@
         model = "SAMSUNG XYREF5260 board based on EXYNOS5260";
         compatible = "samsung,xyref5260", "samsung,exynos5260", "samsung,exynos5";
 
-        memory {
+        memory@20000000 {
+                device_type = "memory";
                 reg = <0x20000000 0x80000000>;
         };
 
diff --git a/arch/arm/boot/dts/exynos5260.dtsi b/arch/arm/boot/dts/exynos5260.dtsi
index 36da38e29000..a86a4898d077 100644
--- a/arch/arm/boot/dts/exynos5260.dtsi
+++ b/arch/arm/boot/dts/exynos5260.dtsi
@@ -9,13 +9,13 @@
  * published by the Free Software Foundation.
 */
 
-#include "skeleton.dtsi"
-
 #include <dt-bindings/clock/exynos5260-clk.h>
 
 / {
         compatible = "samsung,exynos5260", "samsung,exynos5";
         interrupt-parent = <&gic>;
+        #address-cells = <1>;
+        #size-cells = <1>;
 
         aliases {
                 pinctrl0 = &pinctrl_0;
diff --git a/arch/arm/boot/dts/exynos5410-odroidxu.dts b/arch/arm/boot/dts/exynos5410-odroidxu.dts
index 3912969ec223..8bc924457af6 100644
--- a/arch/arm/boot/dts/exynos5410-odroidxu.dts
+++ b/arch/arm/boot/dts/exynos5410-odroidxu.dts
@@ -21,7 +21,8 @@
         model = "Hardkernel Odroid XU";
         compatible = "hardkernel,odroid-xu", "samsung,exynos5410", "samsung,exynos5";
 
-        memory {
+        memory@40000000 {
+                device_type = "memory";
                 reg = <0x40000000 0x7ea00000>;
         };
 
diff --git a/arch/arm/boot/dts/exynos5410-smdk5410.dts b/arch/arm/boot/dts/exynos5410-smdk5410.dts
index 777fcf2edd79..5e36bddb0509 100644
--- a/arch/arm/boot/dts/exynos5410-smdk5410.dts
+++ b/arch/arm/boot/dts/exynos5410-smdk5410.dts
@@ -16,7 +16,8 @@
         model = "Samsung SMDK5410 board based on EXYNOS5410";
         compatible = "samsung,smdk5410", "samsung,exynos5410", "samsung,exynos5";
 
-        memory {
+        memory@40000000 {
+                device_type = "memory";
                 reg = <0x40000000 0x80000000>;
         };
 
diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
index 39a3b81478fd..c5923fae4e8e 100644
--- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
+++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
@@ -22,7 +22,8 @@
         model = "Insignal Arndale Octa evaluation board based on EXYNOS5420";
         compatible = "insignal,arndale-octa", "samsung,exynos5420", "samsung,exynos5";
 
-        memory {
+        memory@20000000 {
+                device_type = "memory";
                 reg = <0x20000000 0x80000000>;
         };
 
@@ -70,6 +71,15 @@
         status = "disabled";
 };
 
+&hdmi {
+        hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
+        vdd_osc-supply = <&ldo7_reg>;
+        vdd_pll-supply = <&ldo6_reg>;
+        vdd-supply = <&ldo6_reg>;
+        ddc = <&i2c_2>;
+        status = "okay";
+};
+
 &hsi2c_4 {
         status = "okay";
 
@@ -347,6 +357,10 @@
         };
 };
 
+&i2c_2 {
+        status = "okay";
+};
+
 &mmc_0 {
         status = "okay";
         broken-cd;
diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index f6f256fd9b5e..bc76dfdc57e6 100644
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -79,7 +79,8 @@
                 };
         };
 
-        memory {
+        memory@20000000 {
+                device_type = "memory";
                 reg = <0x20000000 0x80000000>;
         };
 
diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts
index 29546465d3da..b9192ef11257 100644
--- a/arch/arm/boot/dts/exynos5420-smdk5420.dts
+++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts
@@ -19,7 +19,8 @@
         model = "Samsung SMDK5420 board based on EXYNOS5420";
         compatible = "samsung,smdk5420", "samsung,exynos5420", "samsung,exynos5";
 
-        memory {
+        memory@20000000 {
+                device_type = "memory";
                 reg = <0x20000000 0x80000000>;
         };
 
diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
index 7bb8a370072a..0747c6fdadf8 100644
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
@@ -21,7 +21,8 @@
 #include "exynos-mfc-reserved-memory.dtsi"
 
 / {
-        memory {
+        memory@40000000 {
+                device_type = "memory";
                 reg = <0x40000000 0x7EA00000>;
         };
 
diff --git a/arch/arm/boot/dts/exynos5440-sd5v1.dts b/arch/arm/boot/dts/exynos5440-sd5v1.dts
index a98501bab6fc..ad6f533b3f40 100644
--- a/arch/arm/boot/dts/exynos5440-sd5v1.dts
+++ b/arch/arm/boot/dts/exynos5440-sd5v1.dts
@@ -20,6 +20,12 @@
                 bootargs = "root=/dev/sda2 rw rootwait ignore_loglevel earlyprintk no_console_suspend mem=2048M@0x80000000 mem=6144M@0x100000000 console=ttySAC0,115200";
         };
 
+        /* FIXME: set reg property with correct start address and size */
+        memory@0 {
+                device_type = "memory";
+                reg = <0 0>;
+        };
+
         fixed-rate-clocks {
                 xtal {
                         compatible = "samsung,clock-xtal";
diff --git a/arch/arm/boot/dts/exynos5440-ssdk5440.dts b/arch/arm/boot/dts/exynos5440-ssdk5440.dts
index 6a0d802e87c8..92bd2c6f7631 100644
--- a/arch/arm/boot/dts/exynos5440-ssdk5440.dts
+++ b/arch/arm/boot/dts/exynos5440-ssdk5440.dts
@@ -21,6 +21,12 @@
                 bootargs = "root=/dev/sda2 rw rootwait ignore_loglevel earlyprintk no_console_suspend mem=2048M@0x80000000 mem=6144M@0x100000000 console=ttySAC0,115200";
         };
 
+        /* FIXME: set reg property with correct start address and size */
+        memory@0 {
+                device_type = "memory";
+                reg = <0 0>;
+        };
+
         fixed-rate-clocks {
                 xtal {
                         compatible = "samsung,clock-xtal";
diff --git a/arch/arm/boot/dts/exynos5440.dtsi b/arch/arm/boot/dts/exynos5440.dtsi
index fd176819b4bf..e6bffd13cedd 100644
--- a/arch/arm/boot/dts/exynos5440.dtsi
+++ b/arch/arm/boot/dts/exynos5440.dtsi
@@ -10,12 +10,13 @@
 */
 
 #include <dt-bindings/clock/exynos5440.h>
-#include "skeleton.dtsi"
 
 / {
         compatible = "samsung,exynos5440", "samsung,exynos5";
 
         interrupt-parent = <&gic>;
+        #address-cells = <1>;
+        #size-cells = <1>;
 
         aliases {
                 serial0 = &serial_0;
diff --git a/arch/arm/boot/dts/exynos54xx.dtsi b/arch/arm/boot/dts/exynos54xx.dtsi
index 06a604911e87..9d31cdce1959 100644
--- a/arch/arm/boot/dts/exynos54xx.dtsi
+++ b/arch/arm/boot/dts/exynos54xx.dtsi
@@ -14,7 +14,6 @@
  * published by the Free Software Foundation.
  */
 
-#include "skeleton.dtsi"
 #include "exynos5.dtsi"
 
 / {
diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index 51a8bca4691c..9fafe10d9e4e 100644
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -79,7 +79,8 @@
 
         };
 
-        memory {
+        memory@20000000 {
+                device_type = "memory";
                 reg = <0x20000000 0x80000000>;
         };
 
diff --git a/arch/arm/boot/dts/s5pv210-aquila.dts b/arch/arm/boot/dts/s5pv210-aquila.dts
index da24ab570b0e..d763c5b4c65d 100644
--- a/arch/arm/boot/dts/s5pv210-aquila.dts
+++ b/arch/arm/boot/dts/s5pv210-aquila.dts
@@ -29,7 +29,7 @@
                 bootargs = "console=ttySAC2,115200n8 root=/dev/mmcblk1p5 rw rootwait ignore_loglevel earlyprintk";
         };
 
-        memory {
+        memory@30000000 {
                 device_type = "memory";
                 reg = <0x30000000 0x05000000
                         0x40000000 0x18000000>;
diff --git a/arch/arm/boot/dts/s5pv210-goni.dts b/arch/arm/boot/dts/s5pv210-goni.dts
index 0a33d402138e..c56f51ee7897 100644
--- a/arch/arm/boot/dts/s5pv210-goni.dts
+++ b/arch/arm/boot/dts/s5pv210-goni.dts
@@ -29,7 +29,7 @@
                 bootargs = "console=ttySAC0,115200n8 root=/dev/mmcblk0p5 rw rootwait ignore_loglevel earlyprintk";
         };
 
-        memory {
+        memory@30000000 {
                 device_type = "memory";
                 reg = <0x30000000 0x05000000
                         0x40000000 0x10000000
diff --git a/arch/arm/boot/dts/s5pv210-smdkc110.dts b/arch/arm/boot/dts/s5pv210-smdkc110.dts
index 1eedab7ffe94..5d14da911aa5 100644
--- a/arch/arm/boot/dts/s5pv210-smdkc110.dts
+++ b/arch/arm/boot/dts/s5pv210-smdkc110.dts
@@ -29,7 +29,7 @@
                 bootargs = "console=ttySAC0,115200n8 root=/dev/mmcblk0p1 rw rootwait ignore_loglevel earlyprintk";
         };
 
-        memory {
+        memory@20000000 {
                 device_type = "memory";
                 reg = <0x20000000 0x20000000>;
         };
diff --git a/arch/arm/boot/dts/s5pv210-smdkv210.dts b/arch/arm/boot/dts/s5pv210-smdkv210.dts
index 9eb6aff3e38f..75398318ed57 100644
--- a/arch/arm/boot/dts/s5pv210-smdkv210.dts
+++ b/arch/arm/boot/dts/s5pv210-smdkv210.dts
@@ -29,7 +29,7 @@
                 bootargs = "console=ttySAC0,115200n8 root=/dev/mmcblk0p1 rw rootwait ignore_loglevel earlyprintk";
         };
 
-        memory {
+        memory@20000000 {
                 device_type = "memory";
                 reg = <0x20000000 0x40000000>;
         };
diff --git a/arch/arm/boot/dts/s5pv210-torbreck.dts b/arch/arm/boot/dts/s5pv210-torbreck.dts
index 622599fd2cfa..7cb50bcee888 100644
--- a/arch/arm/boot/dts/s5pv210-torbreck.dts
+++ b/arch/arm/boot/dts/s5pv210-torbreck.dts
@@ -29,7 +29,7 @@
                 bootargs = "console=ttySAC0,115200n8 root=/dev/mmcblk0p1 rw rootwait ignore_loglevel earlyprintk";
         };
 
-        memory {
+        memory@20000000 {
                 device_type = "memory";
                 reg = <0x20000000 0x20000000>;
         };
diff --git a/arch/arm/boot/dts/s5pv210.dtsi b/arch/arm/boot/dts/s5pv210.dtsi
index ffc36bd24d2f..a853918be43f 100644
--- a/arch/arm/boot/dts/s5pv210.dtsi
+++ b/arch/arm/boot/dts/s5pv210.dtsi
@@ -19,11 +19,13 @@
  * published by the Free Software Foundation.
 */
 
-#include "skeleton.dtsi"
 #include <dt-bindings/clock/s5pv210.h>
 #include <dt-bindings/clock/s5pv210-audss.h>
 
 / {
+        #address-cells = <1>;
+        #size-cells = <1>;
+
         aliases {
                 csis0 = &csis0;
                 fimc0 = &fimc0;