[PATCH] arm64: dts: {mt7622,mt7986}: add port@5 as CPU port

Arınç ÜNAL posted 1 patch 1 year ago
.../dts/mediatek/mt7622-bananapi-bpi-r64.dts  | 12 ++++++++++
arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts  | 24 +++++++++++++++++++
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts  | 24 +++++++++++++++++++
arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts  | 24 +++++++++++++++++++
4 files changed, 84 insertions(+)
[PATCH] arm64: dts: {mt7622,mt7986}: add port@5 as CPU port
Posted by Arınç ÜNAL 1 year ago
On Banana Pi BPI-R64, MediaTek MT7622 RFB1 board, MediaTek MT7986b RFB, and
MediaTek MT7986a RFB, port 5 of the MT7531 switch is connected to the
second MAC of the SoC as a CPU port. Add the port and set up the second MAC
on the bindings.

Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
---
 .../dts/mediatek/mt7622-bananapi-bpi-r64.dts  | 12 ++++++++++
 arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts  | 24 +++++++++++++++++++
 arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts  | 24 +++++++++++++++++++
 arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts  | 24 +++++++++++++++++++
 4 files changed, 84 insertions(+)

diff --git a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
index 86cedb0bf1a9..f2cc95d4a343 100644
--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
+++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
@@ -186,6 +186,18 @@ port@4 {
 					label = "lan3";
 				};
 
+				port@5 {
+					reg = <5>;
+					ethernet = <&gmac1>;
+					phy-mode = "rgmii";
+
+					fixed-link {
+						speed = <1000>;
+						full-duplex;
+						pause;
+					};
+				};
+
 				port@6 {
 					reg = <6>;
 					label = "cpu";
diff --git a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
index dad8e683aac5..018912964b32 100644
--- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
+++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
@@ -117,6 +117,18 @@ fixed-link {
 		};
 	};
 
+	gmac1: mac@1 {
+		compatible = "mediatek,eth-mac";
+		reg = <1>;
+		phy-mode = "rgmii";
+
+		fixed-link {
+			speed = <1000>;
+			full-duplex;
+			pause;
+		};
+	};
+
 	mdio-bus {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -155,6 +167,18 @@ port@4 {
 					label = "wan";
 				};
 
+				port@5 {
+					reg = <5>;
+					ethernet = <&gmac1>;
+					phy-mode = "rgmii";
+
+					fixed-link {
+						speed = <1000>;
+						full-duplex;
+						pause;
+					};
+				};
+
 				port@6 {
 					reg = <6>;
 					label = "cpu";
diff --git a/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts b/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts
index 3ef371ca254e..3aba067f56b6 100644
--- a/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts
+++ b/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts
@@ -65,6 +65,18 @@ fixed-link {
 		};
 	};
 
+	gmac1: mac@1 {
+		compatible = "mediatek,eth-mac";
+		reg = <1>;
+		phy-mode = "rgmii";
+
+		fixed-link {
+			speed = <1000>;
+			full-duplex;
+			pause;
+		};
+	};
+
 	mdio: mdio-bus {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -287,6 +299,18 @@ port@4 {
 			label = "lan4";
 		};
 
+		port@5 {
+			reg = <5>;
+			ethernet = <&gmac1>;
+			phy-mode = "rgmii";
+
+			fixed-link {
+				speed = <1000>;
+				full-duplex;
+				pause;
+			};
+		};
+
 		port@6 {
 			reg = <6>;
 			label = "cpu";
diff --git a/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts b/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts
index dde190442e38..89ca852a9854 100644
--- a/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts
+++ b/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts
@@ -45,6 +45,18 @@ fixed-link {
 		};
 	};
 
+	gmac1: mac@1 {
+		compatible = "mediatek,eth-mac";
+		reg = <1>;
+		phy-mode = "rgmii";
+
+		fixed-link {
+			speed = <1000>;
+			full-duplex;
+			pause;
+		};
+	};
+
 	mdio: mdio-bus {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -83,6 +95,18 @@ port@4 {
 					label = "lan4";
 				};
 
+				port@5 {
+					reg = <5>;
+					ethernet = <&gmac1>;
+					phy-mode = "rgmii";
+
+					fixed-link {
+						speed = <1000>;
+						full-duplex;
+						pause;
+					};
+				};
+
 				port@6 {
 					reg = <6>;
 					label = "cpu";
-- 
2.39.2

Re: [PATCH] arm64: dts: {mt7622,mt7986}: add port@5 as CPU port
Posted by Arınç ÜNAL 7 months ago
Matthias, please apply this patch.

Arınç
Re: [PATCH] arm64: dts: {mt7622,mt7986}: add port@5 as CPU port
Posted by AngeloGioacchino Del Regno 7 months ago
Il 18/02/24 11:52, Arınç ÜNAL ha scritto:
> Matthias, please apply this patch.
> 
> Arınç

Please split this by SoC and resend as two patches.

If you can resend fast enough, I can apply the patches for 6.9.

Cheers,
Angelo
Re: [PATCH] arm64: dts: {mt7622,mt7986}: add port@5 as CPU port
Posted by Arınç ÜNAL 7 months ago
On 19.02.2024 12:17, AngeloGioacchino Del Regno wrote:
> Il 18/02/24 11:52, Arınç ÜNAL ha scritto:
>> Matthias, please apply this patch.
>>
>> Arınç
> 
> Please split this by SoC and resend as two patches.
> 
> If you can resend fast enough, I can apply the patches for 6.9.

Done.

https://lore.kernel.org/linux-mediatek/20240219-for-mediatek-v1-0-7078f23eab82@arinc9.com/

Arınç