| Message ID | 20230201185656.17164-5-arinc.unal@arinc9.com |
|---|---|
| State | New |
| Headers | show |
| Series | arm: dts: mt7623: relocate gmacs, mt7530 switch, and mux phy | expand |
Am 1. Februar 2023 19:56:55 MEZ schrieb arinc9.unal@gmail.com: >From: Arınç ÜNAL <arinc.unal@arinc9.com> > >Mux the MT7530 switch's phy0 to gmac5 which is wired to the SoC's gmac1. >This achieves 2 Gbps total bandwidth to the CPU using the second RGMII. > >With this, the interface name to access phy0 changes from wan to eth1. > >Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com> >--- > arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) > >diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts >index dc9b4f99eb8b..64700253fd35 100644 >--- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts >+++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts >@@ -182,6 +182,12 @@ fixed-link { > }; > }; > >+&gmac1 { >+ status = "okay"; >+ phy-mode = "rgmii"; >+ phy-handle = <ðphy0>; >+}; >+ > ð { > status = "okay"; > >@@ -189,6 +195,10 @@ mdio-bus { > #address-cells = <1>; > #size-cells = <0>; > >+ ethphy0: ethernet-phy@0 { >+ reg = <0>; >+ }; >+ > switch@1f { > compatible = "mediatek,mt7530"; > reg = <0x1f>; >@@ -200,11 +210,6 @@ ports { > #address-cells = <1>; > #size-cells = <0>; > >- port@0 { >- reg = <0>; >- label = "wan"; >- }; >- > port@1 { > reg = <1>; > label = "lan0"; Hi I still see Problem with "renaming" the wan from users PoV. I got another way of using second gmac for wan some time ago using vlan-aware bridge (have not tested with recent kernel versions). Maybe this works for you too? If yes imho it will be a better way. https://github.com/frank-w/BPI-Router-Linux/commit/c92b648bac996b34dc75a4fff15d7fb429bfe74b Have same for r64/mt7622 in my tree... It should use eth1 for wan-traffic too but is full userspace configuration without breaking userspace for users not wanting it. regards Frank
OK, hold this patch series, I'm going to send v3 soon with enabling both CPU ports to support changing the DSA master. We've got developments on the MediaTek ethernet driver and MT7530 DSA subdriver that surpassed my expectations. Arınç On 1.02.2023 21:56, arinc9.unal@gmail.com wrote: > From: Arınç ÜNAL <arinc.unal@arinc9.com> > > Mux the MT7530 switch's phy0 to gmac5 which is wired to the SoC's gmac1. > This achieves 2 Gbps total bandwidth to the CPU using the second RGMII. > > With this, the interface name to access phy0 changes from wan to eth1. > > Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com> > --- > arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts > index dc9b4f99eb8b..64700253fd35 100644 > --- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts > +++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts > @@ -182,6 +182,12 @@ fixed-link { > }; > }; > > +&gmac1 { > + status = "okay"; > + phy-mode = "rgmii"; > + phy-handle = <ðphy0>; > +}; > + > ð { > status = "okay"; > > @@ -189,6 +195,10 @@ mdio-bus { > #address-cells = <1>; > #size-cells = <0>; > > + ethphy0: ethernet-phy@0 { > + reg = <0>; > + }; > + > switch@1f { > compatible = "mediatek,mt7530"; > reg = <0x1f>; > @@ -200,11 +210,6 @@ ports { > #address-cells = <1>; > #size-cells = <0>; > > - port@0 { > - reg = <0>; > - label = "wan"; > - }; > - > port@1 { > reg = <1>; > label = "lan0";
diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts index dc9b4f99eb8b..64700253fd35 100644 --- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts +++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts @@ -182,6 +182,12 @@ fixed-link { }; }; +&gmac1 { + status = "okay"; + phy-mode = "rgmii"; + phy-handle = <ðphy0>; +}; + ð { status = "okay"; @@ -189,6 +195,10 @@ mdio-bus { #address-cells = <1>; #size-cells = <0>; + ethphy0: ethernet-phy@0 { + reg = <0>; + }; + switch@1f { compatible = "mediatek,mt7530"; reg = <0x1f>; @@ -200,11 +210,6 @@ ports { #address-cells = <1>; #size-cells = <0>; - port@0 { - reg = <0>; - label = "wan"; - }; - port@1 { reg = <1>; label = "lan0";