Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ipq40xx: fix RUTX10 Wi-Fi woes

Browse source 
This partially reverts:
commit cfc13c4459 ("ipq40xx: utilize nvmem-cells for macs & (pre-)calibration data")

U-Boot on these devices mangles the device tree,
so nvmem-cell type calibration doesn't work.

Fixes: cfc13c4459 ("ipq40xx: utilize nvmem-cells for macs & (pre-)calibration data")
Signed-off-by: Kasparas Elzbutas <elzkas@gmail.com>
(added reference to commit, rewrote commit message)
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
This commit is contained in:
Kasparas Elzbutas 2022-07-18 10:05:33 +03:00 committed by Christian Lamparter
parent bb73828b89
commit e562746263
2 changed files with 8 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
View file

@ -138,6 +138,10 @@ case "$FIRMWARE" in
caldata_extract "0:ART" 0x1000 0x2f20 caldata_extract "0:ART" 0x1000 0x2f20
ath10k_patch_mac $(macaddr_add $(get_mac_label) 2) ath10k_patch_mac $(macaddr_add $(get_mac_label) 2)
;; ;;
teltonika,rutx10)
caldata_extract "0:ART" 0x1000 0x2f20
ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary "0:CONFIG" 0x0) 2)
;;
zyxel,nbg6617 |\ zyxel,nbg6617 |\
zyxel,wre6606) zyxel,wre6606)
caldata_extract "ART" 0x1000 0x2f20 caldata_extract "ART" 0x1000 0x2f20
@ -229,6 +233,10 @@ case "$FIRMWARE" in
caldata_extract "0:ART" 0x5000 0x2f20 caldata_extract "0:ART" 0x5000 0x2f20
ath10k_patch_mac $(macaddr_add $(get_mac_label) 4) ath10k_patch_mac $(macaddr_add $(get_mac_label) 4)
;; ;;
teltonika,rutx10)
caldata_extract "0:ART" 0x5000 0x2f20
ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary "0:CONFIG" 0x0) 3)
;;
zyxel,nbg6617 |\ zyxel,nbg6617 |\
zyxel,wre6606) zyxel,wre6606)
caldata_extract "ART" 0x5000 0x2f20 caldata_extract "ART" 0x5000 0x2f20

30
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-rutx.dtsi
View file

@ -188,30 +188,12 @@
label = "0:ART"; label = "0:ART";
reg = <0x2e0000 0x10000>; reg = <0x2e0000 0x10000>;
read-only; read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
precal_art_1000: precal@1000 {
reg = <0x1000 0x2f20>;
};
precal_art_5000: precal@5000 {
reg = <0x5000 0x2f20>;
};
}; };
config: partition@2f0000 { config: partition@2f0000 {
label = "0:CONFIG"; label = "0:CONFIG";
reg = <0x2f0000 0x10000>; reg = <0x2f0000 0x10000>;
read-only; read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_config_0: macaddr@0 {
reg = <0x0 0x6>;
};
}; };
partition@300000 { partition@300000 {
@ -267,15 +249,3 @@
pinctrl-names = "default"; pinctrl-names = "default";
phy-reset-gpio = <&tlmm 62 0>; phy-reset-gpio = <&tlmm 62 0>;
}; };
&wifi0 {
nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_1000>, <&macaddr_config_0>;
mac-address-increment = <2>;
};
&wifi1 {
nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_5000>, <&macaddr_config_0>;
mac-address-increment = <3>;
};