Skip to content

Commit 0de4dd6

Browse files
jimmy-cheng1983Pan-Zyxel
jimmy-cheng1983
authored and
Pan-Zyxel
committed
qca-wifi-7: Add Zyxel NWA55BE model
Signed-off-by: Jimmy Cheng <jimmy.cheng@zyxel.com.tw>
1 parent 2ffeaf8 commit 0de4dd6

17 files changed

Lines changed: 1491 additions & 33 deletions

File tree

‎.github/workflows/build-dev.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
target: [ 'cig_wf189h', 'cig_wf189w', 'cig_wf660a', 'cig_wf672', 'cig_wf186h', 'cig_wf186w', 'cig_wf188n', 'cig_wf189', 'cig_wf196', 'cig_wf196', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'sonicfi_rap630w-312g', 'sonicfi_rap630c-311g', 'sonicfi_rap630w-311g', 'sonicfi_rap650c', 'sonicfi_rap7110c-341x', 'sonicfi_rap750e-h', 'sonicfi_rap750e-s', 'sonicfi_rap750w-311a', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap105', 'edgecore_eap111', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'edgecore_oap103', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4x_3', 'hfcl_ion4xi_w', 'hfcl_ion4x_w', 'indio_um-305ax', 'udaya_a6-id2', 'udaya_a6-od2', 'yuncore_ax820', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655', 'zyxel_nwa130be', 'sercomm_ap72tip-v4', 'asterfusion_ap7330']
24+
target: [ 'cig_wf189h', 'cig_wf189w', 'cig_wf660a', 'cig_wf672', 'cig_wf186h', 'cig_wf186w', 'cig_wf188n', 'cig_wf189', 'cig_wf196', 'cig_wf196', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'sonicfi_rap630w-312g', 'sonicfi_rap630c-311g', 'sonicfi_rap630w-311g', 'sonicfi_rap650c', 'sonicfi_rap7110c-341x', 'sonicfi_rap750e-h', 'sonicfi_rap750e-s', 'sonicfi_rap750w-311a', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap105', 'edgecore_eap111', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'edgecore_oap103', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4x_3', 'hfcl_ion4xi_w', 'hfcl_ion4x_w', 'indio_um-305ax', 'udaya_a6-id2', 'udaya_a6-od2', 'yuncore_ax820', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655', 'zyxel_nwa130be', 'zyxel_nwa55be', 'sercomm_ap72tip-v4', 'asterfusion_ap7330']
2525
steps:
2626
- uses: actions/checkout@v3
2727

‎feeds/qca-wifi-7/ath12k-wifi/Makefile‎

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -88,19 +88,24 @@ $(call Package/ath12k-wifi-default)
8888
TITLE:=board-2.bin for AP72TIP-v4
8989
endef
9090

91+
define Package/ath12k-wifi-zyxel-nwa210be
92+
$(call Package/ath12k-wifi-default)
93+
TITLE:=board-2.bin for NWA210BE
94+
endef
95+
9196
define Package/ath12k-wifi-zyxel-nwa130be
9297
$(call Package/ath12k-wifi-default)
9398
TITLE:=board-2.bin for NWA130BE
9499
endef
95100

96-
define Package/ath12k-wifi-zyxel-nwa50be
101+
define Package/ath12k-wifi-zyxel-nwa55be
97102
$(call Package/ath12k-wifi-default)
98-
TITLE:=board-2.bin for NWA50BE
103+
TITLE:=board-2.bin for NWA55BE
99104
endef
100105

101-
define Package/ath12k-wifi-zyxel-nwa210be
106+
define Package/ath12k-wifi-zyxel-nwa50be
102107
$(call Package/ath12k-wifi-default)
103-
TITLE:=board-2.bin for NWA210BE
108+
TITLE:=board-2.bin for NWA50BE
104109
endef
105110

106111
define Package/ath12k-wifi-cig-wf672
@@ -199,26 +204,34 @@ define Package/ath12k-wifi-sercomm-ap72tip-v4/install
199204
$(INSTALL_DATA) ./board-2.bin.ap72tip-v4.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
200205
endef
201206

207+
define Package/ath12k-wifi-zyxel-nwa210be/install
208+
$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/
209+
$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
210+
$(INSTALL_DATA) ./board-2.bin.nwa210be.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
211+
$(INSTALL_DATA) ./board-2.bin.nwa210be.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
212+
endef
213+
202214
define Package/ath12k-wifi-zyxel-nwa130be/install
203215
$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/
204216
$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
205217
$(INSTALL_DATA) ./board-2.bin.nwa130be.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
206218
$(INSTALL_DATA) ./board-2.bin.nwa130be.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
207219
endef
208220

209-
define Package/ath12k-wifi-zyxel-nwa50be/install
221+
define Package/ath12k-wifi-zyxel-nwa55be/install
210222
$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN6432/hw1.0/
211223
$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
212-
$(INSTALL_DATA) ./board-2.bin.nwa50be.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
213-
$(INSTALL_DATA) ./board-2.bin.nwa50be.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
224+
$(INSTALL_DATA) ./board-2.bin.nwa55be.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
225+
$(INSTALL_DATA) ./board-2.bin.nwa55be.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
214226
$(INSTALL_DATA) ./ipq5332_qcn6432.regdb $(1)/lib/firmware/ath12k/QCN6432/hw1.0/regdb.bin
215227
endef
216228

217-
define Package/ath12k-wifi-zyxel-nwa210be/install
218-
$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/
229+
define Package/ath12k-wifi-zyxel-nwa50be/install
230+
$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN6432/hw1.0/
219231
$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
220-
$(INSTALL_DATA) ./board-2.bin.nwa210be.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
221-
$(INSTALL_DATA) ./board-2.bin.nwa210be.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
232+
$(INSTALL_DATA) ./board-2.bin.nwa50be.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
233+
$(INSTALL_DATA) ./board-2.bin.nwa50be.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
234+
$(INSTALL_DATA) ./ipq5332_qcn6432.regdb $(1)/lib/firmware/ath12k/QCN6432/hw1.0/regdb.bin
222235
endef
223236

224237
define Package/ath12k-wifi-cig-wf672/install
@@ -246,8 +259,9 @@ $(eval $(call BuildPackage,ath12k-wifi-cig-wf189w))
246259
$(eval $(call BuildPackage,ath12k-wifi-cig-wf189h))
247260
$(eval $(call BuildPackage,ath12k-wifi-sercomm-ap72tip))
248261
$(eval $(call BuildPackage,ath12k-wifi-sercomm-ap72tip-v4))
262+
$(eval $(call BuildPackage,ath12k-wifi-zyxel-nwa210be))
249263
$(eval $(call BuildPackage,ath12k-wifi-zyxel-nwa130be))
264+
$(eval $(call BuildPackage,ath12k-wifi-zyxel-nwa55be))
250265
$(eval $(call BuildPackage,ath12k-wifi-zyxel-nwa50be))
251-
$(eval $(call BuildPackage,ath12k-wifi-zyxel-nwa210be))
252266
$(eval $(call BuildPackage,ath12k-wifi-cig-wf672))
253267
$(eval $(call BuildPackage,ath12k-wifi-asterfusion-ap7330))

‎feeds/qca-wifi-7/ath12k-wifi/board-2-nwa55be-IPQ5332.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[
2+
{
3+
"board": [
4+
{
5+
"names": [
6+
"bus=ahb,qmi-chip-id=0,qmi-board-id=18"
7+
],
8+
"data": "nwa55be-IPQ5332.bin"
9+
}
10+
],
11+
"regdb": [
12+
{
13+
"names": [
14+
"bus=ahb,qmi-chip-id=0,qmi-board-id=18"
15+
],
16+
"data": "ipq5332.regdb"
17+
}
18+
]
19+
}
20+
]

‎feeds/qca-wifi-7/ath12k-wifi/board-2-nwa55be-QCN6432.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[
2+
{
3+
"board": [
4+
{
5+
"names": [
6+
"bus=ahb,qmi-chip-id=0,qmi-board-id=96"
7+
],
8+
"data": "nwa55be-QCN6432.bin"
9+
}
10+
],
11+
"regdb": [
12+
{
13+
"names": [
14+
"bus=ahb,qmi-chip-id=0,qmi-board-id=96"
15+
],
16+
"data": "ipq5332_qcn6432.regdb"
17+
}
18+
]
19+
}
20+
]

‎feeds/qca-wifi-7/ath12k-wifi/board-2.bin.nwa55be.IPQ5332‎

87.2 KB
Binary file not shown.

‎feeds/qca-wifi-7/ath12k-wifi/board-2.bin.nwa55be.QCN6432‎

123 KB
Binary file not shown.

‎feeds/qca-wifi-7/ath12k-wifi/generate.sh‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,17 @@ $encoder -c board-2-ap72tip-QCN92XX.json -o board-2.bin.ap72tip.QCN92XX
1616
$encoder -c board-2-ap72tip-v4-IPQ5332.json -o board-2.bin.ap72tip-v4.IPQ5332
1717
$encoder -c board-2-ap72tip-v4-QCN92XX.json -o board-2.bin.ap72tip-v4.QCN92XX
1818

19+
$encoder -c board-2-nwa210be-IPQ5332.json -o board-2.bin.nwa210be.IPQ5332
20+
$encoder -c board-2-nwa210be-QCN92XX.json -o board-2.bin.nwa210be.QCN92XX
21+
1922
$encoder -c board-2-nwa130be-IPQ5332.json -o board-2.bin.nwa130be.IPQ5332
2023
$encoder -c board-2-nwa130be-QCN92XX.json -o board-2.bin.nwa130be.QCN92XX
2124

25+
$encoder -c board-2-nwa55be-IPQ5332.json -o board-2.bin.nwa55be.IPQ5332
26+
$encoder -c board-2-nwa55be-QCN6432.json -o board-2.bin.nwa55be.QCN6432
27+
2228
$encoder -c board-2-nwa50be-IPQ5332.json -o board-2.bin.nwa50be.IPQ5332
2329
$encoder -c board-2-nwa50be-QCN6432.json -o board-2.bin.nwa50be.QCN6432
2430

25-
$encoder -c board-2-nwa210be-IPQ5332.json -o board-2.bin.nwa210be.IPQ5332
26-
$encoder -c board-2-nwa210be-QCN92XX.json -o board-2.bin.nwa210be.QCN92XX
27-
2831
$encoder -c board-2-ap7330-IPQ5332.json -o board-2.bin.ap7330.IPQ5332
2932
$encoder -c board-2-ap7330-QCN92XX.json -o board-2.bin.ap7330.QCN92XX

‎feeds/qca-wifi-7/ath12k-wifi/nwa55be-IPQ5332.bin‎

62 KB
Binary file not shown.

‎feeds/qca-wifi-7/ath12k-wifi/nwa55be-QCN6432.bin‎

98 KB
Binary file not shown.

‎feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/02_network‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ ipq53xx_setup_interfaces()
2424
sonicfi,rap7110c-341x|\
2525
sonicfi,rap750e-h|\
2626
sonicfi,rap750e-s|\
27+
zyxel,nwa55be|\
2728
zyxel,nwa50be)
2829
ucidef_set_interfaces_lan_wan "" "eth0"
2930
;;
@@ -124,7 +125,7 @@ qcom_setup_macs()
124125
ucidef_set_wireless_macaddr_base 5g $(macaddr_add "$wan_mac" 2)
125126
ucidef_set_wireless_macaddr_base 6g $(macaddr_add "$wan_mac" 3)
126127
;;
127-
zyxel,nwa130be)
128+
zyxel,nwa210be)
128129
wan_mac=$(cat /proc/cmdline)
129130
wan_mac="${wan_mac##*hwaddr=}"
130131
wan_mac="${wan_mac%% *}"
@@ -135,9 +136,8 @@ qcom_setup_macs()
135136
ucidef_set_label_macaddr $wan_mac
136137
ucidef_set_wireless_macaddr_base 2g $(macaddr_add "$wan_mac" 2)
137138
ucidef_set_wireless_macaddr_base 5g $(macaddr_add "$wan_mac" 3)
138-
ucidef_set_wireless_macaddr_base 6g $(macaddr_add "$wan_mac" 4)
139139
;;
140-
zyxel,nwa210be)
140+
zyxel,nwa130be)
141141
wan_mac=$(cat /proc/cmdline)
142142
wan_mac="${wan_mac##*hwaddr=}"
143143
wan_mac="${wan_mac%% *}"
@@ -148,7 +148,9 @@ qcom_setup_macs()
148148
ucidef_set_label_macaddr $wan_mac
149149
ucidef_set_wireless_macaddr_base 2g $(macaddr_add "$wan_mac" 2)
150150
ucidef_set_wireless_macaddr_base 5g $(macaddr_add "$wan_mac" 3)
151+
ucidef_set_wireless_macaddr_base 6g $(macaddr_add "$wan_mac" 4)
151152
;;
153+
zyxel,nwa55be|\
152154
zyxel,nwa50be)
153155
wan_mac=$(cat /proc/cmdline)
154156
wan_mac="${wan_mac##*hwaddr=}"

0 commit comments

Comments
 (0)