diff options
| -rw-r--r-- | target/linux/ath79/dts/qcn5502_netgear_ex7300-v2.dts | 56 | ||||
| -rw-r--r-- | target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata | 4 |
2 files changed, 46 insertions, 14 deletions
diff --git a/target/linux/ath79/dts/qcn5502_netgear_ex7300-v2.dts b/target/linux/ath79/dts/qcn5502_netgear_ex7300-v2.dts index ba8dae0b36..e5d897029d 100644 --- a/target/linux/ath79/dts/qcn5502_netgear_ex7300-v2.dts +++ b/target/linux/ath79/dts/qcn5502_netgear_ex7300-v2.dts @@ -114,6 +114,14 @@ &pcie { status = "okay"; + + wifi@0,0 { + compatible = "qcom,ath10k"; + reg = <0 0 0 0 0>; + + nvmem-cells = <&macaddr_artmtd_c>, <&precal_art_5000>; + nvmem-cell-names = "mac-address", "pre-calibration"; + }; }; &pll { @@ -133,7 +141,7 @@ #address-cells = <1>; #size-cells = <1>; - uboot: partition@0 { + partition@0 { label = "u-boot"; reg = <0x000000 0x040000>; read-only; @@ -174,29 +182,56 @@ read-only; }; - artmtd: partition@fe0000 { + partition@fe0000 { label = "artmtd"; reg = <0xfe0000 0x10000>; + + compatible = "nvmem-cells"; + #address-cells = <1>; + #size-cells = <1>; + + macaddr_artmtd_0: macaddr@0 { + reg = <0x0 0x6>; + }; + + macaddr_artmtd_6: macaddr@6 { + reg = <0x6 0x6>; + }; + + macaddr_artmtd_c: macaddr@c { + reg = <0xc 0x6>; + }; }; - art: partition@ff0000 { + partition@ff0000 { label = "art"; reg = <0xff0000 0x10000>; read-only; + + compatible = "nvmem-cells"; + #address-cells = <1>; + #size-cells = <1>; + + cal_art_1000: cal@1000 { + reg = <0x1000 0x440>; + }; + + precal_art_5000: precal@5000 { + reg = <0x5000 0x2f20>; + }; }; }; }; }; -/* -Does not work due to lack of QCN5502 support in ath9k. + &wmac { - status = "okay"; + /* Does not work due to lack of QCN5502 support in ath9k. */ + status = "disabled"; - mtd-cal-data = <&art 0x1000>; - mtd-mac-address = <&artmtd 0x6>; + nvmem-cells = <&macaddr_artmtd_6>, <&cal_art_1000>; + nvmem-cell-names = "mac-address", "calibration"; }; -*/ &mdio0 { status = "okay"; @@ -210,7 +245,8 @@ Does not work due to lack of QCN5502 support in ath9k. ð0 { status = "okay"; - mtd-mac-address = <&artmtd 0x0>; + nvmem-cells = <&macaddr_artmtd_0>; + nvmem-cell-names = "mac-address"; phy-handle = <&phy5>; phy-mode = "sgmii"; diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index cf16fa2318..a7ea58b507 100644 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -219,10 +219,6 @@ case "$FIRMWARE" in caldata_extract "caldata" 0x5000 0x2f20 ath10k_patch_mac $(mtd_get_mac_binary caldata 0xc) ;; - netgear,ex7300-v2) - caldata_extract "art" 0x5000 0x2f20 - ath10k_patch_mac $(mtd_get_mac_binary artmtd 0xc) - ;; phicomm,k2t) caldata_extract "art" 0x5000 0x2f20 ath10k_patch_mac $(k2t_get_mac "5g_mac") |