[openwrt/openwrt] mediatek: disable RTC on Bananapi R64 and refresh patches

[LEDE Commits]

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

commit 8dd0215676a304456d25ff3ac4542c7303831a90
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Sat Mar 6 18:38:30 2021 +0000

    mediatek: disable RTC on Bananapi R64 and refresh patches
    
    The in-SoC RTC of the Bananapi R64 is more disruptive than useful
    without a battery connected. Disable it to not have Linux use the
    RTC provided time 2000-01-01 00:00:00 after power-loss.
    
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 .../patches-5.10/112-dts-fix-bpi64-lan-names.patch  |  2 +-
 .../113-dts-fix-bpi64-leds-and-buttons.patch        |  6 +++---
 .../patches-5.10/114-dts-bpi64-disable-rtc.patch    | 21 +++++++++++++++++++++
 ...mediatek-Split-PCIe-node-for-MT2712-MT7622.patch |  2 +-
 4 files changed, 26 insertions(+), 5 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 d061a9139d..6ce85efde9 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
@@ -8,7 +8,7 @@
  	};
  
  	chosen {
-@@ -160,22 +162,22 @@
+@@ -160,22 +161,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 baf0d4ef64..f88dbc7195 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,6 +1,6 @@
 --- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
 +++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
-@@ -20,6 +20,10 @@
+@@ -19,6 +19,10 @@
  	aliases {
  		serial0 = &uart0;
  		ethernet0 = &gmac0;
@@ -11,7 +11,7 @@
  	};
  
  	chosen {
-@@ -43,8 +47,8 @@
+@@ -42,8 +46,8 @@
  		compatible = "gpio-keys";
  
  		factory {
@@ -22,7 +22,7 @@
  			gpios = <&pio 0 GPIO_ACTIVE_HIGH>;
  		};
  
-@@ -58,17 +62,25 @@
+@@ -57,17 +61,25 @@
  	leds {
  		compatible = "gpio-leds";
  
diff --git a/target/linux/mediatek/patches-5.10/114-dts-bpi64-disable-rtc.patch b/target/linux/mediatek/patches-5.10/114-dts-bpi64-disable-rtc.patch
new file mode 100644
index 0000000000..261579bf37
--- /dev/null
+++ b/target/linux/mediatek/patches-5.10/114-dts-bpi64-disable-rtc.patch
@@ -0,0 +1,21 @@
+--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
++++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
+@@ -559,12 +559,16 @@
+ 	status = "okay";
+ };
+ 
++&rtc {
++	status = "disabled";
++};
++
+ &sata {
+-	status = "disable";
++	status = "disabled";
+ };
+ 
+ &sata_phy {
+-	status = "disable";
++	status = "disabled";
+ };
+ 
+ &spi0 {
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 f771b1866f..5e0114328c 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
-@@ -271,18 +271,16 @@
+@@ -270,18 +270,16 @@
  	};
  };