From: Rosen Penev Date: Tue, 29 May 2018 18:03:03 +0000 (-0700) Subject: ramips: Fix WiFi after 5f7396ebef09b224edf08b0bda113613a42f0928 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=02f815d1907cdd7e042415a2b4a749c819087168;p=openwrt%2Fstaging%2Fnoltari.git 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 --- diff --git a/target/linux/ramips/dts/DIR-860L-B1.dts b/target/linux/ramips/dts/DIR-860L-B1.dts index 5dfc1eeaef..5edf721740 100644 --- 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 84c4f72cb6..bf2ed15e84 100644 --- 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 262dbb5f57..bfa05d5304 100644 --- 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 c6fc7cb154..72b22e2d64 100644 --- 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 f5c7c91362..4659f85278 100644 --- 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 e919338e4e..e7491150ae 100644 --- 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 66a71a91ad..37f3bac5ac 100644 --- 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 7d886725e1..d0010830ef 100644 --- 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 2f3bb1245c..4516f09017 100644 --- 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 b2b5a29238..6d84fa9eb0 100644 --- 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 7264e30b58..912da1cd61 100644 --- 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 0ded039d8e..7ad4da5fcc 100644 --- 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 8ff3576595..bc8c64308e 100644 --- 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 33f521cb95..1197da7621 100644 --- 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 767ea03ff0..78fa12a6e8 100644 --- 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 ce96440369..61ec584078 100644 --- 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 2169e74e23..1160c2acda 100644 --- 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 38edbde745..89415fc605 100644 --- 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 1db2809027..b61ea0b613 100644 --- 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 6cbab66307..e5452437a8 100644 --- 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 79f2859bb7..c1124295d3 100644 --- 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>; };