Skip to content

Commit f0909f7

Browse files
achterinrobimarko
achterin
authored and
robimarko
committed
ipq40xx: fix second 5ghz radio on Netgear RBx40
When support was added for the RBR40 and RBS40 it was assumed that they also share the same second 5ghz wifi chip as their bigger siblings. Turns out that instead of QCA9984 (RBx50, SRx60) these devices use QCA9886 like the RBx20 devices to. They also load different boardfiles for the IPQ4019 chip. This moves the wifi nodes from the orbi.dtsi to each device dts file and change the RBx40 boardfile variants. Signed-off-by: Christoph Krapp <[email protected]> Link: openwrt/openwrt#20877 Signed-off-by: Robert Marko <[email protected]>
1 parent e9d6015 commit f0909f7

File tree

8 files changed

+130
-22
lines changed

8 files changed

+130
-22
lines changed

‎target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-orbi.dtsi‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -288,24 +288,3 @@
288288
perst-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
289289
wake-gpios = <&tlmm 50 GPIO_ACTIVE_LOW>;
290290
};
291-
292-
&pcie_bridge0 {
293-
wifi@0,0 {
294-
compatible = "qcom,ath10k";
295-
reg = <0x00010000 0 0 0 0>;
296-
ieee80211-freq-limit = <5470000 5875000>;
297-
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
298-
};
299-
};
300-
301-
&wifi0 {
302-
status = "okay";
303-
304-
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
305-
};
306-
307-
&wifi1 {
308-
status = "okay";
309-
310-
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
311-
};

‎target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbr40.dts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,24 @@
1010
bootargs = "root=/dev/mmcblk0p20 blkdevparts=mmcblk0:512K@17K(0:SBL1)ro,512K(0:BOOTCONFIG)ro,512K(0:QSEE)ro,512K(0:QSEE_ALT)ro,256K(0:CDT)ro,256K(0:CDT_ALT)ro,256K(0:DDRPARAMS)ro,256K(0:APPSBLENV)ro,1M(0:APPSBL)ro,1M(0:APPSBL_ALT)ro,256K(0:ART)ro,256K(ARTMTD)ro,2M(language)ro,256K(config)ro,256K(pot)ro,256K(traffic_meter)ro,256K(pot_bak)ro,256K(traffic_meter.bak)ro,3840K(kernel),31488K(rootfs),35328K@9233K(firmware),256K(mtdoops)ro,1457651200(reserved)ro,-(unallocated) rootfstype=squashfs,ext4 rootwait";
1111
};
1212
};
13+
14+
&pcie_bridge0 {
15+
wifi@0,0 {
16+
compatible = "qcom,ath10k";
17+
reg = <0x00010000 0 0 0 0>;
18+
ieee80211-freq-limit = <5170000 5350000>;
19+
qcom,ath10k-calibration-variant = "Netgear-RBK40";
20+
};
21+
};
22+
23+
&wifi0 {
24+
status = "okay";
25+
26+
qcom,ath10k-calibration-variant = "Netgear-RBK40";
27+
};
28+
29+
&wifi1 {
30+
status = "okay";
31+
32+
qcom,ath10k-calibration-variant = "Netgear-RBK40";
33+
};

‎target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbr50.dts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,24 @@
2626
&usb2 {
2727
status = "okay";
2828
};
29+
30+
&pcie_bridge0 {
31+
wifi@0,0 {
32+
compatible = "qcom,ath10k";
33+
reg = <0x00010000 0 0 0 0>;
34+
ieee80211-freq-limit = <5470000 5875000>;
35+
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
36+
};
37+
};
38+
39+
&wifi0 {
40+
status = "okay";
41+
42+
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
43+
};
44+
45+
&wifi1 {
46+
status = "okay";
47+
48+
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
49+
};

‎target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbs40.dts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,24 @@
1010
bootargs = "root=/dev/mmcblk0p20 blkdevparts=mmcblk0:512K@17K(0:SBL1)ro,512K(0:BOOTCONFIG)ro,512K(0:QSEE)ro,512K(0:QSEE_ALT)ro,256K(0:CDT)ro,256K(0:CDT_ALT)ro,256K(0:DDRPARAMS)ro,256K(0:APPSBLENV)ro,1M(0:APPSBL)ro,1M(0:APPSBL_ALT)ro,256K(0:ART)ro,256K(ARTMTD)ro,2M(language)ro,256K(config)ro,256K(pot)ro,256K(traffic_meter)ro,256K(pot_bak)ro,256K(traffic_meter.bak)ro,3840K(kernel),31488K(rootfs),35328K@9233K(firmware),256K(mtdoops)ro,1457651200(reserved)ro,-(unallocated) rootfstype=squashfs,ext4 rootwait";
1111
};
1212
};
13+
14+
&pcie_bridge0 {
15+
wifi@0,0 {
16+
compatible = "qcom,ath10k";
17+
reg = <0x00010000 0 0 0 0>;
18+
ieee80211-freq-limit = <5170000 5350000>;
19+
qcom,ath10k-calibration-variant = "Netgear-RBK40";
20+
};
21+
};
22+
23+
&wifi0 {
24+
status = "okay";
25+
26+
qcom,ath10k-calibration-variant = "Netgear-RBK40";
27+
};
28+
29+
&wifi1 {
30+
status = "okay";
31+
32+
qcom,ath10k-calibration-variant = "Netgear-RBK40";
33+
};

