summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2019-01-21 08:03:36 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2019-02-15 09:04:30 +0900
commit519904a42ff8c2ed23651f33c256d009c656a50b (patch)
tree6b209ddd1473bb5a6f41b2cac9a193f7cfae719f
parent32dfc773a78426c4a637029e77631123622d2446 (diff)
downloadlinux-519904a42ff8c2ed23651f33c256d009c656a50b.tar.gz
linux-519904a42ff8c2ed23651f33c256d009c656a50b.tar.bz2
linux-519904a42ff8c2ed23651f33c256d009c656a50b.zip
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 <yamada.masahiro@socionext.com>
-rw-r--r--arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts4
-rw-r--r--arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts8
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts
index d7ae28afef7d..9ca692ed1b2b 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 f91d77f6ccd8..1965e4dfe4a4 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";
+};