Skip to content

Commit ca0df43

Browse files
committed
Merge tag 'wireless-next-2023-03-16' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next
Johannes Berg says: ==================== Major stack changes: * EHT channel puncturing support (client & AP) * some support for AP MLD without mac80211 * fixes for A-MSDU on mesh connections Major driver changes: iwlwifi * EHT rate reporting * Bump FW API to 74 for AX devices * STEP equalizer support: transfer some STEP (connection to radio on platforms with integrated wifi) related parameters from the BIOS to the firmware mt76 * switch to using page pool allocator * mt7996 EHT (Wi-Fi 7) support * Wireless Ethernet Dispatch (WED) reset support libertas * WPS enrollee support brcmfmac * Rename Cypress 89459 to BCM4355 * BCM4355 and BCM4377 support mwifiex * SD8978 chipset support rtl8xxxu * LED support ath12k * new driver for Qualcomm Wi-Fi 7 devices ath11k * IPQ5018 support * Fine Timing Measurement (FTM) responder role support * channel 177 support ath10k * store WLAN firmware version in SMEM image table * tag 'wireless-next-2023-03-16' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next: (207 commits) wifi: brcmfmac: p2p: Introduce generic flexible array frame member wifi: mac80211: add documentation for amsdu_mesh_control wifi: cfg80211: remove gfp parameter from cfg80211_obss_color_collision_notify description wifi: mac80211: always initialize link_sta with sta wifi: mac80211: pass 'sta' to ieee80211_rx_data_set_sta() wifi: cfg80211: Set SSID if it is not already set wifi: rtw89: move H2C of del_pkt_offload before polling FW status ready wifi: rtw89: use readable return 0 in rtw89_mac_cfg_ppdu_status() wifi: rtw88: usb: drop now unnecessary URB size check wifi: rtw88: usb: send Zero length packets if necessary wifi: rtw88: usb: Set qsel correctly wifi: mac80211: fix off-by-one link setting wifi: mac80211: Fix for Rx fragmented action frames wifi: mac80211: avoid u32_encode_bits() warning wifi: mac80211: Don't translate MLD addresses for multicast wifi: cfg80211: call reg_notifier for self managed wiphy from driver hint wifi: cfg80211: get rid of gfp in cfg80211_bss_color_notify wifi: nl80211: Allow authentication frames and set keys on NAN interface wifi: mac80211: fix non-MLO station association wifi: mac80211: Allow NSS change only up to capability ... ==================== Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 40967f7 + 1a30a6b commit ca0df43

File tree

246 files changed

+58091
-2063
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

246 files changed

+58091
-2063
lines changed

Documentation/devicetree/bindings/net/wireless/esp,esp8089.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ additionalProperties: false
2929

3030
examples:
3131
- |
32-
mmc {
33-
#address-cells = <1>;
34-
#size-cells = <0>;
35-
36-
wifi@1 {
37-
compatible = "esp,esp8089";
38-
reg = <1>;
39-
esp,crystal-26M-en = <2>;
40-
};
41-
};
32+
mmc {
33+
#address-cells = <1>;
34+
#size-cells = <0>;
35+
36+
wifi@1 {
37+
compatible = "esp,esp8089";
38+
reg = <1>;
39+
esp,crystal-26M-en = <2>;
40+
};
41+
};
4242
4343
...

Documentation/devicetree/bindings/net/wireless/ieee80211.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
# Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
3-
43
%YAML 1.2
54
---
65
$id: http://devicetree.org/schemas/net/wireless/ieee80211.yaml#

Documentation/devicetree/bindings/net/wireless/marvell-8xxx.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Marvell 8787/8897/8997 (sd8787/sd8897/sd8997/pcie8997) SDIO/PCIE devices
1+
Marvell 8787/8897/8978/8997 (sd8787/sd8897/sd8978/sd8997/pcie8997) SDIO/PCIE devices
22
------
33

44
This node provides properties for controlling the Marvell SDIO/PCIE wireless device.
@@ -10,7 +10,9 @@ Required properties:
1010
- compatible : should be one of the following:
1111
* "marvell,sd8787"
1212
* "marvell,sd8897"
13+
* "marvell,sd8978"
1314
* "marvell,sd8997"
15+
* "nxp,iw416"
1416
* "pci11ab,2b42"
1517
* "pci1b4b,2b42"
1618

Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
# Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
3-
43
%YAML 1.2
54
---
65
$id: http://devicetree.org/schemas/net/wireless/mediatek,mt76.yaml#

Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
# Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
3-
43
%YAML 1.2
54
---
65
$id: http://devicetree.org/schemas/net/wireless/qcom,ath11k.yaml#
@@ -21,6 +20,7 @@ properties:
2120
- qcom,ipq8074-wifi
2221
- qcom,ipq6018-wifi
2322
- qcom,wcn6750-wifi
23+
- qcom,ipq5018-wifi
2424

