ARM: dts: uniphier: move aliases node up to satisfy fdtgrep

Currently, fdtgrep would not accept uniphier-ph1-ld20-ref.dtb
and uniphier-ph1-ld11-ref.dtb unless the aliases node comes
the first in the root node.

$ make -s uniphier_pxs2_ld6b_defconfig
$ make CROSS_COMPILE=arm-linux-gnueabi- DEVICE_TREE=uniphier-ph1-ld20-ref
  [snip]
  LDS     spl/u-boot-spl.lds
  LD      spl/u-boot-spl
  OBJCOPY spl/u-boot-spl-nodtb.bin
  FDTGREP spl/u-boot-spl.dtb
Error at 'fdt_find_regions': FDT_ERR_BADLAYOUT
/aliases node must come before all other nodes
Error: FDT_ERR_BADMAGIC
make[1]: *** [spl/u-boot-spl.dtb] Error 1
make: *** [spl/u-boot-spl] Error 2

This commit moves the aliases node as the error message from the
fdtgrep tool suggests, although this requirement does not sound
reasonable to me.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/dts/uniphier-ph1-ld11-ref.dts b/arch/arm/dts/uniphier-ph1-ld11-ref.dts
index a624a49..88e7f53 100644 (file)
--- a/arch/arm/dts/uniphier-ph1-ld11-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-ld11-ref.dts
@@ -14,15 +14,6 @@
        model = "UniPhier PH1-LD11 Reference Board";
        compatible = "socionext,ph1-ld11-ref", "socionext,ph1-ld11";
 
-       memory {
-               device_type = "memory";
-               reg = <0 0x80000000 0 0x40000000>;
-       };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
        aliases {
                serial0 = &serial0;
                serial1 = &serial1;
@@ -35,6 +26,15 @@
                i2c4 = &i2c4;
                i2c5 = &i2c5;
        };
+
+       memory {
+               device_type = "memory";
+               reg = <0 0x80000000 0 0x40000000>;
+       };
+
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
 };
 
 &ethsc {

diff --git a/arch/arm/dts/uniphier-ph1-ld20-ref.dts b/arch/arm/dts/uniphier-ph1-ld20-ref.dts
index 1af2ebe..3049016 100644 (file)
--- a/arch/arm/dts/uniphier-ph1-ld20-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-ld20-ref.dts
@@ -15,15 +15,6 @@
        model = "UniPhier PH1-LD20 Reference Board";
        compatible = "socionext,ph1-ld20-ref", "socionext,ph1-ld20";
 
-       memory {
-               device_type = "memory";
-               reg = <0 0x80000000 0 0xc0000000>;
-       };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
        aliases {
                serial0 = &serial0;
                serial1 = &serial1;
@@ -36,6 +27,15 @@
                i2c4 = &i2c4;
                i2c5 = &i2c5;
        };
+
+       memory {
+               device_type = "memory";
+               reg = <0 0x80000000 0 0xc0000000>;
+       };
+
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
 };
 
 &ethsc {