summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/bcm958625k.dts
diff options
context:
space:
mode:
authorJon Mason <jon.mason@broadcom.com>2016-12-13 19:13:45 +0100
committerFlorian Fainelli <f.fainelli@gmail.com>2017-01-19 02:18:17 +0100
commit1fd2bb6ceb401d8adaaf6ddb02ae67811054f401 (patch)
tree21b9b290b879d3e032ec30771e976a0f289b84be /arch/arm/boot/dts/bcm958625k.dts
parentARM: dts: BCM53573: Specify USB ports of on-SoC controllers (diff)
downloadlinux-1fd2bb6ceb401d8adaaf6ddb02ae67811054f401.tar.xz
linux-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/bcm958625k.dts')
-rw-r--r--arch/arm/boot/dts/bcm958625k.dts64
1 files changed, 32 insertions, 32 deletions
diff --git a/arch/arm/boot/dts/bcm958625k.dts b/arch/arm/boot/dts/bcm958625k.dts
index 59d96fb91583..98337d6a2383 100644
--- a/arch/arm/boot/dts/bcm958625k.dts
+++ b/arch/arm/boot/dts/bcm958625k.dts
@@ -53,14 +53,6 @@
};
};
-&uart0 {
- status = "okay";
-};
-
-&uart1 {
- status = "okay";
-};
-
&amac0 {
status = "okay";
};
@@ -69,30 +61,6 @@
status = "okay";
};
-&pcie0 {
- status = "okay";
-};
-
-&pcie1 {
- status = "okay";
-};
-
-&pcie2 {
- status = "okay";
-};
-
-&sata_phy0 {
- status = "okay";
-};
-
-&sata_phy1 {
- status = "okay";
-};
-
-&sata {
- status = "okay";
-};
-
&nand {
nandcs@0 {
compatible = "brcm,nandcs";
@@ -131,6 +99,18 @@
};
};
+&pcie0 {
+ status = "okay";
+};
+
+&pcie1 {
+ status = "okay";
+};
+
+&pcie2 {
+ status = "okay";
+};
+
&pinctrl {
pinctrl-names = "default";
pinctrl-0 = <&nand_sel>;
@@ -173,3 +153,23 @@
};
};
};
+
+&sata_phy0 {
+ status = "okay";
+};
+
+&sata_phy1 {
+ status = "okay";
+};
+
+&sata {
+ status = "okay";
+};
+
+&uart0 {
+ status = "okay";
+};
+
+&uart1 {
+ status = "okay";
+};