openwrt-mirror/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-12-21 19:14:28 +04:00
Code Issues Packages Projects Releases Wiki Activity

ipq40xx: fix second 5ghz radio on Netgear RBx40

Browse Source 
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 <achterin@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/20877
Signed-off-by: Robert Marko <robimarko@gmail.com>
(cherry picked from commit f0909f7a05)
This commit is contained in:
Christoph Krapp
2025-11-22 20:42:33 +01:00
committed by Robert Marko
parent 368c9c0c99
commit ce54f6e893
8 changed files with 130 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -288,24 +288,3 @@
perst-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 50 GPIO_ACTIVE_LOW>;
};
&pcie_bridge0 {
wifi@0,0 {
compatible = "qcom,ath10k";
reg = <0x00010000 0 0 0 0>;
ieee80211-freq-limit = <5470000 5875000>;
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
};
};
&wifi0 {
status = "okay";
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
};
&wifi1 {
status = "okay";
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
};

21
target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbr40.dts
View File

@@ -10,3 +10,24 @@
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";
};
};
&pcie_bridge0 {
wifi@0,0 {
compatible = "qcom,ath10k";
reg = <0x00010000 0 0 0 0>;
ieee80211-freq-limit = <5170000 5350000>;
qcom,ath10k-calibration-variant = "Netgear-RBK40";
};
};
&wifi0 {
status = "okay";
qcom,ath10k-calibration-variant = "Netgear-RBK40";
};
&wifi1 {
status = "okay";
qcom,ath10k-calibration-variant = "Netgear-RBK40";
};

21
target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbr50.dts
View File

@@ -26,3 +26,24 @@
&usb2 {
status = "okay";
};
&pcie_bridge0 {
wifi@0,0 {
compatible = "qcom,ath10k";
reg = <0x00010000 0 0 0 0>;
ieee80211-freq-limit = <5470000 5875000>;
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
};
};
&wifi0 {
status = "okay";
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
};
&wifi1 {
status = "okay";
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
};

21
target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbs40.dts
View File

@@ -10,3 +10,24 @@
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";
};
};
&pcie_bridge0 {
wifi@0,0 {
compatible = "qcom,ath10k";
reg = <0x00010000 0 0 0 0>;
ieee80211-freq-limit = <5170000 5350000>;
qcom,ath10k-calibration-variant = "Netgear-RBK40";
};
};
&wifi0 {
status = "okay";
qcom,ath10k-calibration-variant = "Netgear-RBK40";
};
&wifi1 {
status = "okay";
qcom,ath10k-calibration-variant = "Netgear-RBK40";
};

21
target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbs50.dts
View File

@@ -26,3 +26,24 @@
&usb2 {
status = "okay";
};
&pcie_bridge0 {
wifi@0,0 {
compatible = "qcom,ath10k";
reg = <0x00010000 0 0 0 0>;
ieee80211-freq-limit = <5470000 5875000>;
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
};
};
&wifi0 {
status = "okay";
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
};
&wifi1 {
status = "okay";
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
};

21
target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-srr60.dts
View File

@@ -10,3 +10,24 @@
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";
};
};
&pcie_bridge0 {
wifi@0,0 {
compatible = "qcom,ath10k";
reg = <0x00010000 0 0 0 0>;
ieee80211-freq-limit = <5470000 5875000>;
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
};
};
&wifi0 {
status = "okay";
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
};
&wifi1 {
status = "okay";
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
};

21
target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-srs60.dts
View File

@@ -10,3 +10,24 @@
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";
};
};
&pcie_bridge0 {
wifi@0,0 {
compatible = "qcom,ath10k";
reg = <0x00010000 0 0 0 0>;
ieee80211-freq-limit = <5470000 5875000>;
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
};
};
&wifi0 {
status = "okay";
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
};
&wifi1 {
status = "okay";
qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
};

5
target/linux/ipq40xx/image/generic.mk
View File

@@ -904,7 +904,7 @@ define Device/netgear_orbi
append-rootfs | pad-rootfs | netgear-dni
IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-to 64k | \
sysupgrade-tar rootfs=$$$$@ | append-metadata
DEVICE_PACKAGES := ath10k-firmware-qca9984-ct e2fsprogs kmod-fs-ext4 losetup
DEVICE_PACKAGES := e2fsprogs kmod-fs-ext4 losetup
endef
define Device/netgear_lbr20
@@ -967,6 +967,7 @@ define Device/netgear_rbx40
KERNEL_SIZE := 3932160
ROOTFS_SIZE := 32243712
IMAGE_SIZE := 36175872
DEVICE_PACKAGES += ipq-wifi-netgear_rbk40 ath10k-firmware-qca9888-ct
endef
define Device/netgear_rbr40
@@ -991,6 +992,7 @@ define Device/netgear_rbx50
KERNEL_SIZE := 3932160
ROOTFS_SIZE := 32243712
IMAGE_SIZE := 36175872
DEVICE_PACKAGES += ath10k-firmware-qca9984-ct
endef
define Device/netgear_rbr50
@@ -1015,6 +1017,7 @@ define Device/netgear_srx60
KERNEL_SIZE := 3932160
ROOTFS_SIZE := 32243712
IMAGE_SIZE := 36175872
DEVICE_PACKAGES += ath10k-firmware-qca9984-ct
endef
define Device/netgear_srr60