summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/bcm958625hr.dts
diff options
context:
space:
mode:
authorJon Mason <jon.mason@broadcom.com>2016-12-13 13:13:45 -0500
committerFlorian Fainelli <f.fainelli@gmail.com>2017-01-18 17:18:17 -0800
commit1fd2bb6ceb401d8adaaf6ddb02ae67811054f401 (patch)
tree21b9b290b879d3e032ec30771e976a0f289b84be /arch/arm/boot/dts/bcm958625hr.dts
parenta503cf0cbe66f153f77fe9d0ecaa12e65b2a42a5 (diff)
downloadlinux-stable-1fd2bb6ceb401d8adaaf6ddb02ae67811054f401.tar.gz
linux-stable-1fd2bb6ceb401d8adaaf6ddb02ae67811054f401.tar.bz2
linux-stable-1fd2bb6ceb401d8adaaf6ddb02ae67811054f401.zip
ARM: dts: NSP: DT Clean-ups
The QSPI entry was added out of the sequental order that the rest of the DTSI file is in. Move it to make it fit in properly. Also, some other entries have been added in a non-alphabetical order in the DTS files, making them different from the other NSP DTS files. Move the relevant peices to make it match. Finally, remove errant new lines. Signed-off-by: Jon Mason <jon.mason@broadcom.com> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'arch/arm/boot/dts/bcm958625hr.dts')
-rw-r--r--arch/arm/boot/dts/bcm958625hr.dts30
1 files changed, 15 insertions, 15 deletions
diff --git a/arch/arm/boot/dts/bcm958625hr.dts b/arch/arm/boot/dts/bcm958625hr.dts
index 442002597063..e7a4cb1e53bb 100644
--- a/arch/arm/boot/dts/bcm958625hr.dts
+++ b/arch/arm/boot/dts/bcm958625hr.dts
@@ -1,7 +1,7 @@
/*
* BSD LICENSE
*
- * Copyright (c) 2016 Broadcom. All rights reserved.
+ * Copyright(c) 2016 Broadcom. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -59,6 +59,10 @@
};
};
+&amac0 {
+ status = "okay";
+};
+
&nand {
nandcs@0 {
compatible = "brcm,nandcs";
@@ -97,10 +101,6 @@
};
};
-&uart0 {
- status = "okay";
-};
-
&pcie0 {
status = "okay";
};
@@ -118,7 +118,15 @@
};
};
-&amac0 {
+&sata_phy0 {
+ status = "okay";
+};
+
+&sata_phy1 {
+ status = "okay";
+};
+
+&sata {
status = "okay";
};
@@ -167,14 +175,6 @@
};
};
-&sata_phy0 {
- status = "okay";
-};
-
-&sata_phy1 {
- status = "okay";
-};
-
-&sata {
+&uart0 {
status = "okay";
};