mediatek: more v5.4 fixes

[openwrt/staging/ynezz.git] / target / linux / mediatek / patches-5.4 / 0310-dts-add-wmac-support-for-mt7622-rfb1.patch

diff --git a/target/linux/mediatek/patches-5.4/0310-dts-add-wmac-support-for-mt7622-rfb1.patch b/target/linux/mediatek/patches-5.4/0310-dts-add-wmac-support-for-mt7622-rfb1.patch
index 463602e55224905d08f89f7686d27e776db62f65..7e24596fb8db67de2aa12bf8ee1b12e2268e4aa2 100644 (file)
--- a/target/linux/mediatek/patches-5.4/0310-dts-add-wmac-support-for-mt7622-rfb1.patch
+++ b/target/linux/mediatek/patches-5.4/0310-dts-add-wmac-support-for-mt7622-rfb1.patch
@@ -1,26 +1,27 @@
-diff --git a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
-index 1ec68de..44cc80c 100644
---- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
-+++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
-@@ -105,6 +105,18 @@
-               regulator-boot-on;
-               regulator-always-on;
+diff -urN a/arch/arm64/boot/dts/mediatek/mt7622.dtsi b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
+--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi 2020-03-31 14:47:46.554212143 +0800
++++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi 2020-03-31 14:47:32.322642377 +0800
+@@ -712,6 +712,17 @@
+               status = "disabled";
        };
-+
+ 
 +      wmac: wmac@18000000 {
 +              compatible = "mediatek,mt7622-wmac";
 +              reg = <0 0x18000000 0 0x100000>;
 +              interrupts = <GIC_SPI 211 IRQ_TYPE_LEVEL_LOW>;
 +
 +              mediatek,infracfg = <&infracfg>;
-+              status = "okay";
++              status = "disabled";
 +
 +              power-domains = <&scpsys MT7622_POWER_DOMAIN_WB>;
-+              mediatek,mtd-eeprom = <&factory 0x0000>;
 +      };
- };
- 
- &bch {
++
+       ssusbsys: ssusbsys@1a000000 {
+               compatible = "mediatek,mt7622-ssusbsys",
+                            "syscon";
+diff -urN a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
+--- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts     2020-03-31 14:48:15.769329276 +0800
++++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts     2020-03-31 14:47:54.545970592 +0800
 @@ -579,7 +591,7 @@
                                reg = <0x140000 0x0080000>;
                        };
@@ -30,3 +31,12 @@ index 1ec68de..44cc80c 100644
                                label = "Factory";
                                reg = <0x1c0000 0x0040000>;
                        };
+@@ -636,3 +636,8 @@
+       pinctrl-0 = <&watchdog_pins>;
+       status = "okay";
+ };
++
++&wmac {
++      mediatek,mtd-eeprom = <&factory 0x0000>;
++      status = "okay";
++};