arm: dts: mt7623: add gmacs to mt7623.dtsi

There are two gigabit MACs on the MT7623AI and MT7623NI SoCs. Add them to
mt7623.dtsi and adjust the DTs that call mt7623.dtsi.

Now that there are labels for the MACs, remove them from under &eth on the
DTs that call mt7623.dtsi. Remove the unnecessary mdio label from Bananapi
BPI-R2.

Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
Link: https://lore.kernel.org/r/20230210182505.24597-2-arinc.unal@arinc9.com
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>

diff --git a/arch/arm/boot/dts/mt7623.dtsi b/arch/arm/boot/dts/mt7623.dtsi
index 11379c3e6b4ca75af0c6cc5efa555770071fde81..f0b4a09004b31785733a2e6a5288014d40b5a9e6 100644 (file)
--- a/arch/arm/boot/dts/mt7623.dtsi
+++ b/arch/arm/boot/dts/mt7623.dtsi
@@ -980,6 +980,18 @@ eth: ethernet@1b100000 {
                #address-cells = <1>;
                #size-cells = <0>;
                status = "disabled";
+
+               gmac0: mac@0 {
+                       compatible = "mediatek,eth-mac";
+                       reg = <0>;
+                       status = "disabled";
+               };
+
+               gmac1: mac@1 {
+                       compatible = "mediatek,eth-mac";
+                       reg = <1>;
+                       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 e8b4b6d30d197efa2fbfd619cafd127b48010ff6..a64d68b6e16597d75a1796cbccfa9e7e9a224571 100644 (file)
--- a/arch/arm/boot/dts/mt7623a-rfb-emmc.dts
+++ b/arch/arm/boot/dts/mt7623a-rfb-emmc.dts
@@ -112,20 +112,19 @@ &crypto {
        status = "okay";
 };
 
-&eth {
+&gmac0 {
        status = "okay";
+       phy-mode = "trgmii";
 
-       gmac0: mac@0 {
-               compatible = "mediatek,eth-mac";
-               reg = <0>;
-               phy-mode = "trgmii";
-
-               fixed-link {
-                       speed = <1000>;
-                       full-duplex;
-                       pause;
-               };
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+               pause;
        };
+};
+
+&eth {
+       status = "okay";
 
        mdio-bus {
                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/mt7623a-rfb-nand.dts b/arch/arm/boot/dts/mt7623a-rfb-nand.dts
index 61f5da68d4b0ce4db9817f582b1f829159542ea3..fac3ca0322c8de85cde9f5a029ae69f6e47abfa2 100644 (file)
--- a/arch/arm/boot/dts/mt7623a-rfb-nand.dts
+++ b/arch/arm/boot/dts/mt7623a-rfb-nand.dts
@@ -116,20 +116,19 @@ &crypto {
        status = "okay";
 };
 
-&eth {
+&gmac0 {
        status = "okay";
+       phy-mode = "trgmii";
 
-       gmac0: mac@0 {
-               compatible = "mediatek,eth-mac";
-               reg = <0>;
-               phy-mode = "trgmii";
-
-               fixed-link {
-                       speed = <1000>;
-                       full-duplex;
-                       pause;
-               };
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+               pause;
        };
+};
+
+&eth {
+       status = "okay";
 
        mdio-bus {
                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
index ece61a6a7a897028d45b8bf503f3c1ee59e30c80..8ae9a99f9e6d5d8bbd349e4e14ec48ac228333bf 100644 (file)
--- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
+++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
@@ -171,22 +171,21 @@ dpi0_out: endpoint {
        };
 };
 
-&eth {
+&gmac0 {
        status = "okay";
+       phy-mode = "trgmii";
 
-       gmac0: mac@0 {
-               compatible = "mediatek,eth-mac";
-               reg = <0>;
-               phy-mode = "trgmii";
-
-               fixed-link {
-                       speed = <1000>;
-                       full-duplex;
-                       pause;
-               };
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+               pause;
        };
+};
+
+&eth {
+       status = "okay";
 
-       mdio: mdio-bus {
+       mdio-bus {
                #address-cells = <1>;
                #size-cells = <0>;
 

diff --git a/arch/arm/boot/dts/mt7623n-rfb-emmc.dts b/arch/arm/boot/dts/mt7623n-rfb-emmc.dts
index bf67a8e9be59c857b810de408168dc0a59b39f07..5e328c2a6a6e393dff4e4e6844f5fa5d4c158f28 100644 (file)
--- a/arch/arm/boot/dts/mt7623n-rfb-emmc.dts
+++ b/arch/arm/boot/dts/mt7623n-rfb-emmc.dts
@@ -156,27 +156,25 @@ dpi0_out: endpoint {
        };
 };
 
-&eth {
+&gmac0 {
        status = "okay";
+       phy-mode = "trgmii";
 
-       gmac0: mac@0 {
-               compatible = "mediatek,eth-mac";
-               reg = <0>;
-               phy-mode = "trgmii";
-
-               fixed-link {
-                       speed = <1000>;
-                       full-duplex;
-                       pause;
-               };
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+               pause;
        };
+};
 
-       mac@1 {
-               compatible = "mediatek,eth-mac";
-               reg = <1>;
-               phy-mode = "rgmii";
-               phy-handle = <&phy5>;
-       };
+&gmac1 {
+       status = "okay";
+       phy-mode = "rgmii";
+       phy-handle = <&phy5>;
+};
+
+&eth {
+       status = "okay";
 
        mdio-bus {
                #address-cells = <1>;