| Message ID | 1438094636-20421-1-git-send-email-claudiu.manoil@freescale.com |
|---|---|
| State | Under Review, archived |
| Headers | show |
On Tue, Jul 28, 2015 at 05:43:55PM +0300, Claudiu Manoil wrote: > Add basic support for all the eTSEC controllers on the > ls1021a SoC. Second interrupt group register blocks > and their corresponding Rx/Tx/Err interrupt sources are > included as well for each eTSEC node. > > Signed-off-by: Alison Wang <alison.wang@freescale.com> > Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com> Applied both with a minor change below. > --- > v2: various findings, added 2nd interrupt group; > v3: addressed findings from Shawn Guo - > - initial patch split in soc, boards and bindings patches; > - removed redundant all zero local-mac-address; > - subject prefix; > > arch/arm/boot/dts/ls1021a.dtsi | 88 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 88 insertions(+) > > diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi > index 1b306c7..0638cda 100644 > --- a/arch/arm/boot/dts/ls1021a.dtsi > +++ b/arch/arm/boot/dts/ls1021a.dtsi > @@ -59,6 +59,9 @@ > serial3 = &lpuart3; > serial4 = &lpuart4; > serial5 = &lpuart5; > + ethernet0 = &enet0; > + ethernet1 = &enet1; > + ethernet2 = &enet2; I moved these above serial to keep them sort alphabetically. Shawn > sysclk = &sysclk; > }; > > @@ -391,6 +394,91 @@ > reg = <0x0 0x2d24000 0x0 0x4000>; > }; > > + enet0: ethernet@2d10000 { > + compatible = "fsl,etsec2"; > + device_type = "network"; > + #address-cells = <2>; > + #size-cells = <2>; > + interrupt-parent = <&gic>; > + model = "eTSEC"; > + fsl,magic-packet; > + ranges; > + > + queue-group@2d10000 { > + #address-cells = <2>; > + #size-cells = <2>; > + reg = <0x0 0x2d10000 0x0 0x1000>; > + interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>; > + }; > + > + queue-group@2d14000 { > + #address-cells = <2>; > + #size-cells = <2>; > + reg = <0x0 0x2d14000 0x0 0x1000>; > + interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>; > + }; > + }; > + > + enet1: ethernet@2d50000 { > + compatible = "fsl,etsec2"; > + device_type = "network"; > + #address-cells = <2>; > + #size-cells = <2>; > + interrupt-parent = <&gic>; > + model = "eTSEC"; > + ranges; > + > + queue-group@2d50000 { > + #address-cells = <2>; > + #size-cells = <2>; > + reg = <0x0 0x2d50000 0x0 0x1000>; > + interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>; > + }; > + > + queue-group@2d54000 { > + #address-cells = <2>; > + #size-cells = <2>; > + reg = <0x0 0x2d54000 0x0 0x1000>; > + interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>; > + }; > + }; > + > + enet2: ethernet@2d90000 { > + compatible = "fsl,etsec2"; > + device_type = "network"; > + #address-cells = <2>; > + #size-cells = <2>; > + interrupt-parent = <&gic>; > + model = "eTSEC"; > + ranges; > + > + queue-group@2d90000 { > + #address-cells = <2>; > + #size-cells = <2>; > + reg = <0x0 0x2d90000 0x0 0x1000>; > + interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>; > + }; > + > + queue-group@2d94000 { > + #address-cells = <2>; > + #size-cells = <2>; > + reg = <0x0 0x2d94000 0x0 0x1000>; > + interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>; > + }; > + }; > + > usb@8600000 { > compatible = "fsl-usb2-dr-v2.5", "fsl-usb2-dr"; > reg = <0x0 0x8600000 0x0 0x1000>; > -- > 1.7.11.7 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/net/fsl-tsec-phy.txt b/Documentation/devicetree/bindings/net/fsl-tsec-phy.txt index 1e97532..325c07d 100644 --- a/Documentation/devicetree/bindings/net/fsl-tsec-phy.txt +++ b/Documentation/devicetree/bindings/net/fsl-tsec-phy.txt @@ -45,12 +45,15 @@ Properties: - device_type : Should be "network" - model : Model of the device. Can be "TSEC", "eTSEC", or "FEC" - - compatible : Should be "gianfar" + - compatible : "gianfar", "fsl,etsec2" - reg : Offset and length of the register set for the device - interrupts : For FEC devices, the first interrupt is the device's interrupt. For TSEC and eTSEC devices, the first interrupt is transmit, the second is receive, and the third is error. - phy-handle : See ethernet.txt file in the same directory. + - tbi-handle : Handle to a tbi-phy node containing information about + the TBIPA register needed to initialize the TBI PHY. See + "TBI Internal MDIO bus", this document. - fixed-link : See fixed-link.txt in the same directory. - phy-connection-type : See ethernet.txt file in the same directory. This property is only really needed if the connection is of type
Update the eTSEC bindings document with missing info on properties that are already in use for the PPC platforms: * "tbi-phy" property; * "fsl,etsec2" compatibility string; Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com> --- v2 - none; v3 - added "tbi-handle" documentation; - fixed typo ("fsl,etsec2" is the correct string); Documentation/devicetree/bindings/net/fsl-tsec-phy.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)