From: Masahiro Yamada Date: Sun, 20 Jan 2019 23:03:36 +0000 (+0900) Subject: arm64: dts: uniphier: sort labels in the same order as in dtsi X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=519904a42ff8c2ed23651f33c256d009c656a50b;p=linux.git arm64: dts: uniphier: sort labels in the same order as in dtsi Sort the labels in the same order as in the corresponding dtsi file, in other words, the order of reg address. Signed-off-by: Masahiro Yamada --- diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts index d7ae28afef7d7..9ca692ed1b2bd 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts @@ -145,10 +145,10 @@ }; }; -&nand { +&usb { status = "okay"; }; -&usb { +&nand { status = "okay"; }; diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts index f91d77f6ccd8f..1965e4dfe4a47 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts +++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts @@ -101,10 +101,6 @@ }; }; -&nand { - status = "okay"; -}; - &usb0 { status = "okay"; }; @@ -116,3 +112,7 @@ &pcie { status = "okay"; }; + +&nand { + status = "okay"; +};