| Message ID | 20170408101626.14032-1-ralph.sennhauser@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Ralph, On sam., avril 08 2017, Ralph Sennhauser <ralph.sennhauser@gmail.com> wrote: > 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> Applied on mvebu/dt Thanks, Gregory > --- > > Hi everybody, > > Using satacX for controllers with satacXpY for ports might have been a > possiblity, since ahciX is already used similarly (to avoid a conflict > with current use of sataX) ahciX seems the better choice. Works well me > thinks. > > The usb3_X labels still seem the best choice even though they aren't > perfectly consitent, however, I don't see an alternative which would fit > this requirement either. > > Regards > Ralph > > --- > > Changes v1 -> v2: > * use ahciX instead of satacX for the SATA controller nodes (suggested > by Andrew Lunn) > > > arch/arm/boot/dts/armada-38x.dtsi | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi > index ba27ec1..8b165c3 100644 > --- a/arch/arm/boot/dts/armada-38x.dtsi > +++ b/arch/arm/boot/dts/armada-38x.dtsi > @@ -530,7 +530,7 @@ > 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 @@ > 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 @@ > 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 @@ > 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>; > -- > 2.10.2 >
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi index ba27ec1..8b165c3 100644 --- a/arch/arm/boot/dts/armada-38x.dtsi +++ b/arch/arm/boot/dts/armada-38x.dtsi @@ -530,7 +530,7 @@ 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 @@ 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 @@ 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 @@ 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>;
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> --- Hi everybody, Using satacX for controllers with satacXpY for ports might have been a possiblity, since ahciX is already used similarly (to avoid a conflict with current use of sataX) ahciX seems the better choice. Works well me thinks. The usb3_X labels still seem the best choice even though they aren't perfectly consitent, however, I don't see an alternative which would fit this requirement either. Regards Ralph --- Changes v1 -> v2: * use ahciX instead of satacX for the SATA controller nodes (suggested by Andrew Lunn) arch/arm/boot/dts/armada-38x.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)