mediatek: disable btif for mt7622 devices

It breaks built-in SoC WLAN. Can be re-enabled after we've figured out the cause

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/target/linux/mediatek/dts/mt7622-dlink-eagle-pro-ai-ax3200-a1.dtsi b/target/linux/mediatek/dts/mt7622-dlink-eagle-pro-ai-ax3200-a1.dtsi
index 6d87454370611c7a19dad3befbd76e7210ea1897..10cee7bceff724115e14ade188ef384eee64a202 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-dlink-eagle-pro-ai-ax3200-a1.dtsi
+++ b/target/linux/mediatek/dts/mt7622-dlink-eagle-pro-ai-ax3200-a1.dtsi
@@ -54,10 +54,6 @@
        status = "okay";
 };
 
-&btif {
-       status = "okay";
-};
-
 &eth {
        pinctrl-names = "default";
        pinctrl-0 = <&eth_pins>;

diff --git a/target/linux/mediatek/dts/mt7622-linksys-e8450.dtsi b/target/linux/mediatek/dts/mt7622-linksys-e8450.dtsi
index abac02a72d022ea99218fac7f02c68abc1de345e..be216d972cfa57f7ccb1f820d96d9efd7a067d06 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-linksys-e8450.dtsi
+++ b/target/linux/mediatek/dts/mt7622-linksys-e8450.dtsi
@@ -110,10 +110,6 @@
        };
 };
 
-&btif {
-       status = "okay";
-};
-
 &cir {
        pinctrl-names = "default";
        pinctrl-0 = <&irrx_pins>;

diff --git a/target/linux/mediatek/dts/mt7622-netgear-wax206.dts b/target/linux/mediatek/dts/mt7622-netgear-wax206.dts
index 737ac35f3d548c8a73d017c8b882002c5d276878..ce1cd46d2d96de26b3094029889f11b04e0d70e2 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-netgear-wax206.dts
+++ b/target/linux/mediatek/dts/mt7622-netgear-wax206.dts
@@ -114,10 +114,6 @@
        status = "okay";
 };
 
-&btif {
-       status = "okay";
-};
-
 &cir {
        pinctrl-names = "default";
        pinctrl-0 = <&irrx_pins>;

diff --git a/target/linux/mediatek/patches-6.1/106-dts-mt7622-disable_btif.patch b/target/linux/mediatek/patches-6.1/106-dts-mt7622-disable_btif.patch
new file mode 100644 (file)
index 0000000..fc6a8f3
--- /dev/null
+++ b/target/linux/mediatek/patches-6.1/106-dts-mt7622-disable_btif.patch
@@ -0,0 +1,26 @@
+--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
++++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
+@@ -108,10 +108,6 @@
+       status = "disabled";
+ };
+ 
+-&btif {
+-      status = "okay";
+-};
+-
+ &cir {
+       pinctrl-names = "default";
+       pinctrl-0 = <&irrx_pins>;
+--- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
++++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
+@@ -89,10 +89,6 @@
+       status = "disabled";
+ };
+ 
+-&btif {
+-      status = "okay";
+-};
+-
+ &cir {
+       pinctrl-names = "default";
+       pinctrl-0 = <&irrx_pins>;

diff --git a/target/linux/mediatek/patches-6.1/112-dts-fix-bpi64-lan-names.patch b/target/linux/mediatek/patches-6.1/112-dts-fix-bpi64-lan-names.patch
index 816683e6267abef4cb5f69c5472872dec7adbfb9..b012a48d752e3d6856c64de2341748985da5d31c 100644 (file)
--- a/target/linux/mediatek/patches-6.1/112-dts-fix-bpi64-lan-names.patch
+++ b/target/linux/mediatek/patches-6.1/112-dts-fix-bpi64-lan-names.patch
@@ -8,7 +8,7 @@
        };
  
        chosen {
-@@ -164,22 +165,22 @@
+@@ -160,22 +161,22 @@
  
                                port@1 {
                                        reg = <1>;

diff --git a/target/linux/mediatek/patches-6.1/114-dts-bpi64-disable-rtc.patch b/target/linux/mediatek/patches-6.1/114-dts-bpi64-disable-rtc.patch
index 3d1b90217f1757b2b80d0d82ef5e4fe08cb2395b..e30d9e5e12a7e6ea157e92b5f8ab19c42e3dec9e 100644 (file)
--- a/target/linux/mediatek/patches-6.1/114-dts-bpi64-disable-rtc.patch
+++ b/target/linux/mediatek/patches-6.1/114-dts-bpi64-disable-rtc.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
-@@ -558,12 +558,16 @@
+@@ -554,12 +554,16 @@
        status = "okay";
  };
  

diff --git a/target/linux/mediatek/patches-6.1/115-dts-bpi64-add-snand-support.patch b/target/linux/mediatek/patches-6.1/115-dts-bpi64-add-snand-support.patch
index b159a17c4a2f9721972543a0820bc2ced242f818..93f87fe697f6f2f155d7aa1d2113eb9160648cd2 100644 (file)
--- a/target/linux/mediatek/patches-6.1/115-dts-bpi64-add-snand-support.patch
+++ b/target/linux/mediatek/patches-6.1/115-dts-bpi64-add-snand-support.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
-@@ -255,14 +255,42 @@
+@@ -251,14 +251,42 @@
        status = "disabled";
  };
  

