提交 12676ee1 编写于 作者: J Javier Martinez Canillas 提交者: Krzysztof Kozlowski

ARM: dts: exynos: Remove skeleton.dtsi usage for Exynos5

The skeleton.dtsi file was removed in ARM64 for different reasons as
explained in commit ("3ebee5a2 arm64: dts: kill skeleton.dtsi").

These also applies to ARM and it will also allow to get rid of the
following DTC warnings in the future:

"Node /memory has a reg or ranges property, but no unit name"

The disassembled DTB are almost the same besides an empty chosen
node being removed and nodes reordered, so it should not have
functional changes.
Signed-off-by: NJavier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: NKrzysztof Kozlowski <krzk@kernel.org>
上级 1354835a
...@@ -13,11 +13,12 @@ ...@@ -13,11 +13,12 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include "skeleton.dtsi"
#include "exynos-syscon-restart.dtsi" #include "exynos-syscon-restart.dtsi"
/ { / {
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
i2c0 = &i2c_0; i2c0 = &i2c_0;
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
compatible = "insignal,arndale", "samsung,exynos5250", "samsung,exynos5"; compatible = "insignal,arndale", "samsung,exynos5250", "samsung,exynos5";
memory { memory {
device_type = "memory";
reg = <0x40000000 0x80000000>; reg = <0x40000000 0x80000000>;
}; };
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
}; };
memory { memory {
device_type = "memory";
reg = <0x40000000 0x80000000>; reg = <0x40000000 0x80000000>;
}; };
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
}; };
memory { memory {
device_type = "memory";
reg = <0x40000000 0x80000000>; reg = <0x40000000 0x80000000>;
}; };
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
compatible = "google,spring", "samsung,exynos5250", "samsung,exynos5"; compatible = "google,spring", "samsung,exynos5250", "samsung,exynos5";
memory { memory {
device_type = "memory";
reg = <0x40000000 0x80000000>; reg = <0x40000000 0x80000000>;
}; };
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
compatible = "samsung,xyref5260", "samsung,exynos5260", "samsung,exynos5"; compatible = "samsung,xyref5260", "samsung,exynos5260", "samsung,exynos5";
memory { memory {
device_type = "memory";
reg = <0x20000000 0x80000000>; reg = <0x20000000 0x80000000>;
}; };
......
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include "skeleton.dtsi"
#include <dt-bindings/clock/exynos5260-clk.h> #include <dt-bindings/clock/exynos5260-clk.h>
/ { / {
compatible = "samsung,exynos5260", "samsung,exynos5"; compatible = "samsung,exynos5260", "samsung,exynos5";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
pinctrl0 = &pinctrl_0; pinctrl0 = &pinctrl_0;
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
compatible = "hardkernel,odroid-xu", "samsung,exynos5410", "samsung,exynos5"; compatible = "hardkernel,odroid-xu", "samsung,exynos5410", "samsung,exynos5";
memory { memory {
device_type = "memory";
reg = <0x40000000 0x7ea00000>; reg = <0x40000000 0x7ea00000>;
}; };
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
compatible = "samsung,smdk5410", "samsung,exynos5410", "samsung,exynos5"; compatible = "samsung,smdk5410", "samsung,exynos5410", "samsung,exynos5";
memory { memory {
device_type = "memory";
reg = <0x40000000 0x80000000>; reg = <0x40000000 0x80000000>;
}; };
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
compatible = "insignal,arndale-octa", "samsung,exynos5420", "samsung,exynos5"; compatible = "insignal,arndale-octa", "samsung,exynos5420", "samsung,exynos5";
memory { memory {
device_type = "memory";
reg = <0x20000000 0x80000000>; reg = <0x20000000 0x80000000>;
}; };
......
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
}; };
memory { memory {
device_type = "memory";
reg = <0x20000000 0x80000000>; reg = <0x20000000 0x80000000>;
}; };
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
compatible = "samsung,smdk5420", "samsung,exynos5420", "samsung,exynos5"; compatible = "samsung,smdk5420", "samsung,exynos5420", "samsung,exynos5";
memory { memory {
device_type = "memory";
reg = <0x20000000 0x80000000>; reg = <0x20000000 0x80000000>;
}; };
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
/ { / {
memory { memory {
device_type = "memory";
reg = <0x40000000 0x7EA00000>; reg = <0x40000000 0x7EA00000>;
}; };
......
...@@ -10,12 +10,13 @@ ...@@ -10,12 +10,13 @@
*/ */
#include <dt-bindings/clock/exynos5440.h> #include <dt-bindings/clock/exynos5440.h>
#include "skeleton.dtsi"
/ { / {
compatible = "samsung,exynos5440", "samsung,exynos5"; compatible = "samsung,exynos5440", "samsung,exynos5";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
serial0 = &serial_0; serial0 = &serial_0;
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include "skeleton.dtsi"
#include "exynos5.dtsi" #include "exynos5.dtsi"
/ { / {
......
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
}; };
memory { memory {
device_type = "memory";
reg = <0x20000000 0x80000000>; reg = <0x20000000 0x80000000>;
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册