Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-25 06:00:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

ARM: dts: uniphier: remove skeleton.dtsi inclusion

Browse source 
Linux Commit 9c0da3cc61f1 ("ARM: dts: explicitly mark skeleton.dtsi
as deprecated") declared that skeleton.dtsi was deprecated.

Move the memory node below to suppress warnings of FDTGREP.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2017-03-13 00:16:39 +09:00
parent fc671ed4e3
commit f16eda968c
16 changed files with 63 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/arm/dts/uniphier-ld4-ref.dts
View file

@ -16,11 +16,6 @@
model = "UniPhier LD4 Reference Board";
compatible = "socionext,uniphier-ld4-ref", "socionext,uniphier-ld4";
memory {
device_type = "memory";
reg = <0x80000000 0x20000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -35,6 +30,11 @@
i2c2 = &i2c2;
i2c3 = &i2c3;
};
memory {
device_type = "memory";
reg = <0x80000000 0x20000000>;
};
};
&ethsc {

4
arch/arm/dts/uniphier-ld4.dtsi
View file

@ -7,10 +7,10 @@
* SPDX-License-Identifier: GPL-2.0+ X11
*/
/include/ "skeleton.dtsi"
/ {
compatible = "socionext,uniphier-ld4";
#address-cells = <1>;
#size-cells = <1>;
cpus {
#address-cells = <1>;

10
arch/arm/dts/uniphier-ld6b-ref.dts
View file

@ -16,11 +16,6 @@
model = "UniPhier LD6b Reference Board";
compatible = "socionext,uniphier-ld6b-ref", "socionext,uniphier-ld6b";
memory {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -37,6 +32,11 @@
i2c5 = &i2c5;
i2c6 = &i2c6;
};
memory {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};
};
&ethsc {

10
arch/arm/dts/uniphier-pro4-ace.dts
View file

@ -14,11 +14,6 @@
model = "UniPhier Pro4 Ace Board";
compatible = "socionext,uniphier-pro4-ace", "socionext,uniphier-pro4";
memory {
device_type = "memory";
reg = <0x80000000 0x40000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -34,6 +29,11 @@
i2c5 = &i2c5;
i2c6 = &i2c6;
};
memory {
device_type = "memory";
reg = <0x80000000 0x40000000>;
};
};
&serial0 {

10
arch/arm/dts/uniphier-pro4-ref.dts
View file

@ -16,11 +16,6 @@
model = "UniPhier Pro4 Reference Board";
compatible = "socionext,uniphier-pro4-ref", "socionext,uniphier-pro4";
memory {
device_type = "memory";
reg = <0x80000000 0x40000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -38,6 +33,11 @@
i2c6 = &i2c6;
usb0 = &usb0;
};
memory {
device_type = "memory";
reg = <0x80000000 0x40000000>;
};
};
&ethsc {

10
arch/arm/dts/uniphier-pro4-sanji.dts
View file

@ -14,11 +14,6 @@
model = "UniPhier Pro4 Sanji Board";
compatible = "socionext,uniphier-pro4-sanji", "socionext,uniphier-pro4";
memory {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -33,6 +28,11 @@
i2c5 = &i2c5;
i2c6 = &i2c6;
};
memory {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};
};
&serial0 {

4
arch/arm/dts/uniphier-pro4.dtsi
View file

@ -7,10 +7,10 @@
* SPDX-License-Identifier: GPL-2.0+ X11
*/
/include/ "skeleton.dtsi"
/ {
compatible = "socionext,uniphier-pro4";
#address-cells = <1>;
#size-cells = <1>;
cpus {
#address-cells = <1>;

10
arch/arm/dts/uniphier-pro5-4kbox.dts
View file

@ -14,11 +14,6 @@
model = "UniPhier Pro5 4KBOX Board";
compatible = "socionext,uniphier-pro5-4kbox", "socionext,uniphier-pro5";
memory {
device_type = "memory";
reg = <0x80000000 0x40000000>;
};
chosen {
stdout-path = "serial1:115200n8";
};
@ -30,6 +25,11 @@
i2c5 = &i2c5;
i2c6 = &i2c6;
};
memory {
device_type = "memory";
reg = <0x80000000 0x40000000>;
};
};
&serial1 {

4
arch/arm/dts/uniphier-pro5.dtsi
View file

@ -7,10 +7,10 @@
* SPDX-License-Identifier: GPL-2.0+ X11
*/
/include/ "skeleton.dtsi"
/ {
compatible = "socionext,uniphier-pro5";
#address-cells = <1>;
#size-cells = <1>;
cpus {
#address-cells = <1>;

10
arch/arm/dts/uniphier-pxs2-gentil.dts
View file

@ -15,11 +15,6 @@
compatible = "socionext,uniphier-pxs2-gentil",
"socionext,uniphier-pxs2";
memory {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -34,6 +29,11 @@
i2c5 = &i2c5;
i2c6 = &i2c6;
};
memory {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};
};
&serial2 {

10
arch/arm/dts/uniphier-pxs2-vodka.dts
View file

@ -14,11 +14,6 @@
model = "UniPhier PXs2 Vodka Board";
compatible = "socionext,uniphier-pxs2-vodka", "socionext,uniphier-pxs2";
memory {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -32,6 +27,11 @@
i2c5 = &i2c5;
i2c6 = &i2c6;
};
memory {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};
};
&serial2 {

4
arch/arm/dts/uniphier-pxs2.dtsi
View file

@ -7,10 +7,10 @@
* SPDX-License-Identifier: GPL-2.0+ X11
*/
/include/ "skeleton.dtsi"
/ {
compatible = "socionext,uniphier-pxs2";
#address-cells = <1>;
#size-cells = <1>;
cpus {
#address-cells = <1>;

12
arch/arm/dts/uniphier-sld3-ref.dts
View file

@ -16,12 +16,6 @@
model = "UniPhier sLD3 Reference Board";
compatible = "socionext,uniphier-sld3-ref", "socionext,uniphier-sld3";
memory {
device_type = "memory";
reg = <0x80000000 0x20000000
0xc0000000 0x20000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -36,6 +30,12 @@
i2c3 = &i2c3;
i2c4 = &i2c4;
};
memory {
device_type = "memory";
reg = <0x80000000 0x20000000
0xc0000000 0x20000000>;
};
};
&ethsc {

4
arch/arm/dts/uniphier-sld3.dtsi
View file

@ -7,10 +7,10 @@
* SPDX-License-Identifier: GPL-2.0+ X11
*/
/include/ "skeleton.dtsi"
/ {
compatible = "socionext,uniphier-sld3";
#address-cells = <1>;
#size-cells = <1>;
cpus {
#address-cells = <1>;

10
arch/arm/dts/uniphier-sld8-ref.dts
View file

@ -16,11 +16,6 @@
model = "UniPhier sLD8 Reference Board";
compatible = "socionext,uniphier-sld8-ref", "socionext,uniphier-sld8";
memory {
device_type = "memory";
reg = <0x80000000 0x20000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -35,6 +30,11 @@
i2c2 = &i2c2;
i2c3 = &i2c3;
};
memory {
device_type = "memory";
reg = <0x80000000 0x20000000>;
};
};
&ethsc {

4
arch/arm/dts/uniphier-sld8.dtsi
View file

@ -7,10 +7,10 @@
* SPDX-License-Identifier: GPL-2.0+ X11
*/
/include/ "skeleton.dtsi"
/ {
compatible = "socionext,uniphier-sld8";
#address-cells = <1>;
#size-cells = <1>;
cpus {
#address-cells = <1>;