ramips: Fix WiFi after 5f7396ebef09b224edf08b0bda113613a42f0928

That commit exposed a bug in the DTS files used by mt7621 where the wrong
reg value for pcie1 (and potentially pcie2) was being used. This was
causing WiFi failures for interfaces in pcie1.

eg. 2.4GHz working but not 5GHz.

As all of these dts entries are already specified in mt7621.dtsi, remove
them.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit 02f815d1907cdd7e042415a2b4a749c819087168)

diff --git a/target/linux/ramips/dts/DIR-860L-B1.dts b/target/linux/ramips/dts/DIR-860L-B1.dts
index 5dfc1eeaefd57d5a81e019f13f6fd9d1630bc952..5edf7217400bf1b65891dd821d79cc2eed1bfef5 100644 (file)
--- a/target/linux/ramips/dts/DIR-860L-B1.dts
+++ b/target/linux/ramips/dts/DIR-860L-B1.dts
@@ -115,8 +115,6 @@
 
        pcie0 {
                mt76@0,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&radio 0x2000>;
                        ieee80211-freq-limit = <5000000 6000000>;
                };
@@ -124,8 +122,6 @@
 
        pcie1 {
                mt76@1,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&radio 0>;
                        ieee80211-freq-limit = <2400000 2500000>;
                };

diff --git a/target/linux/ramips/dts/EW1200.dts b/target/linux/ramips/dts/EW1200.dts
index 84c4f72cb662ddc8e80aac6415f13a9a7694d57f..bf2ed15e8496ae7827b72cb3209bbdbc8beba020 100644 (file)
--- a/target/linux/ramips/dts/EW1200.dts
+++ b/target/linux/ramips/dts/EW1200.dts
@@ -97,8 +97,6 @@
 
        pcie0 {
                mt76@0,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x8000>;
                        ieee80211-freq-limit = <5000000 6000000>;
                };
@@ -106,8 +104,6 @@
 
        pcie1 {
                mt76@1,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x0000>;
                        ieee80211-freq-limit = <2400000 2500000>;
                };

diff --git a/target/linux/ramips/dts/FIREWRT.dts b/target/linux/ramips/dts/FIREWRT.dts
index 262dbb5f576a86a313b78b92849bb4c40a073d75..bfa05d530472ae80da64abb1a5f7786e82ec87ef 100644 (file)
--- a/target/linux/ramips/dts/FIREWRT.dts
+++ b/target/linux/ramips/dts/FIREWRT.dts
@@ -92,8 +92,6 @@
 
        pcie0 {
                mt76@0,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x8000>;
                        ieee80211-freq-limit = <5000000 6000000>;
                };
@@ -101,8 +99,6 @@
 
        pcie1 {
                mt76@1,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x0000>;
                        ieee80211-freq-limit = <2400000 2500000>;
                };

diff --git a/target/linux/ramips/dts/HC5962.dts b/target/linux/ramips/dts/HC5962.dts
index c6fc7cb15497d2388c61a15321b35141e8f91c1a..72b22e2d64f2a469c99aaa95c4edd5bf7ff7dc67 100644 (file)
--- a/target/linux/ramips/dts/HC5962.dts
+++ b/target/linux/ramips/dts/HC5962.dts
@@ -121,8 +121,6 @@
 
        pcie0 {
                mt76@0,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x0000>;
                        ieee80211-freq-limit = <2400000 2500000>;
                };
@@ -130,8 +128,6 @@
 
        pcie1 {
                mt76@1,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x8000>;
                        ieee80211-freq-limit = <5000000 6000000>;
                };

diff --git a/target/linux/ramips/dts/Newifi-D1.dts b/target/linux/ramips/dts/Newifi-D1.dts
index f5c7c913629826f95c615574411147fda8017871..4659f85278f764559b59e902ff7fd670a3b270b4 100644 (file)
--- a/target/linux/ramips/dts/Newifi-D1.dts
+++ b/target/linux/ramips/dts/Newifi-D1.dts
@@ -116,8 +116,6 @@
 
        pcie0 {
                mt76@0,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x8000>;
                        ieee80211-freq-limit = <5000000 6000000>;
                };
