From c43b1c0e9d01812ff07bcd8f22d8508ab50eec5a Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 16 Nov 2020 15:56:08 +0100
Subject: [PATCH] BPI-R2: Remove second gmac

---
 .../0100-dts-add-second-gmac.patch            | 54 -------------------
 .../patches-5.4/0999-lan-to-wan.patch         | 20 ++-----
 2 files changed, 3 insertions(+), 71 deletions(-)
 delete mode 100644 root/target/linux/mediatek/patches-5.4/0100-dts-add-second-gmac.patch

diff --git a/root/target/linux/mediatek/patches-5.4/0100-dts-add-second-gmac.patch b/root/target/linux/mediatek/patches-5.4/0100-dts-add-second-gmac.patch
deleted file mode 100644
index d985a929..00000000
--- a/root/target/linux/mediatek/patches-5.4/0100-dts-add-second-gmac.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 97fdec52fff8079d3af104e8723602a3cb9d2a11 Mon Sep 17 00:00:00 2001
-From: Frank Wunderlich <frank-w@public-files.de>
-Date: Thu, 20 Jun 2019 23:06:41 +0200
-Subject: [PATCH] net: dts: add second gmac for bananapi r2
-
----
- arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
-index 2b760f90f38c..fad09608b86c 100644
---- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
-+++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
-@@ -143,13 +143,25 @@
- 		};
- 	};
- 
-+	gmac1: mac@1 {
-+		compatible = "mediatek,eth-mac";
-+		reg = <1>;
-+		label = "wan";
-+		phy-mode = "rgmii";
-+		phy-handle = <&ephy0>;
-+	};
-+
- 	mdio: mdio-bus {
- 		#address-cells = <1>;
- 		#size-cells = <0>;
- 
--		switch@0 {
--			compatible = "mediatek,mt7530";
-+		ephy0: ethernet-phy@0 {
- 			reg = <0>;
-+		};
-+
-+		switch@1f {
-+			compatible = "mediatek,mt7530";
-+			reg = <0x1f>;
- 			reset-gpios = <&pio 33 0>;
- 			core-supply = <&mt6323_vpa_reg>;
- 			io-supply = <&mt6323_vemc3v3_reg>;
-@@ -158,10 +170,12 @@
- 				#address-cells = <1>;
- 				#size-cells = <0>;
- 
-+/* Disabled, is now handled by gmac1 (eth1/wan) via phy-handle!
- 				port@0 {
- 					reg = <0>;
- 					label = "wan";
- 				};
-+*/
- 
- 				port@1 {
- 					reg = <1>;
diff --git a/root/target/linux/mediatek/patches-5.4/0999-lan-to-wan.patch b/root/target/linux/mediatek/patches-5.4/0999-lan-to-wan.patch
index d780caba..65a2246b 100644
--- a/root/target/linux/mediatek/patches-5.4/0999-lan-to-wan.patch
+++ b/root/target/linux/mediatek/patches-5.4/0999-lan-to-wan.patch
@@ -1,26 +1,12 @@
---- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts	2020-04-19 11:02:56.505715879 +0200
-+++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts	2020-04-19 11:03:53.620780390 +0200
-@@ -196,7 +196,7 @@
- 	gmac1: mac@1 {
- 		compatible = "mediatek,eth-mac";
- 		reg = <1>;
--		label = "wan";
-+		label = "lan";
- 		phy-mode = "rgmii";
- 		phy-handle = <&ephy0>;
- 		local-mac-address = [00 0a 35 00 00 02];
-@@ -221,31 +221,31 @@
- 				#address-cells = <1>;
- 				#size-cells = <0>;
+--- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts.anc	2020-11-16 15:48:00.852410183 +0100
++++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts	2020-11-16 15:49:23.878965822 +0100
+@@ -210,27 +210,27 @@
  
--/* Disabled, is now handled by gmac1 (eth1/wan) via phy-handle!
-+/* Disabled, is now handled by gmac1 (eth1/lan) via phy-handle!
  				port@0 {
  					reg = <0>;
 -					label = "wan";
 +					label = "lan";
  				};
- */
  
  				port@1 {
  					reg = <1>;