| Message ID | 20230120205318.519493-2-arinc.unal@arinc9.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm: dts: mt7623: relocate gmacs, mt7530 switch, and mux phy | expand |
Am 20. Januar 2023 21:53:14 MEZ schrieb "Arınç ÜNAL" <arinc.unal@arinc9.com>: >index 25d31e40a553..5eb698a90d34 100644 >--- a/arch/arm/boot/dts/mt7623.dtsi >+++ b/arch/arm/boot/dts/mt7623.dtsi >@@ -981,6 +981,20 @@ eth: ethernet@1b100000 { > #address-cells = <1>; > #size-cells = <0>; > status = "disabled"; >+ >+ gmac0: mac@0 { >+ compatible = "mediatek,eth-mac"; >+ reg = <0>; >+ phy-mode = "trgmii"; >+ status = "disabled"; >+ }; >+ >+ gmac1: mac@1 { >+ compatible = "mediatek,eth-mac"; >+ reg = <1>; >+ phy-mode = "rgmii"; >+ status = "disabled"; >+ }; > }; > >diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts >index 5008115d2494..a5800a524302 100644 >--- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts >+++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts >@@ -175,9 +175,7 @@ ð { > status = "okay"; > > gmac0: mac@0 { Should node not be accessed with label (&gmac0) instead of defining it again and shadow the one from dtsi? >- compatible = "mediatek,eth-mac"; >- reg = <0>; >- phy-mode = "trgmii"; >+ status = "okay"; > > fixed-link { > speed = <1000>; Same for other boards. regards Frank
On 25.01.2023 19:45, Frank Wunderlich wrote: > Am 20. Januar 2023 21:53:14 MEZ schrieb "Arınç ÜNAL" <arinc.unal@arinc9.com>: > >> index 25d31e40a553..5eb698a90d34 100644 >> --- a/arch/arm/boot/dts/mt7623.dtsi >> +++ b/arch/arm/boot/dts/mt7623.dtsi >> @@ -981,6 +981,20 @@ eth: ethernet@1b100000 { >> #address-cells = <1>; >> #size-cells = <0>; >> status = "disabled"; >> + >> + gmac0: mac@0 { >> + compatible = "mediatek,eth-mac"; >> + reg = <0>; >> + phy-mode = "trgmii"; >> + status = "disabled"; >> + }; >> + >> + gmac1: mac@1 { >> + compatible = "mediatek,eth-mac"; >> + reg = <1>; >> + phy-mode = "rgmii"; >> + status = "disabled"; >> + }; >> }; >> > >> diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts >> index 5008115d2494..a5800a524302 100644 >> --- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts >> +++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts >> @@ -175,9 +175,7 @@ ð { >> status = "okay"; >> >> gmac0: mac@0 { > > Should node not be accessed with label (&gmac0) instead of defining it again and shadow the one from dtsi? I think that's up to preference. I kept it the current way as it's cleaner than taking it out of ð. Arınç
On 25/01/2023 17:52, Arınç ÜNAL wrote: > On 25.01.2023 19:45, Frank Wunderlich wrote: >> Am 20. Januar 2023 21:53:14 MEZ schrieb "Arınç ÜNAL" <arinc.unal@arinc9.com>: >> >>> index 25d31e40a553..5eb698a90d34 100644 >>> --- a/arch/arm/boot/dts/mt7623.dtsi >>> +++ b/arch/arm/boot/dts/mt7623.dtsi >>> @@ -981,6 +981,20 @@ eth: ethernet@1b100000 { >>> #address-cells = <1>; >>> #size-cells = <0>; >>> status = "disabled"; >>> + >>> + gmac0: mac@0 { >>> + compatible = "mediatek,eth-mac"; >>> + reg = <0>; >>> + phy-mode = "trgmii"; >>> + status = "disabled"; >>> + }; >>> + >>> + gmac1: mac@1 { >>> + compatible = "mediatek,eth-mac"; >>> + reg = <1>; >>> + phy-mode = "rgmii"; >>> + status = "disabled"; >>> + }; >>> }; >>> >> >>> diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts >>> b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts >>> index 5008115d2494..a5800a524302 100644 >>> --- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts >>> +++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts >>> @@ -175,9 +175,7 @@ ð { >>> status = "okay"; >>> >>> gmac0: mac@0 { >> >> Should node not be accessed with label (&gmac0) instead of defining it again >> and shadow the one from dtsi? > > I think that's up to preference. I kept it the current way as it's cleaner than > taking it out of ð. > I'd prefer to do use the label, so that we stay consistent in the source tree. I'll remove the whole series for now. Please provide a v2. Thanks, Matthias
diff --git a/arch/arm/boot/dts/mt7623.dtsi b/arch/arm/boot/dts/mt7623.dtsi index 25d31e40a553..5eb698a90d34 100644 --- a/arch/arm/boot/dts/mt7623.dtsi +++ b/arch/arm/boot/dts/mt7623.dtsi @@ -981,6 +981,20 @@ eth: ethernet@1b100000 { #address-cells = <1>; #size-cells = <0>; status = "disabled"; + + gmac0: mac@0 { + compatible = "mediatek,eth-mac"; + reg = <0>; + phy-mode = "trgmii"; + status = "disabled"; + }; + + gmac1: mac@1 { + compatible = "mediatek,eth-mac"; + reg = <1>; + phy-mode = "rgmii"; + status = "disabled"; + }; }; crypto: crypto@1b240000 { diff --git a/arch/arm/boot/dts/mt7623a-rfb-emmc.dts b/arch/arm/boot/dts/mt7623a-rfb-emmc.dts index e8b4b6d30d19..8297123f9d09 100644 --- a/arch/arm/boot/dts/mt7623a-rfb-emmc.dts +++ b/arch/arm/boot/dts/mt7623a-rfb-emmc.dts @@ -116,9 +116,7 @@ ð { status = "okay"; gmac0: mac@0 { - compatible = "mediatek,eth-mac"; - reg = <0>; - phy-mode = "trgmii"; + status = "okay"; fixed-link { speed = <1000>; diff --git a/arch/arm/boot/dts/mt7623a-rfb-nand.dts b/arch/arm/boot/dts/mt7623a-rfb-nand.dts index 61f5da68d4b0..9ee859b8eea7 100644 --- a/arch/arm/boot/dts/mt7623a-rfb-nand.dts +++ b/arch/arm/boot/dts/mt7623a-rfb-nand.dts @@ -120,9 +120,7 @@ ð { status = "okay"; gmac0: mac@0 { - compatible = "mediatek,eth-mac"; - reg = <0>; - phy-mode = "trgmii"; + status = "okay"; fixed-link { speed = <1000>; diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts index 5008115d2494..a5800a524302 100644 --- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts +++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts @@ -175,9 +175,7 @@ ð { status = "okay"; gmac0: mac@0 { - compatible = "mediatek,eth-mac"; - reg = <0>; - phy-mode = "trgmii"; + status = "okay"; fixed-link { speed = <1000>; diff --git a/arch/arm/boot/dts/mt7623n-rfb-emmc.dts b/arch/arm/boot/dts/mt7623n-rfb-emmc.dts index bf67a8e9be59..2a869a6476eb 100644 --- a/arch/arm/boot/dts/mt7623n-rfb-emmc.dts +++ b/arch/arm/boot/dts/mt7623n-rfb-emmc.dts @@ -160,9 +160,7 @@ ð { status = "okay"; gmac0: mac@0 { - compatible = "mediatek,eth-mac"; - reg = <0>; - phy-mode = "trgmii"; + status = "okay"; fixed-link { speed = <1000>; @@ -172,9 +170,7 @@ fixed-link { }; mac@1 { - compatible = "mediatek,eth-mac"; - reg = <1>; - phy-mode = "rgmii"; + status = "okay"; phy-handle = <&phy5>; };
There are two gigabit MACs on the MT7623AI and MT7623NI SoCs. Add them to mt7623.dtsi and adjust the DTs that call mt7623.dtsi. Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com> --- arch/arm/boot/dts/mt7623.dtsi | 14 ++++++++++++++ arch/arm/boot/dts/mt7623a-rfb-emmc.dts | 4 +--- arch/arm/boot/dts/mt7623a-rfb-nand.dts | 4 +--- arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 4 +--- arch/arm/boot/dts/mt7623n-rfb-emmc.dts | 8 ++------ 5 files changed, 19 insertions(+), 15 deletions(-)