@@ -125,8 +123,6 @@
 
        pcie1 {
                mt76@1,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x0000>;
                };
        };

diff --git a/target/linux/ramips/dts/Newifi-D2.dts b/target/linux/ramips/dts/Newifi-D2.dts
index e919338e4eacd4269a7c5b9da044f5010291b76f..e7491150ae5421d4bc2421910cff94f514bd0a8a 100644 (file)
--- a/target/linux/ramips/dts/Newifi-D2.dts
+++ b/target/linux/ramips/dts/Newifi-D2.dts
@@ -129,8 +129,6 @@
 
        pcie0 {
                mt76@0,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x8000>;
                        ieee80211-freq-limit = <5000000 6000000>;
                };
@@ -138,8 +136,6 @@
 
        pcie1 {
                mt76@1,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x0000>;
                };
        };

diff --git a/target/linux/ramips/dts/PBR-M1.dts b/target/linux/ramips/dts/PBR-M1.dts
index 66a71a91ad17275bc491a8fd1ba03e82c3647f10..37f3bac5acbe5d2f79d544e497b79fe264166523 100644 (file)
--- a/target/linux/ramips/dts/PBR-M1.dts
+++ b/target/linux/ramips/dts/PBR-M1.dts
@@ -148,8 +148,6 @@
 
        pcie0 {
                mt76@0,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x8000>;
                        ieee80211-freq-limit = <5000000 6000000>;
                };
@@ -157,8 +155,6 @@
 
        pcie1 {
                mt76@1,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x0000>;
                };
        };

diff --git a/target/linux/ramips/dts/R6220.dts b/target/linux/ramips/dts/R6220.dts
index 7d886725e15cb6e6e237bd7f2109b488b5013187..d0010830ef93315bbc784dd766bf0ecfea45e034 100644 (file)
--- a/target/linux/ramips/dts/R6220.dts
+++ b/target/linux/ramips/dts/R6220.dts
@@ -127,8 +127,6 @@
 
        pcie0 {
                mt76@0,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x8000>;
                        ieee80211-freq-limit = <5000000 6000000>;
                };
@@ -136,8 +134,6 @@
 
        pcie1 {
                mt76@1,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x0000>;
                        ieee80211-freq-limit = <2400000 2500000>;
                };

