]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: dts: armada-38x: label USB and SATA nodes
authorRalph Sennhauser <ralph.sennhauser@gmail.com>
Sat, 8 Apr 2017 10:16:26 +0000 (12:16 +0200)
committerGregory CLEMENT <gregory.clement@free-electrons.com>
Wed, 12 Apr 2017 09:01:29 +0000 (11:01 +0200)
Recently most nodes got labels to make them referenceable. The USB 3.0
nodes as well as the nodes for the SATA controllers were left out,
rectify the omission.

The labels "sataX" are already used by some boards for the SATA ports,
therefore use "ahciX" to label the SATA controller nodes.

To avoid potential confusion by labeling an USB3.0 controller "usb2" use
usb3_X as labels. This also coincides with the node names themselves
(usb@xxxxx vs usb3@xxxxx).

Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
arch/arm/boot/dts/armada-38x.dtsi

index ba27ec104981efb817dca0dbe1cad5d4d1d8349c..8b165c31de1efb432e15d2cb63fd7bd69b1af89b 100644 (file)
@@ -530,7 +530,7 @@ rtc: rtc@a3800 {
                                interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
                        };
 
-                       sata@a8000 {
+                       ahci0: sata@a8000 {
                                compatible = "marvell,armada-380-ahci";
                                reg = <0xa8000 0x2000>;
                                interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
@@ -546,7 +546,7 @@ bm: bm@c8000 {
                                status = "disabled";
                        };
 
-                       sata@e0000 {
+                       ahci1: sata@e0000 {
                                compatible = "marvell,armada-380-ahci";
                                reg = <0xe0000 0x2000>;
                                interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
@@ -590,7 +590,7 @@ sdhci: sdhci@d8000 {
                                status = "disabled";
                        };
 
-                       usb3@f0000 {
+                       usb3_0: usb3@f0000 {
                                compatible = "marvell,armada-380-xhci";
                                reg = <0xf0000 0x4000>,<0xf4000 0x4000>;
                                interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
@@ -598,7 +598,7 @@ usb3@f0000 {
                                status = "disabled";
                        };
 
-                       usb3@f8000 {
+                       usb3_1: usb3@f8000 {
                                compatible = "marvell,armada-380-xhci";
                                reg = <0xf8000 0x4000>,<0xfc000 0x4000>;
                                interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;