diff --git a/target/linux/mediatek/patches-6.1/131-dts-mt7622-add-snand-support.patch b/target/linux/mediatek/patches-6.1/131-dts-mt7622-add-snand-support.patch
index 9cfe69ebb6af902c4a97b65fb664879edb8a98ce..d6e0ab1d41ca900c1d0ee299674429614b95782e 100644 (file)
--- a/target/linux/mediatek/patches-6.1/131-dts-mt7622-add-snand-support.patch
+++ b/target/linux/mediatek/patches-6.1/131-dts-mt7622-add-snand-support.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
 +++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
-@@ -538,6 +538,65 @@
+@@ -534,6 +534,65 @@
        status = "disabled";
  };
  

diff --git a/target/linux/mediatek/patches-6.1/140-dts-fix-wmac-support-for-mt7622-rfb1.patch b/target/linux/mediatek/patches-6.1/140-dts-fix-wmac-support-for-mt7622-rfb1.patch
index b01ce97cf017c8353ddfeea70776a965b28b01be..117d5abde66c1cb3884ab2204d718416a97f3a02 100644 (file)
--- a/target/linux/mediatek/patches-6.1/140-dts-fix-wmac-support-for-mt7622-rfb1.patch
+++ b/target/linux/mediatek/patches-6.1/140-dts-fix-wmac-support-for-mt7622-rfb1.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
 +++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
-@@ -579,7 +579,7 @@
+@@ -575,7 +575,7 @@
                                reg = <0x140000 0x0080000>;
                        };
  
@@ -9,7 +9,7 @@
                                label = "Factory";
                                reg = <0x1c0000 0x0100000>;
                        };
-@@ -640,5 +640,6 @@
+@@ -636,5 +636,6 @@
  &wmac {
        pinctrl-names = "default";
        pinctrl-0 = <&wmac_pins>;

diff --git a/target/linux/mediatek/patches-6.1/180-dts-mt7622-bpi-r64-add-mt7531-irq.patch b/target/linux/mediatek/patches-6.1/180-dts-mt7622-bpi-r64-add-mt7531-irq.patch
index 5a834ac34f82ce09209021fd25292a00f4b548bf..676c09f656cd065ef566af9567b563aa0d727cfe 100644 (file)
--- a/target/linux/mediatek/patches-6.1/180-dts-mt7622-bpi-r64-add-mt7531-irq.patch
+++ b/target/linux/mediatek/patches-6.1/180-dts-mt7622-bpi-r64-add-mt7531-irq.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
-@@ -156,6 +156,10 @@
+@@ -152,6 +152,10 @@
                switch@0 {
                        compatible = "mediatek,mt7531";
                        reg = <0>;

diff --git a/target/linux/mediatek/patches-6.1/331-mt7622-rfb1-enable-bmt.patch b/target/linux/mediatek/patches-6.1/331-mt7622-rfb1-enable-bmt.patch
index 662515f2c5222a1517111f75ef09432ecf2b90ba..3e956701cd3dbc282c92dc2a36d92db45a28e951 100644 (file)
--- a/target/linux/mediatek/patches-6.1/331-mt7622-rfb1-enable-bmt.patch
+++ b/target/linux/mediatek/patches-6.1/331-mt7622-rfb1-enable-bmt.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
 +++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
-@@ -552,6 +552,7 @@
+@@ -548,6 +548,7 @@
                spi-tx-bus-width = <4>;
                spi-rx-bus-width = <4>;
                nand-ecc-engine = <&snfi>;

diff --git a/target/linux/mediatek/patches-6.1/900-dts-mt7622-bpi-r64-aliases-for-dtoverlay.patch b/target/linux/mediatek/patches-6.1/900-dts-mt7622-bpi-r64-aliases-for-dtoverlay.patch
index 600b94d7bbe1200c2304719de99315355db8011d..8e56be9ff44a72b9fe6d6078be15f490a1bf1595 100644 (file)
--- a/target/linux/mediatek/patches-6.1/900-dts-mt7622-bpi-r64-aliases-for-dtoverlay.patch
+++ b/target/linux/mediatek/patches-6.1/900-dts-mt7622-bpi-r64-aliases-for-dtoverlay.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
-@@ -314,7 +314,7 @@
+@@ -310,7 +310,7 @@
        /* Attention: GPIO 90 is used to switch between PCIe@1,0 and
         * SATA functions. i.e. output-high: PCIe, output-low: SATA
         */

diff --git a/target/linux/mediatek/patches-6.1/910-dts-mt7622-bpi-r64-wifi-eeprom.patch b/target/linux/mediatek/patches-6.1/910-dts-mt7622-bpi-r64-wifi-eeprom.patch
index a45d51dd9f0aaa355df25855f8a7ea8d6c6310da..b6762e29ac02b412d1b084f429f26aac43237e1c 100644 (file)
--- a/target/linux/mediatek/patches-6.1/910-dts-mt7622-bpi-r64-wifi-eeprom.patch
+++ b/target/linux/mediatek/patches-6.1/910-dts-mt7622-bpi-r64-wifi-eeprom.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
-@@ -641,5 +641,28 @@
+@@ -637,5 +637,28 @@
  };
  
  &wmac {