diff --git a/target/linux/ramips/dts/RE350.dts b/target/linux/ramips/dts/RE350.dts
index 2f3bb1245cf9e79d590c485ea047f606b2416496..4516f09017c824736da794fc9235e81283ad657f 100644 (file)
--- a/target/linux/ramips/dts/RE350.dts
+++ b/target/linux/ramips/dts/RE350.dts
@@ -130,8 +130,6 @@
 
        pcie0 {
                mt76@0,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&radio 0>;
                        mtd-mac-address = <&config 0x10008>;
                        mtd-mac-address-increment = <1>;
@@ -140,8 +138,6 @@
 
        pcie1 {
                mt76@1,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&radio 0x8000>;
                        ieee80211-freq-limit = <5000000 6000000>;
                        mtd-mac-address = <&config 0x10008>;

diff --git a/target/linux/ramips/dts/RE6500.dts b/target/linux/ramips/dts/RE6500.dts
index b2b5a29238bca252414ee13aab39be2f9af9619d..6d84fa9eb098e11b1470abb7224a0d3766e5779d 100644 (file)
--- a/target/linux/ramips/dts/RE6500.dts
+++ b/target/linux/ramips/dts/RE6500.dts
@@ -102,8 +102,6 @@
 
        pcie0 {
                mt76@0,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x0000>;
                        ieee80211-freq-limit = <5000000 6000000>;
                };
@@ -111,8 +109,6 @@
 
        pcie1 {
                mt76@1,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x8000>;
                        ieee80211-freq-limit = <2400000 2500000>;
                };

diff --git a/target/linux/ramips/dts/SAP-G3200U3.dts b/target/linux/ramips/dts/SAP-G3200U3.dts
index 7264e30b5885fee7eadb5021bc14f2a83d31c1b3..912da1cd6195d90729ea80b2718f8f466929cd07 100644 (file)
--- a/target/linux/ramips/dts/SAP-G3200U3.dts
+++ b/target/linux/ramips/dts/SAP-G3200U3.dts
@@ -94,8 +94,6 @@
 
        pcie0 {
                mt76@0,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x8000>;
                        ieee80211-freq-limit = <5000000 6000000>;
                };
@@ -103,8 +101,6 @@
 
        pcie1 {
                mt76@1,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x0000>;
                        ieee80211-freq-limit = <2400000 2500000>;
                };

diff --git a/target/linux/ramips/dts/SK-WB8.dts b/target/linux/ramips/dts/SK-WB8.dts
index 0ded039d8efb6da6aa9a0dee6acec06eefbc677b..7ad4da5fcce11dac099057387646427e2c922697 100644 (file)
--- a/target/linux/ramips/dts/SK-WB8.dts
+++ b/target/linux/ramips/dts/SK-WB8.dts
@@ -90,8 +90,6 @@
 
        pcie0 {
                mt76@0,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x8000>;
                        ieee80211-freq-limit = <5000000 6000000>;
                };
@@ -99,8 +97,6 @@
 
        pcie1 {
                mt76@1,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x0000>;
                };
        };

diff --git a/target/linux/ramips/dts/TL-WR902ACV3.dts b/target/linux/ramips/dts/TL-WR902ACV3.dts
index 8ff3576595654e9b0cb5d5c9a60085e31ad312e2..bc8c64308e06e80be6d444cc66eeaf7d81008568 100644 (file)
--- a/target/linux/ramips/dts/TL-WR902ACV3.dts
+++ b/target/linux/ramips/dts/TL-WR902ACV3.dts
@@ -91,8 +91,6 @@
 
        pcie-bridge {
                mt76@1,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x28000>;
                        ieee80211-freq-limit = <5000000 6000000>;
                        mtd-mac-address = <&factory 0xf100>;

diff --git a/target/linux/ramips/dts/WF-2881.dts b/target/linux/ramips/dts/WF-2881.dts
index 33f521cb95e2f0d41eededbc9d3301024f3e357f..1197da76213a12b3e0c9a0679e7522b5e2f26baa 100644 (file)
--- a/target/linux/ramips/dts/WF-2881.dts
+++ b/target/linux/ramips/dts/WF-2881.dts
@@ -84,8 +84,6 @@
 
        pcie0 {
                mt76@0,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x8000>;
                        ieee80211-freq-limit = <5000000 6000000>;
                };
@@ -93,8 +91,6 @@
 
        pcie1 {
                mt76@1,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x0000>;
                        ieee80211-freq-limit = <2400000 2500000>;
                };

diff --git a/target/linux/ramips/dts/WITI.dtsi b/target/linux/ramips/dts/WITI.dtsi
index 767ea03ff0bb2460d048539c66982e4d893d52e1..78fa12a6e8626269f94c59dea317071e564679d8 100644 (file)
--- a/target/linux/ramips/dts/WITI.dtsi
+++ b/target/linux/ramips/dts/WITI.dtsi
@@ -82,8 +82,6 @@
 
        pcie0 {
                mt76@0,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x8000>;
                        ieee80211-freq-limit = <5000000 6000000>;
                        mtd-mac-address = <&factory 0xe000>;
@@ -92,8 +90,6 @@
 
        pcie1 {
                mt76@1,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x0000>;
                        ieee80211-freq-limit = <2400000 2500000>;
                        mtd-mac-address = <&factory 0xe000>;

diff --git a/target/linux/ramips/dts/WNDR3700V5.dts b/target/linux/ramips/dts/WNDR3700V5.dts
index ce964403697cfaced621df3d5a1a9df28137bda2..61ec584078467f9dfa9b0d1c686f6afd79158b8e 100644 (file)
--- a/target/linux/ramips/dts/WNDR3700V5.dts
+++ b/target/linux/ramips/dts/WNDR3700V5.dts
@@ -110,8 +110,6 @@
 
        pcie0 {
                mt76@0,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x8000>;
                        ieee80211-freq-limit = <5000000 6000000>;
                };
@@ -119,8 +117,6 @@
 
        pcie1 {
                mt76@1,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x0000>;
                };
        };

diff --git a/target/linux/ramips/dts/WR1200JS.dts b/target/linux/ramips/dts/WR1200JS.dts
index 2169e74e23db17ecc23b9f190821078f28a8f3d5..1160c2acda4b40a4319cd675c020a2eeae852cb6 100644 (file)
--- a/target/linux/ramips/dts/WR1200JS.dts
+++ b/target/linux/ramips/dts/WR1200JS.dts
@@ -104,16 +104,12 @@
 
        pcie0 {
                mt76@0,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x0000>;
                };
        };
 
        pcie1 {
                mt76@1,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x8000>;
                        ieee80211-freq-limit = <5000000 6000000>;
 

diff --git a/target/linux/ramips/dts/WSR-1166.dts b/target/linux/ramips/dts/WSR-1166.dts
index 38edbde74584bf408eea9ba8408f0a3e46f56198..89415fc605bde74b4e94b263556951a2b38dcb72 100644 (file)
--- a/target/linux/ramips/dts/WSR-1166.dts
+++ b/target/linux/ramips/dts/WSR-1166.dts
@@ -169,8 +169,6 @@
 
        pcie0 {
                mt76@0,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x8000>;
                        ieee80211-freq-limit = <5000000 6000000>;
                };
@@ -178,8 +176,6 @@
 
        pcie1 {
                mt76@1,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x0000>;
                };
        };

diff --git a/target/linux/ramips/dts/WSR-600.dts b/target/linux/ramips/dts/WSR-600.dts
index 1db280902730d6d027cbecdd77645b10ad92ba7a..b61ea0b61391c2a4cc416c2e10c1444bba6812c6 100644 (file)
--- a/target/linux/ramips/dts/WSR-600.dts
+++ b/target/linux/ramips/dts/WSR-600.dts
@@ -164,16 +164,12 @@
 
        pcie0 {
                rt5592@0,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        ralink,mtd-eeprom = <&factory 0x8000>;
                };
        };
 
        pcie1 {
                mt76@1,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x0000>;
                };
        };

