forked from coolsnowwolf/lede
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: iwinfo: backport IPQ8074 and QCNxxxx devices support (coolsnowwolf#10743) kernel: bump 6.1 to 6.1.4
- Loading branch information
Showing
5 changed files
with
78 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| LINUX_VERSION-6.1 = .3 | ||
| LINUX_KERNEL_HASH-6.1.3 = 6dc89ae7a7513e433c597c7346ed7ff4bfd115ea43a3b5e27a6bdb38c5580317 | ||
| LINUX_VERSION-6.1 = .4 | ||
| LINUX_KERNEL_HASH-6.1.4 = 8aa8f64fa60bb13381a9608d1fefbdd0555e2a70c40b2c7d0671b0d64aa4559e |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
package/network/utils/iwinfo/patches/003-devices-add-IPQ8074.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| From: Robert Marko <robimarko@gmail.com> | ||
| Date: Fri, 6 Jan 2023 09:56:54 +0000 (+0100) | ||
| Subject: iwinfo: devices: add Qualcomm Atheros IPQ8074 WiSoC | ||
| X-Git-Url: http://git.openwrt.org/?p=project%2Fiwinfo.git;a=commitdiff_plain;h=5914d7113ecf77de63eb21fc233684d1a1a52ca5 | ||
|
|
||
| iwinfo: devices: add Qualcomm Atheros IPQ8074 WiSoC | ||
|
|
||
| Add detection of the Qualcomm Atheros IPQ8074 WiSoC using the compatible | ||
| string from device tree. | ||
|
|
||
| Signed-off-by: Robert Marko <robimarko@gmail.com> | ||
| --- | ||
|
|
||
| --- a/hardware.txt | ||
| +++ b/hardware.txt | ||
| @@ -167,6 +167,7 @@ | ||
| 0x168c 0x003c 0x1a56 0x1420 0 0 "Qualcomm Atheros" "QCA9862" | ||
| 0x168c 0x003c 0x19b6 0xd03c 0 0 "Mikrotik" "R11e-5HacT" | ||
| 0x168c 0x003c 0x168c 0x4019 0 0 "Qualcomm Atheros" "IPQ4019" | ||
| +0x168c 0x8074 0x168c 0x8074 0 0 "Qualcomm Atheros" "IPQ8074" | ||
| 0x168c 0x003c 0x19b6 0xd075 0 0 "Mikrotik" "R11e-5HacD" | ||
| 0x168c 0x0040 0x168c 0x0002 0 0 "Qualcomm Atheros" "QCA9990" | ||
| 0x168c 0x0046 0x168c 0xcafe 0 0 "Qualcomm Atheros" "QCA9984" | ||
| --- a/iwinfo_nl80211.c | ||
| +++ b/iwinfo_nl80211.c | ||
| @@ -3381,6 +3381,11 @@ static int nl80211_hardware_id_from_fdt( | ||
| id->device_id = 0x003c; | ||
| id->subsystem_vendor_id = 0x168c; | ||
| id->subsystem_device_id = 0x4019; | ||
| + } else if (!strcmp(compat, "qcom,ipq8074-wifi")) { | ||
| + id->vendor_id = 0x168c; | ||
| + id->device_id = 0x8074; | ||
| + id->subsystem_vendor_id = 0x168c; | ||
| + id->subsystem_device_id = 0x8074; | ||
| } else if (!strcmp(compat, "mediatek,mt7622-wmac")) { | ||
| id->vendor_id = 0x14c3; | ||
| id->device_id = 0x7622; |
23 changes: 23 additions & 0 deletions
23
package/network/utils/iwinfo/patches/004-devices-add-QCNxxxx.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| From: Robert Marko <robimarko@gmail.com> | ||
| Date: Fri, 6 Jan 2023 16:33:55 +0000 (+0100) | ||
| Subject: devices: add Qualcomm Atheros QCN6024/9024/9074 cards | ||
| X-Git-Url: http://git.openwrt.org/?p=project%2Fiwinfo.git;a=commitdiff_plain;h=c7b420a2f33c6f1034c3e2191eba0cb0374af7b6 | ||
|
|
||
| devices: add Qualcomm Atheros QCN6024/9024/9074 cards | ||
|
|
||
| Add Qualcomm Atheros QCN6024/9024/9074 PCI ID, they all are compatible and | ||
| use the same ID. | ||
|
|
||
| Signed-off-by: Robert Marko <robimarko@gmail.com> | ||
| --- | ||
|
|
||
| --- a/hardware.txt | ||
| +++ b/hardware.txt | ||
| @@ -173,6 +173,7 @@ | ||
| 0x168c 0x0046 0x168c 0xcafe 0 0 "Qualcomm Atheros" "QCA9984" | ||
| 0x168c 0x0050 0x0000 0x0000 0 0 "Qualcomm Atheros" "QCA9887" | ||
| 0x168c 0x0056 0x0000 0x0000 0 0 "Qualcomm Atheros" "QCA9886" | ||
| +0x17cb 0x1104 0x17cb 0x1104 0 0 "Qualcomm Atheros" "QCN6024/9024/9074" | ||
| 0x1814 0x3050 0x1814 0x0005 0 0 "Ralink" "Rt3050" | ||
| 0x1814 0x3051 0x1814 0x0007 0 0 "Ralink" "Rt3051" | ||
| 0x1814 0x3052 0x1814 0x0008 0 0 "Ralink" "Rt3052" |