‎target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbs50.dts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,24 @@
2626
&usb2 {
2727
status = "okay";
2828
};
29+
30+
&pcie_bridge0 {
31+
wifi@0,0 {
32+
compatible = "qcom,ath10k";
33+
reg = <0x00010000 0 0 0 0>;
34+
ieee80211-freq-limit = <5470000 5875000>;
35+
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
36+
};
37+
};
38+
39+
&wifi0 {
40+
status = "okay";
41+
42+
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
43+
};
44+
45+
&wifi1 {
46+
status = "okay";
47+
48+
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
49+
};

‎target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-srr60.dts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,24 @@
1010
bootargs = "root=/dev/mmcblk0p20 blkdevparts=mmcblk0:512K@17K(0:SBL1)ro,512K(0:BOOTCONFIG)ro,512K(0:QSEE)ro,512K(0:QSEE_1)ro,256K(0:CDT)ro,256K(0:CDT_1)ro,512K(0:BOOTCONFIG1)ro,256K(0:APPSBLENV)ro,1M(0:APPSBL)ro,1M(0:APPSBL_1)ro,256K(0:ART)ro,256K(ARTMTD)ro,2M(language)ro,256K(config)ro,256K(pot)ro,256K(traffic_meter)ro,256K(pot_bak)ro,256K(traffic_meter.bak)ro,3840K(kernel),31488K(rootfs),35328K@9233K(firmware),256K(mtdoops)ro,64K(cert)ro,3840K(kernel-2)ro,31488K(rootfs-2)ro,35328K@44881K(firmware-2)ro,5M(device_table)ro,17M(cp_file)ro,102737K(reserved)ro,-(unallocated) rootfstype=squashfs,ext4 rootwait";
1111
};
1212
};
13+
14+
&pcie_bridge0 {
15+
wifi@0,0 {
16+
compatible = "qcom,ath10k";
17+
reg = <0x00010000 0 0 0 0>;
18+
ieee80211-freq-limit = <5470000 5875000>;
19+
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
20+
};
21+
};
22+
23+
&wifi0 {
24+
status = "okay";
25+
26+
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
27+
};
28+
29+
&wifi1 {
30+
status = "okay";
31+
32+
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
33+
};

‎target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-srs60.dts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,24 @@
1010
bootargs = "root=/dev/mmcblk0p20 blkdevparts=mmcblk0:512K@17K(0:SBL1)ro,512K(0:BOOTCONFIG)ro,512K(0:QSEE)ro,512K(0:QSEE_1)ro,256K(0:CDT)ro,256K(0:CDT_1)ro,512K(0:BOOTCONFIG1)ro,256K(0:APPSBLENV)ro,1M(0:APPSBL)ro,1M(0:APPSBL_1)ro,256K(0:ART)ro,256K(ARTMTD)ro,2M(language)ro,256K(config)ro,256K(pot)ro,256K(traffic_meter)ro,256K(pot_bak)ro,256K(traffic_meter.bak)ro,3840K(kernel),31488K(rootfs),35328K@9233K(firmware),256K(mtdoops)ro,64K(cert)ro,3840K(kernel-2)ro,31488K(rootfs-2)ro,35328K@44881K(firmware-2)ro,5M(device_table)ro,17M(cp_file)ro,102737K(reserved)ro,-(unallocated) rootfstype=squashfs,ext4 rootwait";
1111
};
1212
};
13+
14+
&pcie_bridge0 {
15+
wifi@0,0 {
16+
compatible = "qcom,ath10k";
17+
reg = <0x00010000 0 0 0 0>;
18+
ieee80211-freq-limit = <5470000 5875000>;
19+
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
20+
};
21+
};
22+
23+
&wifi0 {
24+
status = "okay";
25+
26+
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
27+
};
28+
29+
&wifi1 {
30+
status = "okay";
31+
32+
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
33+
};

‎target/linux/ipq40xx/image/generic.mk‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ define Device/netgear_orbi
904904
append-rootfs | pad-rootfs | netgear-dni
905905
IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-to 64k | \
906906
sysupgrade-tar rootfs=$$$$@ | append-metadata
907-
DEVICE_PACKAGES := ath10k-firmware-qca9984-ct e2fsprogs kmod-fs-ext4 losetup
907+
DEVICE_PACKAGES := e2fsprogs kmod-fs-ext4 losetup
908908
endef
909909

910910
define Device/netgear_lbr20
@@ -967,6 +967,7 @@ define Device/netgear_rbx40
967967
KERNEL_SIZE := 3932160
968968
ROOTFS_SIZE := 32243712
969969
IMAGE_SIZE := 36175872
970+
DEVICE_PACKAGES += ipq-wifi-netgear_rbk40 ath10k-firmware-qca9888-ct
970971
endef
971972

972973
define Device/netgear_rbr40
@@ -991,6 +992,7 @@ define Device/netgear_rbx50
991992
KERNEL_SIZE := 3932160
992993
ROOTFS_SIZE := 32243712
993994
IMAGE_SIZE := 36175872
995+
DEVICE_PACKAGES += ath10k-firmware-qca9984-ct
994996
endef
995997

996998
define Device/netgear_rbr50
@@ -1015,6 +1017,7 @@ define Device/netgear_srx60
10151017
KERNEL_SIZE := 3932160
10161018
ROOTFS_SIZE := 32243712
10171019
IMAGE_SIZE := 36175872
1020+
DEVICE_PACKAGES += ath10k-firmware-qca9984-ct
10181021
endef
10191022

10201023
define Device/netgear_srr60

0 commit comments

Comments
 (0)