[openwrt/openwrt] mediatek: mt7622: bpi-r64: allow MAC addresses to be inherited

[LEDE Commits]

dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/ca14dfb06b09beb664318459241c948bd98c9332

commit ca14dfb06b09beb664318459241c948bd98c9332
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Fri Mar 5 19:09:10 2021 +0000

    mediatek: mt7622: bpi-r64: allow MAC addresses to be inherited
    
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 .../mediatek/patches-5.10/112-dts-fix-bpi64-lan-names.patch    | 10 +++++++++-
 .../patches-5.10/113-dts-fix-bpi64-leds-and-buttons.patch      |  8 ++++----
 ...-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/target/linux/mediatek/patches-5.10/112-dts-fix-bpi64-lan-names.patch b/target/linux/mediatek/patches-5.10/112-dts-fix-bpi64-lan-names.patch
index 55c84812d0..d061a9139d 100644
--- a/target/linux/mediatek/patches-5.10/112-dts-fix-bpi64-lan-names.patch
+++ b/target/linux/mediatek/patches-5.10/112-dts-fix-bpi64-lan-names.patch
@@ -1,6 +1,14 @@
 --- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
 +++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
-@@ -160,22 +160,22 @@
+@@ -18,6 +18,7 @@
+ 
+ 	aliases {
+ 		serial0 = &uart0;
++		ethernet0 = &gmac0;
+ 	};
+ 
+ 	chosen {
+@@ -160,22 +162,22 @@
  
  				port at 1 {
  					reg = <1>;
diff --git a/target/linux/mediatek/patches-5.10/113-dts-fix-bpi64-leds-and-buttons.patch b/target/linux/mediatek/patches-5.10/113-dts-fix-bpi64-leds-and-buttons.patch
index 03128a5ef8..baf0d4ef64 100644
--- a/target/linux/mediatek/patches-5.10/113-dts-fix-bpi64-leds-and-buttons.patch
+++ b/target/linux/mediatek/patches-5.10/113-dts-fix-bpi64-leds-and-buttons.patch
@@ -1,9 +1,9 @@
 --- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
 +++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
-@@ -18,6 +18,10 @@
- 
+@@ -20,6 +20,10 @@
  	aliases {
  		serial0 = &uart0;
+ 		ethernet0 = &gmac0;
 +		led-boot = &led_system_green;
 +		led-failsafe = &led_system_blue;
 +		led-running = &led_system_green;
@@ -11,7 +11,7 @@
  	};
  
  	chosen {
-@@ -41,8 +45,8 @@
+@@ -43,8 +47,8 @@
  		compatible = "gpio-keys";
  
  		factory {
@@ -22,7 +22,7 @@
  			gpios = <&pio 0 GPIO_ACTIVE_HIGH>;
  		};
  
-@@ -56,17 +60,25 @@
+@@ -58,17 +62,25 @@
  	leds {
  		compatible = "gpio-leds";
  
diff --git a/target/linux/mediatek/patches-5.10/602-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch b/target/linux/mediatek/patches-5.10/602-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch
index 19468ae037..f771b1866f 100644
--- a/target/linux/mediatek/patches-5.10/602-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch
+++ b/target/linux/mediatek/patches-5.10/602-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch
@@ -253,7 +253,7 @@ Signed-off-by: chuanjia.liu <Chuanjia.Liu at mediatek.com>
  				#interrupt-cells = <1>;
 --- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
 +++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
-@@ -269,18 +269,16 @@
+@@ -271,18 +271,16 @@
  	};
  };