diff --git a/target/linux/ramips/dts/ZBT-WE1326.dts b/target/linux/ramips/dts/ZBT-WE1326.dts
index 6cbab663078bf12194d9dbc688e71b4bcba0dcbc..e5452437a8be6ba3c58b5f81792f24ea9f95052e 100644 (file)
--- a/target/linux/ramips/dts/ZBT-WE1326.dts
+++ b/target/linux/ramips/dts/ZBT-WE1326.dts
@@ -86,8 +86,6 @@
 
        pcie0 {
                mt76@0,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x8000>;
                        ieee80211-freq-limit = <5000000 6000000>;
                };
@@ -95,8 +93,6 @@
 
        pcie1 {
                mt76@1,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x0000>;
                        ieee80211-freq-limit = <2400000 2500000>;
                };

diff --git a/target/linux/ramips/dts/ZBT-WG2626.dts b/target/linux/ramips/dts/ZBT-WG2626.dts
index 79f2859bb7a3d8307fa889258feb8369f590b48e..c1124295d3984f66c5a7d281082b2a48875c8cb4 100644 (file)
--- a/target/linux/ramips/dts/ZBT-WG2626.dts
+++ b/target/linux/ramips/dts/ZBT-WG2626.dts
@@ -92,8 +92,6 @@
 
        pcie0 {
                mt76@0,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x8000>;
                        ieee80211-freq-limit = <5000000 6000000>;
                };
@@ -101,8 +99,6 @@
 
        pcie1 {
                mt76@1,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
                        mediatek,mtd-eeprom = <&factory 0x0000>;
                        ieee80211-freq-limit = <2400000 2500000>;
                };