Message ID | 20180909202027.411-1-hauke@hauke-m.de |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
Series | Add support for Lantiq / Intel vrx200 network | expand |
On Sun, Sep 09, 2018 at 10:20:27PM +0200, Hauke Mehrtens wrote: > This adds the binding for the GSWIP (Gigabit switch) core found in the > xrx200 / VR9 Lantiq / Intel SoC. > > This part takes care of the switch, MDIO bus, and loading the FW into > the embedded GPHYs. > > Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> > Cc: devicetree@vger.kernel.org > --- > .../devicetree/bindings/net/dsa/lantiq-gswip.txt | 141 +++++++++++++++++++++ > 1 file changed, 141 insertions(+) > create mode 100644 Documentation/devicetree/bindings/net/dsa/lantiq-gswip.txt > > diff --git a/Documentation/devicetree/bindings/net/dsa/lantiq-gswip.txt b/Documentation/devicetree/bindings/net/dsa/lantiq-gswip.txt > new file mode 100644 > index 000000000000..a089f5856778 > --- /dev/null > +++ b/Documentation/devicetree/bindings/net/dsa/lantiq-gswip.txt > @@ -0,0 +1,141 @@ > +Lantiq GSWIP Ethernet switches > +================================== > + > +Required properties for GSWIP core: > + > +- compatible : "lantiq,xrx200-gswip" for the embedded GSWIP in the > + xRX200 SoC > +- reg : memory range of the GSWIP core registers > + : memory range of the GSWIP MDIO registers > + : memory range of the GSWIP MII registers > + > +See Documentation/devicetree/bindings/net/dsa/dsa.txt for a list of > +additional required and optional properties. > + > + > +Required properties for MDIO bus: > +- compatible : "lantiq,xrx200-mdio" for the MDIO bus inside the GSWIP > + core of the xRX200 SoC and the PHYs connected to it. > + > +See Documentation/devicetree/bindings/net/mdio.txt for a list of additional > +required and optional properties. > + > + > +Required properties for GPHY firmware loading: > +- compatible : "lantiq,gphy-fw" and "lantiq,xrx200-gphy-fw", > + "lantiq,xrx200a1x-gphy-fw", "lantiq,xrx200a2x-gphy-fw", > + "lantiq,xrx300-gphy-fw", or "lantiq,xrx330-gphy-fw" > + for the loading of the firmware into the embedded > + GPHY core of the SoC. One valid combination of compatibles per line please. > +- lantiq,rcu : reference to the rcu syscon > + > +The GPHY firmware loader has a list of GPHY entries, one for each > +embedded GPHY > + > +- reg : Offset of the GPHY firmware register in the RCU > + register range This use of reg is strange. This node should probably be a child of the RCU. > +- resets : list of resets of the embedded GPHY > +- reset-names : list of names of the resets > + > +Example: > + > +Ethernet switch on the VRX200 SoC: > + > +gswip: gswip@E108000 { switch@... or ethernet-switch@... We need a standard name here and add it to the DT spec. > + #address-cells = <1>; > + #size-cells = <0>; > + compatible = "lantiq,xrx200-gswip"; > + reg = < 0xE108000 0x3000 /* switch */ > + 0xE10B100 0x70 /* mdio */ > + 0xE10B1D8 0x30 /* mii */ > + >; > + dsa,member = <0 0>; Not documented. > + > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + port@0 { > + reg = <0>; > + label = "lan3"; > + phy-mode = "rgmii"; > + phy-handle = <&phy0>; > + }; > + > + port@1 { > + reg = <1>; > + label = "lan4"; > + phy-mode = "rgmii"; > + phy-handle = <&phy1>; > + }; > + > + port@2 { > + reg = <2>; > + label = "lan2"; > + phy-mode = "internal"; > + phy-handle = <&phy11>; > + }; > + > + port@4 { > + reg = <4>; > + label = "lan1"; > + phy-mode = "internal"; > + phy-handle = <&phy13>; > + }; > + > + port@5 { > + reg = <5>; > + label = "wan"; > + phy-mode = "rgmii"; > + phy-handle = <&phy5>; > + }; > + > + port@6 { > + reg = <0x6>; > + label = "cpu"; > + ethernet = <ð0>; > + }; > + }; > + > + mdio@0 { What's the address 0 here? > + #address-cells = <1>; > + #size-cells = <0>; > + compatible = "lantiq,xrx200-mdio"; > + reg = <0>; > + > + phy0: ethernet-phy@0 { > + reg = <0x0>; > + }; > + phy1: ethernet-phy@1 { > + reg = <0x1>; > + }; > + phy5: ethernet-phy@5 { > + reg = <0x5>; > + }; > + phy11: ethernet-phy@11 { > + reg = <0x11>; > + }; > + phy13: ethernet-phy@13 { > + reg = <0x13>; > + }; > + }; > + > + gphy-fw { > + compatible = "lantiq,xrx200-gphy-fw", "lantiq,gphy-fw"; > + lantiq,rcu = <&rcu0>; Missing #size-cells and #address-cells, but this should change as I said above. > + > + gphy@20 { > + reg = <0x20>; > + > + resets = <&reset0 31 30>; > + reset-names = "gphy"; > + }; > + > + gphy@68 { > + reg = <0x68>; > + > + resets = <&reset0 29 28>; > + reset-names = "gphy"; > + }; > + }; > +}; > -- > 2.11.0 >
> > +See Documentation/devicetree/bindings/net/dsa/dsa.txt for a list of > > +additional required and optional properties. > > + > > + snip > > + #address-cells = <1>; > > + #size-cells = <0>; > > + compatible = "lantiq,xrx200-gswip"; > > + reg = < 0xE108000 0x3000 /* switch */ > > + 0xE10B100 0x70 /* mdio */ > > + 0xE10B1D8 0x30 /* mii */ > > + >; > > + dsa,member = <0 0>; > > Not documented. Hi Rob It is documented in Documentation/devicetree/bindings/net/dsa/dsa.txt referenced above. Andrew
On Mon, Sep 10, 2018 at 5:05 PM Andrew Lunn <andrew@lunn.ch> wrote: > > > > +See Documentation/devicetree/bindings/net/dsa/dsa.txt for a list of > > > +additional required and optional properties. > > > + > > > + > > snip > > > > + #address-cells = <1>; > > > + #size-cells = <0>; > > > + compatible = "lantiq,xrx200-gswip"; > > > + reg = < 0xE108000 0x3000 /* switch */ > > > + 0xE10B100 0x70 /* mdio */ > > > + 0xE10B1D8 0x30 /* mii */ > > > + >; > > > + dsa,member = <0 0>; > > > > Not documented. > > Hi Rob > > It is documented in Documentation/devicetree/bindings/net/dsa/dsa.txt > referenced above. Hum, okay. Not something I recall reviewing. Not that I tend to remember, but 'dsa' is not a vendor and the property should be 'dsa-member'. Rob
On 09/11/2018 12:01 AM, Rob Herring wrote: > On Sun, Sep 09, 2018 at 10:20:27PM +0200, Hauke Mehrtens wrote: >> This adds the binding for the GSWIP (Gigabit switch) core found in the >> xrx200 / VR9 Lantiq / Intel SoC. >> >> This part takes care of the switch, MDIO bus, and loading the FW into >> the embedded GPHYs. >> >> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> >> Cc: devicetree@vger.kernel.org >> --- >> .../devicetree/bindings/net/dsa/lantiq-gswip.txt | 141 +++++++++++++++++++++ >> 1 file changed, 141 insertions(+) >> create mode 100644 Documentation/devicetree/bindings/net/dsa/lantiq-gswip.txt >> >> diff --git a/Documentation/devicetree/bindings/net/dsa/lantiq-gswip.txt b/Documentation/devicetree/bindings/net/dsa/lantiq-gswip.txt >> new file mode 100644 >> index 000000000000..a089f5856778 >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/net/dsa/lantiq-gswip.txt >> @@ -0,0 +1,141 @@ >> +Lantiq GSWIP Ethernet switches >> +================================== >> + >> +Required properties for GSWIP core: >> + >> +- compatible : "lantiq,xrx200-gswip" for the embedded GSWIP in the >> + xRX200 SoC >> +- reg : memory range of the GSWIP core registers >> + : memory range of the GSWIP MDIO registers >> + : memory range of the GSWIP MII registers >> + >> +See Documentation/devicetree/bindings/net/dsa/dsa.txt for a list of >> +additional required and optional properties. >> + >> + >> +Required properties for MDIO bus: >> +- compatible : "lantiq,xrx200-mdio" for the MDIO bus inside the GSWIP >> + core of the xRX200 SoC and the PHYs connected to it. >> + >> +See Documentation/devicetree/bindings/net/mdio.txt for a list of additional >> +required and optional properties. >> + >> + >> +Required properties for GPHY firmware loading: >> +- compatible : "lantiq,gphy-fw" and "lantiq,xrx200-gphy-fw", >> + "lantiq,xrx200a1x-gphy-fw", "lantiq,xrx200a2x-gphy-fw", >> + "lantiq,xrx300-gphy-fw", or "lantiq,xrx330-gphy-fw" >> + for the loading of the firmware into the embedded >> + GPHY core of the SoC. > > One valid combination of compatibles per line please. Ok, I will update this. > >> +- lantiq,rcu : reference to the rcu syscon >> + >> +The GPHY firmware loader has a list of GPHY entries, one for each >> +embedded GPHY >> + >> +- reg : Offset of the GPHY firmware register in the RCU >> + register range > > This use of reg is strange. This node should probably be a child of > the RCU. The SoC Designers put all registers for which they didn't want to create a new register block into the RCU (Reset controller unit) range. The switch itself is on the main crossbar, and has his own memory range, but the registers to load the GPHY FW are in the RCU register. We have to load the GPHY firmware before we can assess the GPHY, after the FW is loaded we control the GPHY through the MDIO bus of the switch. The GPHY is now part of the switch driver, so we moved the GPHY node also as a sub node to the switch, when it would be under the RCU we somehow have to make sure it gets loaded before the switch gets loaded, which is more complicated. The GPHY itself is also part of the switch IP block and not the reset controller unit. >> +- resets : list of resets of the embedded GPHY >> +- reset-names : list of names of the resets >> + >> +Example: >> + >> +Ethernet switch on the VRX200 SoC: >> + >> +gswip: gswip@E108000 { > > switch@... or ethernet-switch@... > > We need a standard name here and add it to the DT spec. Ok, I will change this. > >> + #address-cells = <1>; >> + #size-cells = <0>; >> + compatible = "lantiq,xrx200-gswip"; >> + reg = < 0xE108000 0x3000 /* switch */ >> + 0xE10B100 0x70 /* mdio */ >> + 0xE10B1D8 0x30 /* mii */ >> + >; >> + dsa,member = <0 0>; > > Not documented. This is part of the general dsa binding. > >> + >> + ports { >> + #address-cells = <1>; >> + #size-cells = <0>; >> + >> + port@0 { >> + reg = <0>; >> + label = "lan3"; >> + phy-mode = "rgmii"; >> + phy-handle = <&phy0>; >> + }; >> + >> + port@1 { >> + reg = <1>; >> + label = "lan4"; >> + phy-mode = "rgmii"; >> + phy-handle = <&phy1>; >> + }; >> + >> + port@2 { >> + reg = <2>; >> + label = "lan2"; >> + phy-mode = "internal"; >> + phy-handle = <&phy11>; >> + }; >> + >> + port@4 { >> + reg = <4>; >> + label = "lan1"; >> + phy-mode = "internal"; >> + phy-handle = <&phy13>; >> + }; >> + >> + port@5 { >> + reg = <5>; >> + label = "wan"; >> + phy-mode = "rgmii"; >> + phy-handle = <&phy5>; >> + }; >> + >> + port@6 { >> + reg = <0x6>; >> + label = "cpu"; >> + ethernet = <ð0>; >> + }; >> + }; >> + >> + mdio@0 { > > What's the address 0 here? I will remove this, there is only one MDIO bus under the switch. > >> + #address-cells = <1>; >> + #size-cells = <0>; >> + compatible = "lantiq,xrx200-mdio"; >> + reg = <0>; >> + >> + phy0: ethernet-phy@0 { >> + reg = <0x0>; >> + }; >> + phy1: ethernet-phy@1 { >> + reg = <0x1>; >> + }; >> + phy5: ethernet-phy@5 { >> + reg = <0x5>; >> + }; >> + phy11: ethernet-phy@11 { >> + reg = <0x11>; >> + }; >> + phy13: ethernet-phy@13 { >> + reg = <0x13>; >> + }; >> + }; >> + >> + gphy-fw { >> + compatible = "lantiq,xrx200-gphy-fw", "lantiq,gphy-fw"; >> + lantiq,rcu = <&rcu0>; > > Missing #size-cells and #address-cells, but this should change as I said > above. Ok, I will change this. > >> + >> + gphy@20 { >> + reg = <0x20>; >> + >> + resets = <&reset0 31 30>; >> + reset-names = "gphy"; >> + }; >> + >> + gphy@68 { >> + reg = <0x68>; >> + >> + resets = <&reset0 29 28>; >> + reset-names = "gphy"; >> + }; >> + }; >> +}; >> -- >> 2.11.0 >>
diff --git a/Documentation/devicetree/bindings/net/dsa/lantiq-gswip.txt b/Documentation/devicetree/bindings/net/dsa/lantiq-gswip.txt new file mode 100644 index 000000000000..a089f5856778 --- /dev/null +++ b/Documentation/devicetree/bindings/net/dsa/lantiq-gswip.txt @@ -0,0 +1,141 @@ +Lantiq GSWIP Ethernet switches +================================== + +Required properties for GSWIP core: + +- compatible : "lantiq,xrx200-gswip" for the embedded GSWIP in the + xRX200 SoC +- reg : memory range of the GSWIP core registers + : memory range of the GSWIP MDIO registers + : memory range of the GSWIP MII registers + +See Documentation/devicetree/bindings/net/dsa/dsa.txt for a list of +additional required and optional properties. + + +Required properties for MDIO bus: +- compatible : "lantiq,xrx200-mdio" for the MDIO bus inside the GSWIP + core of the xRX200 SoC and the PHYs connected to it. + +See Documentation/devicetree/bindings/net/mdio.txt for a list of additional +required and optional properties. + + +Required properties for GPHY firmware loading: +- compatible : "lantiq,gphy-fw" and "lantiq,xrx200-gphy-fw", + "lantiq,xrx200a1x-gphy-fw", "lantiq,xrx200a2x-gphy-fw", + "lantiq,xrx300-gphy-fw", or "lantiq,xrx330-gphy-fw" + for the loading of the firmware into the embedded + GPHY core of the SoC. +- lantiq,rcu : reference to the rcu syscon + +The GPHY firmware loader has a list of GPHY entries, one for each +embedded GPHY + +- reg : Offset of the GPHY firmware register in the RCU + register range +- resets : list of resets of the embedded GPHY +- reset-names : list of names of the resets + +Example: + +Ethernet switch on the VRX200 SoC: + +gswip: gswip@E108000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "lantiq,xrx200-gswip"; + reg = < 0xE108000 0x3000 /* switch */ + 0xE10B100 0x70 /* mdio */ + 0xE10B1D8 0x30 /* mii */ + >; + dsa,member = <0 0>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + label = "lan3"; + phy-mode = "rgmii"; + phy-handle = <&phy0>; + }; + + port@1 { + reg = <1>; + label = "lan4"; + phy-mode = "rgmii"; + phy-handle = <&phy1>; + }; + + port@2 { + reg = <2>; + label = "lan2"; + phy-mode = "internal"; + phy-handle = <&phy11>; + }; + + port@4 { + reg = <4>; + label = "lan1"; + phy-mode = "internal"; + phy-handle = <&phy13>; + }; + + port@5 { + reg = <5>; + label = "wan"; + phy-mode = "rgmii"; + phy-handle = <&phy5>; + }; + + port@6 { + reg = <0x6>; + label = "cpu"; + ethernet = <ð0>; + }; + }; + + mdio@0 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "lantiq,xrx200-mdio"; + reg = <0>; + + phy0: ethernet-phy@0 { + reg = <0x0>; + }; + phy1: ethernet-phy@1 { + reg = <0x1>; + }; + phy5: ethernet-phy@5 { + reg = <0x5>; + }; + phy11: ethernet-phy@11 { + reg = <0x11>; + }; + phy13: ethernet-phy@13 { + reg = <0x13>; + }; + }; + + gphy-fw { + compatible = "lantiq,xrx200-gphy-fw", "lantiq,gphy-fw"; + lantiq,rcu = <&rcu0>; + + gphy@20 { + reg = <0x20>; + + resets = <&reset0 31 30>; + reset-names = "gphy"; + }; + + gphy@68 { + reg = <0x68>; + + resets = <&reset0 29 28>; + reset-names = "gphy"; + }; + }; +};
This adds the binding for the GSWIP (Gigabit switch) core found in the xrx200 / VR9 Lantiq / Intel SoC. This part takes care of the switch, MDIO bus, and loading the FW into the embedded GPHYs. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Cc: devicetree@vger.kernel.org --- .../devicetree/bindings/net/dsa/lantiq-gswip.txt | 141 +++++++++++++++++++++ 1 file changed, 141 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/dsa/lantiq-gswip.txt