2525
reg:
2626
maxItems: 1
@@ -262,10 +262,10 @@ allOf:
262262
examples:
263263
- |
264264
265-
q6v5_wcss: q6v5_wcss@CD00000 {
265+
q6v5_wcss: remoteproc@cd00000 {
266266
compatible = "qcom,ipq8074-wcss-pil";
267-
reg = <0xCD00000 0x4040>,
268-
<0x4AB000 0x20>;
267+
reg = <0xcd00000 0x4040>,
268+
<0x4ab000 0x20>;
269269
reg-names = "qdsp6",
270270
"rmb";
271271
};
@@ -386,7 +386,7 @@ examples:
386386
#address-cells = <2>;
387387
#size-cells = <2>;
388388
389-
qcn9074_0: qcn9074_0@51100000 {
389+
qcn9074_0: wifi@51100000 {
390390
no-map;
391391
reg = <0x0 0x51100000 0x0 0x03500000>;
392392
};
@@ -463,6 +463,6 @@ examples:
463463
qcom,smem-states = <&wlan_smp2p_out 0>;
464464
qcom,smem-state-names = "wlan-smp2p-out";
465465
wifi-firmware {
466-
iommus = <&apps_smmu 0x1c02 0x1>;
466+
iommus = <&apps_smmu 0x1c02 0x1>;
467467
};
468468
};

Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# Copyright (c) 2020, Silicon Laboratories, Inc.
33
%YAML 1.2
44
---
5-
65
$id: http://devicetree.org/schemas/net/wireless/silabs,wfx.yaml#
76
$schema: http://devicetree.org/meta-schemas/core.yaml#
87

Documentation/devicetree/bindings/net/wireless/ti,wlcore.yaml

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -90,47 +90,47 @@ examples:
9090
9191
// For wl12xx family:
9292
spi1 {
93-
#address-cells = <1>;
94-
#size-cells = <0>;
95-
96-
wlcore1: wlcore@1 {
97-
compatible = "ti,wl1271";
98-
reg = <1>;
99-
spi-max-frequency = <48000000>;
100-
interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;
101-
vwlan-supply = <&vwlan_fixed>;
102-
clock-xtal;
103-
ref-clock-frequency = <38400000>;
104-
};
93+
#address-cells = <1>;
94+
#size-cells = <0>;
95+
96+
wlcore1: wlcore@1 {
97+
compatible = "ti,wl1271";
98+
reg = <1>;
99+
spi-max-frequency = <48000000>;
100+
interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;
101+
vwlan-supply = <&vwlan_fixed>;
102+
clock-xtal;
103+
ref-clock-frequency = <38400000>;
104+
};
105105
};
106106
107107
// For wl18xx family:
108108
spi2 {
109-
#address-cells = <1>;
110-
#size-cells = <0>;
111-
112-
wlcore2: wlcore@0 {
113-
compatible = "ti,wl1835";
114-
reg = <0>;
115-
spi-max-frequency = <48000000>;
116-
interrupts = <27 IRQ_TYPE_EDGE_RISING>;
117-
vwlan-supply = <&vwlan_fixed>;
118-
};
109+
#address-cells = <1>;
110+
#size-cells = <0>;
111+
112+
wlcore2: wlcore@0 {
113+
compatible = "ti,wl1835";
114+
reg = <0>;
115+
spi-max-frequency = <48000000>;
116+
interrupts = <27 IRQ_TYPE_EDGE_RISING>;
117+
vwlan-supply = <&vwlan_fixed>;
118+
};
119119
};
120120
121121
// SDIO example:
122122
mmc3 {
123-
vmmc-supply = <&wlan_en_reg>;
124-
bus-width = <4>;
125-
cap-power-off-card;
126-
keep-power-in-suspend;
127-
128-
#address-cells = <1>;
129-
#size-cells = <0>;
130-
131-
wlcore3: wlcore@2 {
132-
compatible = "ti,wl1835";
133-
reg = <2>;
134-
interrupts = <19 IRQ_TYPE_LEVEL_HIGH>;
135-
};
123+
vmmc-supply = <&wlan_en_reg>;
124+
bus-width = <4>;
125+
cap-power-off-card;
126+
keep-power-in-suspend;
127+
128+
#address-cells = <1>;
129+
#size-cells = <0>;
130+
131+
wlcore3: wlcore@2 {
132+
compatible = "ti,wl1835";
133+
reg = <2>;
134+
interrupts = <19 IRQ_TYPE_LEVEL_HIGH>;
135+
};
136136
};

MAINTAINERS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17254,6 +17254,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
1725417254
F: Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml
1725517255
F: drivers/net/wireless/ath/ath11k/
1725617256

17257+
QUALCOMM ATH12K WIRELESS DRIVER
17258+
M: Kalle Valo <[email protected]>
17259+
17260+
S: Supported
17261+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
17262+
F: drivers/net/wireless/ath/ath12k/
17263+
1725717264
QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
1725817265
M: Toke Høiland-Jørgensen <[email protected]>
1725917266

drivers/net/wireless/ath/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,6 @@ source "drivers/net/wireless/ath/wil6210/Kconfig"
6363
source "drivers/net/wireless/ath/ath10k/Kconfig"
6464
source "drivers/net/wireless/ath/wcn36xx/Kconfig"
6565
source "drivers/net/wireless/ath/ath11k/Kconfig"
66+
source "drivers/net/wireless/ath/ath12k/Kconfig"
6667

6768
endif

drivers/net/wireless/ath/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ obj-$(CONFIG_WIL6210) += wil6210/
88
obj-$(CONFIG_ATH10K) += ath10k/
99
obj-$(CONFIG_WCN36XX) += wcn36xx/
1010
obj-$(CONFIG_ATH11K) += ath11k/
11+
obj-$(CONFIG_ATH12K) += ath12k/
1112

1213
obj-$(CONFIG_ATH_COMMON) += ath.o
1314

0 commit comments

Comments
 (0)