[openwrt/openwrt] ath79: mtd-cal-data removals
LEDE Commits
lede-commits at lists.infradead.org
Sun Jun 9 03:40:10 PDT 2024
hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/74f2df9dbccd9840edb25d55ad70d58e3ed8303c
commit 74f2df9dbccd9840edb25d55ad70d58e3ed8303c
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Fri Feb 16 21:17:20 2024 -0800
ath79: mtd-cal-data removals
Replacement can be done with nvmem.
Signed-off-by: Rosen Penev <rosenp at gmail.com>
---
.../linux/ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi | 9 +++++++--
.../linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts | 17 +++++++++++++----
.../linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts | 19 ++++++++++++++-----
target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts | 18 ++++++++++++++----
target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts | 11 +++++++----
target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi | 9 +++++++--
target/linux/ath79/dts/ar9330_pqi_air-pen.dts | 11 +++++++----
target/linux/ath79/dts/ar9330_ziking_cpe46b.dts | 9 +++++++--
target/linux/ath79/dts/ar9331_8dev_carambola2.dts | 12 ++++++++++--
target/linux/ath79/dts/ar9331_arduino_yun.dts | 15 +++++++++++++--
.../linux/ath79/dts/ar9331_embeddedwireless_dorin.dts | 9 +++++++--
target/linux/ath79/dts/ar9331_etactica_eg200.dts | 10 ++++++++--
target/linux/ath79/dts/ar9331_glinet_6408.dts | 18 +++++++++++++-----
target/linux/ath79/dts/ar9331_glinet_6416.dts | 18 +++++++++++++-----
target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts | 9 +++++++--
target/linux/ath79/dts/ar9331_glinet_gl-usb150.dts | 9 +++++++--
.../ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts | 9 +++++++--
target/linux/ath79/dts/ar9331_hiwifi_hc6361.dts | 17 +++++++++++++----
target/linux/ath79/dts/ar9331_onion_omega.dts | 18 +++++++++++++-----
target/linux/ath79/dts/ar9331_pisen_ts-d084.dts | 18 ++++++++++++++----
target/linux/ath79/dts/ar9331_pisen_wmm003n.dts | 18 ++++++++++++++----
target/linux/ath79/dts/ar9331_teltonika_rut230-v1.dts | 17 +++++++++++++----
target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts | 17 +++++++++++++----
target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts | 17 +++++++++++++----
.../ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi | 17 +++++++++++++----
.../linux/ath79/dts/ar9331_tplink_tl-wr710n-8m.dtsi | 18 +++++++++++++-----
.../linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi | 17 +++++++++++++----
target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts | 7 ++++++-
.../linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts | 7 ++++++-
target/linux/ath79/dts/ar9341_openmesh_om2p-hs.dtsi | 9 +++++++--
target/linux/ath79/dts/ar9341_pcs_cr3000.dts | 9 +++++++--
target/linux/ath79/dts/ar9341_pisen_wmb001n.dts | 10 ++++++++--
target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts | 18 +++++++++++++-----
target/linux/ath79/dts/ar9341_tplink_tl-wa.dtsi | 17 +++++++++++++----
target/linux/ath79/dts/ar9341_tplink_tl-wr841-v8.dts | 18 +++++++++++++-----
target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts | 18 +++++++++++++-----
.../linux/ath79/dts/ar9341_tplink_tl-wr941nd-v5.dts | 18 +++++++++++++-----
target/linux/ath79/dts/ar9342_ubnt_wa.dtsi | 12 +++++++++---
target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts | 11 +++++++++--
target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts | 15 +++++++++++++--
target/linux/ath79/dts/ar9344_devolo_dlan_wifi.dtsi | 9 +++++++--
target/linux/ath79/dts/ar9344_openmesh_om5p.dts | 9 +++++++--
target/linux/ath79/dts/ar9344_pcs_cr5000.dts | 9 +++++++--
target/linux/ath79/dts/ar9344_qxwlan_e750x.dtsi | 15 +++++++++++++--
target/linux/ath79/dts/ar9344_samsung_wam250.dts | 9 +++++++--
target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi | 17 +++++++++++++----
target/linux/ath79/dts/ar9344_tplink_cpe.dtsi | 17 +++++++++++++----
.../linux/ath79/dts/ar9344_tplink_tl-wr841hp-v2.dts | 18 +++++++++++++-----
target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts | 11 +++++++++--
target/linux/ath79/dts/qca9531_8dev_carambola3.dts | 9 +++++++--
target/linux/ath79/dts/qca9531_8dev_lima.dts | 9 +++++++--
.../linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts | 11 +++++++----
.../linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts | 10 ++++++++--
target/linux/ath79/dts/qca9531_comfast_cf-e5.dts | 9 +++++++--
target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts | 9 ++++++---
target/linux/ath79/dts/qca9531_comfast_cf-ew71-v2.dts | 11 +++++++----
target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts | 11 +++++++----
.../linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts | 10 ++++++----
target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts | 15 +++++++++++++--
target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts | 15 +++++++++++++--
target/linux/ath79/dts/qca9531_engenius_ews511ap.dts | 9 +++++++--
target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi | 10 ++++++++--
target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts | 9 +++++++--
target/linux/ath79/dts/qca9531_glinet_gl-e750.dts | 9 +++++++--
target/linux/ath79/dts/qca9531_glinet_gl-s200.dtsi | 1 +
target/linux/ath79/dts/qca9531_glinet_gl-x300b.dts | 9 +++++++--
target/linux/ath79/dts/qca9531_glinet_gl-x750.dts | 9 +++++++--
target/linux/ath79/dts/qca9531_glinet_gl-xe300.dts | 9 +++++++--
target/linux/ath79/dts/qca9531_joyit_jt-or750i.dts | 7 ++++++-
target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi | 15 +++++++++++++--
target/linux/ath79/dts/qca9531_telco_t1.dts | 9 +++++++--
.../linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts | 13 ++++++++-----
.../linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts | 17 +++++++++++++----
.../linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts | 17 +++++++++++++----
.../linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts | 13 ++++++++-----
target/linux/ath79/dts/qca9531_wallys_dr531.dts | 15 +++++++++++++--
target/linux/ath79/dts/qca9531_yuncore_a770.dts | 9 +++++++--
.../linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts | 11 +++++++----
target/linux/ath79/dts/qca9533_dlink_dap-13xx.dtsi | 15 +++++++++++++--
target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi | 11 +++++++----
target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi | 11 +++++++----
target/linux/ath79/dts/qca9533_qca_ap143-16m.dts | 9 +++++++--
target/linux/ath79/dts/qca9533_qca_ap143-8m.dts | 9 +++++++--
target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi | 17 +++++++++++++----
target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi | 17 +++++++++++++----
.../linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts | 17 +++++++++++++----
target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi | 17 +++++++++++++----
target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi | 17 +++++++++++++----
.../linux/ath79/dts/qca9533_tplink_tl-wr841hp-v3.dts | 17 +++++++++++++----
.../linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts | 17 +++++++++++++----
target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts | 10 ++++++++--
target/linux/ath79/dts/qca9533_yuncore_a930.dts | 10 ++++++++--
target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi | 17 +++++++++++++----
target/linux/ath79/dts/qca9550_airtight_c-75.dts | 9 +++++++--
target/linux/ath79/dts/qca9557_8dev_rambutan.dts | 10 ++++++++--
.../ath79/dts/qca9557_araknis_an-500-ap-i-ac.dts | 12 +++++++-----
target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts | 6 +++++-
.../linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts | 11 +++++++----
.../ath79/dts/qca9558_araknis_an-700-ap-i-ac.dts | 11 +++++++----
target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi | 9 +++++++--
.../linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts | 11 +++++++----
.../linux/ath79/dts/qca9558_comfast_cf-wr650ac-v1.dts | 12 +++++++-----
.../linux/ath79/dts/qca9558_comfast_cf-wr650ac-v2.dts | 12 +++++++-----
target/linux/ath79/dts/qca9558_compex_wpj558-16m.dts | 15 +++++++++++++--
target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi | 11 +++++++----
target/linux/ath79/dts/qca9558_domywifi_dw33d.dts | 11 +++++++----
.../ath79/dts/qca9558_librerouter_librerouter-v1.dts | 11 +++++++----
target/linux/ath79/dts/qca9558_ocedo_koala.dts | 11 +++++++----
target/linux/ath79/dts/qca9558_ocedo_ursus.dts | 11 +++++++----
target/linux/ath79/dts/qca9558_openmesh_a60.dtsi | 11 +++++++----
target/linux/ath79/dts/qca9558_openmesh_mr.dtsi | 11 +++++++----
.../linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts | 11 +++++++----
.../linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts | 11 +++++++----
target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi | 15 +++++++++++++--
target/linux/ath79/dts/qca9558_sophos_ap.dtsi | 11 ++++++++---
target/linux/ath79/dts/qca9558_sophos_ap15.dts | 11 ++++++++---
.../linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts | 14 ++++++++------
.../linux/ath79/dts/qca9558_tplink_archer-d7-v1.dts | 13 ++++++++-----
.../linux/ath79/dts/qca9558_tplink_archer-d7b-v1.dts | 13 ++++++++-----
target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts | 13 ++++++++-----
target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi | 13 ++++++++-----
.../linux/ath79/dts/qca9558_tplink_tl-wdr7500-v3.dts | 14 ++++++++------
.../linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi | 18 ++++++++++++++----
.../ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts | 18 ++++++++++++++----
.../linux/ath79/dts/qca9558_trendnet_tew-823dru.dts | 15 +++++++++++++--
target/linux/ath79/dts/qca9558_watchguard_ap300.dts | 12 +++++++-----
target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts | 10 +++++++---
target/linux/ath79/dts/qca955x_zyxel_nbg6x16.dtsi | 3 ++-
.../linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts | 15 +++++++++------
.../linux/ath79/dts/qca9561_tplink_archer-c58-v1.dts | 14 ++++++++------
.../linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts | 14 ++++++++------
.../linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts | 14 ++++++++------
.../linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts | 14 ++++++++------
.../linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts | 14 ++++++++------
.../linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts | 14 ++++++++------
.../linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts | 11 +++++++----
target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts | 11 +++++++----
target/linux/ath79/dts/qca9563_compex_wpj563.dts | 15 +++++++++++++--
target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi | 9 +++++++--
target/linux/ath79/dts/qca9563_phicomm_k2t.dts | 10 ++++++++--
target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi | 11 ++++++++---
target/linux/ath79/dts/qca9563_rosinson_wr818.dts | 15 +++++++++++++--
.../linux/ath79/dts/qca9563_tplink_archer-a7-v5.dts | 18 ++++++++++--------
.../linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts | 13 ++++++++-----
.../ath79/dts/qca9563_tplink_archer-c6-v2-us.dts | 14 ++++++++------
.../linux/ath79/dts/qca9563_tplink_archer-c6-v2.dts | 14 ++++++++------
.../linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts | 13 ++++++++-----
.../linux/ath79/dts/qca9563_tplink_archer-c7-v5.dts | 14 ++++++++------
target/linux/ath79/dts/qca9563_tplink_deco-m4r-v1.dts | 15 +++++++++------
target/linux/ath79/dts/qca9563_tplink_re450-v2.dts | 14 ++++++++------
target/linux/ath79/dts/qca9563_tplink_re450-v3.dts | 14 ++++++++------
target/linux/ath79/dts/qca9563_tplink_re455-v1.dts | 14 ++++++++------
.../linux/ath79/dts/qca9563_tplink_tl-wa1201-v2.dts | 14 ++++++++------
.../linux/ath79/dts/qca9563_tplink_tl-wpa8630-v1.dts | 14 ++++++++------
.../ath79/dts/qca9563_tplink_tl-wpa8630p-v2-int.dts | 14 ++++++++------
.../ath79/dts/qca9563_tplink_tl-wpa8630p-v2.0-eu.dts | 14 ++++++++------
.../ath79/dts/qca9563_tplink_tl-wpa8630p-v2.1-eu.dts | 14 ++++++++------
.../linux/ath79/dts/qca9563_tplink_tl-wr1043n-v5.dts | 18 +++++++++++++-----
.../linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts | 18 +++++++++++++-----
target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi | 9 +++++++--
target/linux/ath79/dts/qca9563_xiaomi_aiot-ac2350.dts | 9 +++++++--
target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi | 9 +++++++--
.../linux/ath79/dts/tp9343_tplink_tl-wr941hp-v1.dts | 17 +++++++++++++----
target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi | 17 +++++++++++++----
164 files changed, 1502 insertions(+), 589 deletions(-)
diff --git a/target/linux/ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi b/target/linux/ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi
index 77e7925715..a82546c1c1 100644
--- a/target/linux/ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi
+++ b/target/linux/ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi
@@ -134,7 +134,7 @@
read-only;
};
- art: partition at 1fe0000 {
+ partition at 1fe0000 {
label = "art";
reg = <0x1fe0000 0x020000>;
read-only;
@@ -144,6 +144,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_11000: calibration at 11000 {
+ reg = <0x11000 0x440>;
+ };
+
macaddr_art_1120c: macaddr at 1120c {
reg = <0x1120c 0x6>;
};
@@ -248,7 +252,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x11000>;
+ nvmem-cells = <&cal_art_11000>;
+ nvmem-cell-names = "calibration";
};
&uart {
diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts
index 75aeb69eb4..ed4ca5297e 100644
--- a/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts
+++ b/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts
@@ -93,10 +93,20 @@
reg = <0x020000 0x3D0000>;
};
- art: partition at 3f0000 {
+ partition at 3f0000 {
label = "art";
reg = <0x3f0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -129,7 +139,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_uboot_1fc00>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts
index 7957c438d6..8958ddd3a8 100644
--- a/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts
+++ b/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts
@@ -120,10 +120,20 @@
reg = <0x020000 0x7D0000>;
};
- art: partition at 7F0000 {
+ partition at 7f0000 {
label = "art";
- reg = <0x7F0000 0x010000>;
+ reg = <0x7f0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -145,7 +155,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_uboot_1fc00>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
index e786ad2760..d3f189479a 100644
--- a/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
+++ b/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
@@ -142,10 +142,20 @@
reg = <0x020000 0x3d0000>;
};
- art: partition at 3f0000 {
+ partition at 3f0000 {
label = "art";
reg = <0x3f0000 0x10000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -166,7 +176,7 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_uboot_1fc00>;
- nvmem-cell-names = "mac-address";
+
+ nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts b/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts
index 408fa12d8a..fe1d3186cf 100644
--- a/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts
+++ b/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts
@@ -104,7 +104,7 @@
reg = <0x050000 0xfa0000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -117,6 +117,10 @@
macaddr_art_0: macaddr at 0 {
reg = <0x0 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
};
@@ -147,7 +151,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_art_0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi b/target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi
index 38704f9169..51a2c8b2af 100644
--- a/target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi
+++ b/target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi
@@ -122,7 +122,7 @@
reg = <0x8c0000 0x700000>;
};
- art: partition at fc0000 {
+ partition at fc0000 {
label = "ART";
reg = <0xfc0000 0x040000>;
read-only;
@@ -139,6 +139,10 @@
macaddr_art_6: macaddr at 6 {
reg = <0x6 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
};
@@ -162,5 +166,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/ar9330_pqi_air-pen.dts b/target/linux/ath79/dts/ar9330_pqi_air-pen.dts
index 98ef9abcc0..121dcbcb0e 100644
--- a/target/linux/ath79/dts/ar9330_pqi_air-pen.dts
+++ b/target/linux/ath79/dts/ar9330_pqi_air-pen.dts
@@ -85,7 +85,7 @@
reg = <0x040000 0x010000>;
};
- art: partition at 50000 {
+ partition at 50000 {
label = "art";
reg = <0x050000 0x010000>;
read-only;
@@ -99,6 +99,10 @@
reg = <0x2 0x6>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
macaddr_art_1002: macaddr at 1002 {
reg = <0x1002 0x6>;
};
@@ -149,7 +153,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_art_2>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_2>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/ar9330_ziking_cpe46b.dts b/target/linux/ath79/dts/ar9330_ziking_cpe46b.dts
index ebd6d5384f..b4a4e6894d 100644
--- a/target/linux/ath79/dts/ar9330_ziking_cpe46b.dts
+++ b/target/linux/ath79/dts/ar9330_ziking_cpe46b.dts
@@ -76,7 +76,7 @@
reg = <0x020000 0x7d0000>;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
@@ -91,6 +91,10 @@
reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
};
@@ -114,5 +118,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/ar9331_8dev_carambola2.dts b/target/linux/ath79/dts/ar9331_8dev_carambola2.dts
index 73699d9bfa..6c38f54593 100644
--- a/target/linux/ath79/dts/ar9331_8dev_carambola2.dts
+++ b/target/linux/ath79/dts/ar9331_8dev_carambola2.dts
@@ -90,7 +90,7 @@
reg = <0x50000 0xfa0000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -107,6 +107,10 @@
macaddr_art_6: macaddr at 6 {
reg = <0x6 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
};
@@ -119,6 +123,7 @@
ð0 {
status = "okay";
+
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
@@ -132,11 +137,14 @@
ð1 {
status = "okay";
+
nvmem-cells = <&macaddr_art_6>;
nvmem-cell-names = "mac-address";
};
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+
+ nvmem-cells = <&macaddr_art_6>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/ar9331_arduino_yun.dts b/target/linux/ath79/dts/ar9331_arduino_yun.dts
index c866889ce4..bb2a42612f 100644
--- a/target/linux/ath79/dts/ar9331_arduino_yun.dts
+++ b/target/linux/ath79/dts/ar9331_arduino_yun.dts
@@ -171,10 +171,20 @@
reg = <0xfe0000 0x10000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x10000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -193,5 +203,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
index 6feee3123d..0616228193 100644
--- a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
+++ b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
@@ -83,7 +83,7 @@
reg = <0x050000 0xfa0000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -93,6 +93,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
macaddr_art_1002: macaddr at 1002 {
compatible = "mac-base";
reg = <0x1002 0x6>;
@@ -118,5 +122,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/ar9331_etactica_eg200.dts b/target/linux/ath79/dts/ar9331_etactica_eg200.dts
index ad3b88ab2b..a887056d73 100644
--- a/target/linux/ath79/dts/ar9331_etactica_eg200.dts
+++ b/target/linux/ath79/dts/ar9331_etactica_eg200.dts
@@ -108,7 +108,7 @@
reg = <0x50000 0xfa0000>;
};
- art: art at ff0000 {
+ art at ff0000 {
reg = <0xff0000 0x10000>;
read-only;
@@ -120,6 +120,10 @@
macaddr_art_0: macaddr at 0 {
reg = <0x0 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
};
@@ -128,5 +132,7 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/ar9331_glinet_6408.dts b/target/linux/ath79/dts/ar9331_glinet_6408.dts
index eae6be3004..ef800a6ce4 100644
--- a/target/linux/ath79/dts/ar9331_glinet_6408.dts
+++ b/target/linux/ath79/dts/ar9331_glinet_6408.dts
@@ -46,10 +46,20 @@
label = "firmware";
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
reg = <0x7f0000 0x10000>;
label = "art";
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -66,8 +76,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_uboot_1fc00>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/ar9331_glinet_6416.dts b/target/linux/ath79/dts/ar9331_glinet_6416.dts
index 62d0acbf5d..02c3372d3c 100644
--- a/target/linux/ath79/dts/ar9331_glinet_6416.dts
+++ b/target/linux/ath79/dts/ar9331_glinet_6416.dts
@@ -46,10 +46,20 @@
label = "firmware";
};
- art: partition at ff0000 {
+ partition at ff0000 {
reg = <0xff0000 0x10000>;
label = "art";
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -66,8 +76,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_uboot_1fc00>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts b/target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts
index 37418bfc4a..067d760b04 100644
--- a/target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts
+++ b/target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts
@@ -113,7 +113,7 @@
reg = <0x050000 0xfa0000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -126,6 +126,10 @@
macaddr_art_0: macaddr at 0 {
reg = <0x0 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
};
@@ -156,5 +160,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/ar9331_glinet_gl-usb150.dts b/target/linux/ath79/dts/ar9331_glinet_gl-usb150.dts
index e9b1c18924..f440d63b16 100644
--- a/target/linux/ath79/dts/ar9331_glinet_gl-usb150.dts
+++ b/target/linux/ath79/dts/ar9331_glinet_gl-usb150.dts
@@ -107,7 +107,7 @@
reg = <0x050000 0xfa0000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -120,6 +120,10 @@
macaddr_art_0: macaddr at 0 {
reg = <0x0 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
};
@@ -129,5 +133,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts b/target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts
index 5701dff64c..a2b6edbd5e 100644
--- a/target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts
+++ b/target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts
@@ -98,7 +98,7 @@
compatible = "tplink,firmware";
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -111,6 +111,10 @@
macaddr_art_6: macaddr at 6 {
reg = <0x6 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
};
@@ -128,5 +132,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/ar9331_hiwifi_hc6361.dts b/target/linux/ath79/dts/ar9331_hiwifi_hc6361.dts
index 5d0c02a649..10b6051c3b 100644
--- a/target/linux/ath79/dts/ar9331_hiwifi_hc6361.dts
+++ b/target/linux/ath79/dts/ar9331_hiwifi_hc6361.dts
@@ -109,10 +109,20 @@
read-only;
};
- art: partition at ff0000 {
+ partition at ff0000 {
reg = <0xff0000 0x10000>;
label = "art";
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -152,8 +162,7 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_bdinfo_18a 2>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_bdinfo_18a 2>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/ar9331_onion_omega.dts b/target/linux/ath79/dts/ar9331_onion_omega.dts
index 5d9e96e048..c13a33fb6c 100644
--- a/target/linux/ath79/dts/ar9331_onion_omega.dts
+++ b/target/linux/ath79/dts/ar9331_onion_omega.dts
@@ -119,10 +119,20 @@
reg = <0x020000 0xfd0000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -131,8 +141,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_uboot_1fc00 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/ar9331_pisen_ts-d084.dts b/target/linux/ath79/dts/ar9331_pisen_ts-d084.dts
index 4868ba2fa0..a06ec37348 100644
--- a/target/linux/ath79/dts/ar9331_pisen_ts-d084.dts
+++ b/target/linux/ath79/dts/ar9331_pisen_ts-d084.dts
@@ -73,10 +73,20 @@
label = "firmware";
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
reg = <0x7f0000 0x10000>;
label = "art";
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -112,7 +122,7 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_uboot_1fc00>;
- nvmem-cell-names = "mac-address";
+
+ nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/ar9331_pisen_wmm003n.dts b/target/linux/ath79/dts/ar9331_pisen_wmm003n.dts
index 63f394a4f9..dd3269db8b 100644
--- a/target/linux/ath79/dts/ar9331_pisen_wmm003n.dts
+++ b/target/linux/ath79/dts/ar9331_pisen_wmm003n.dts
@@ -81,10 +81,20 @@
label = "firmware";
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
reg = <0x7f0000 0x10000>;
label = "art";
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -121,7 +131,7 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_uboot_1fc00>;
- nvmem-cell-names = "mac-address";
+
+ nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/ar9331_teltonika_rut230-v1.dts b/target/linux/ath79/dts/ar9331_teltonika_rut230-v1.dts
index 054ccea522..c2c54b4662 100644
--- a/target/linux/ath79/dts/ar9331_teltonika_rut230-v1.dts
+++ b/target/linux/ath79/dts/ar9331_teltonika_rut230-v1.dts
@@ -160,10 +160,20 @@
};
};
- art: partition at 30000 {
+ partition at 30000 {
label = "art";
reg = <0x30000 0x10000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
partition at 40000 {
@@ -203,7 +213,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_config_0 2>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_config_0 2>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts b/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
index 0a965c2fa9..551782daa8 100644
--- a/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
@@ -141,10 +141,20 @@
read-only;
};
- art: partition at 3f0000 {
+ partition at 3f0000 {
label = "art";
reg = <0x3f0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -172,7 +182,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_uboot_1fc00>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts b/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts
index df39577110..592e8596e3 100644
--- a/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts
@@ -129,10 +129,20 @@
reg = <0x020000 0x3d0000>;
};
- art: partition at 3f0000 {
+ partition at 3f0000 {
label = "art";
reg = <0x3f0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -160,7 +170,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_uboot_1fc00>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi
index a8608a77e1..6c702a7eb3 100644
--- a/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi
@@ -78,10 +78,20 @@
label = "firmware";
};
- art: partition at 3f0000 {
+ partition at 3f0000 {
reg = <0x3f0000 0x10000>;
label = "art";
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -120,7 +130,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_uboot_1fc00>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr710n-8m.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr710n-8m.dtsi
index d1336e9689..ca449338f7 100644
--- a/target/linux/ath79/dts/ar9331_tplink_tl-wr710n-8m.dtsi
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr710n-8m.dtsi
@@ -45,10 +45,20 @@
label = "firmware";
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
reg = <0x7f0000 0x10000>;
label = "art";
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -65,8 +75,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_uboot_1fc00 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
index 04537fd33a..b1b6577ae2 100644
--- a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
@@ -124,10 +124,20 @@
label = "firmware";
};
- art: partition at 3f0000 {
+ partition at 3f0000 {
reg = <0x3f0000 0x10000>;
label = "art";
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -157,7 +167,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_uboot_1fc00 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts b/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts
index 30f42862b2..69dd46f0c7 100644
--- a/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts
+++ b/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts
@@ -56,7 +56,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
&art {
@@ -68,5 +69,9 @@
macaddr_art_0: macaddr at 0 {
reg = <0x0 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
diff --git a/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts b/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts
index 1b90deace5..0e455ab982 100644
--- a/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts
+++ b/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts
@@ -87,7 +87,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
&art {
@@ -99,5 +100,9 @@
macaddr_art_0: macaddr at 0 {
reg = <0x0 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
diff --git a/target/linux/ath79/dts/ar9341_openmesh_om2p-hs.dtsi b/target/linux/ath79/dts/ar9341_openmesh_om2p-hs.dtsi
index d41dcaa328..885e8bb420 100644
--- a/target/linux/ath79/dts/ar9341_openmesh_om2p-hs.dtsi
+++ b/target/linux/ath79/dts/ar9341_openmesh_om2p-hs.dtsi
@@ -132,7 +132,7 @@
reg = <0x8c0000 0x700000>;
};
- art: partition at fc0000 {
+ partition at fc0000 {
label = "ART";
reg = <0xfc0000 0x040000>;
read-only;
@@ -149,6 +149,10 @@
macaddr_art_6: macaddr at 6 {
reg = <0x6 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
};
@@ -172,5 +176,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
index 1011ab4980..bc75391dc6 100644
--- a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
+++ b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
@@ -118,7 +118,7 @@
reg = <0x050000 0x07a0000>;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
@@ -133,6 +133,10 @@
reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
};
@@ -142,7 +146,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
ð0 {
diff --git a/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts b/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts
index 496d6579e7..cb0fe378a4 100644
--- a/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts
+++ b/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts
@@ -176,7 +176,7 @@
read-only;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x10000>;
read-only;
@@ -189,6 +189,10 @@
macaddr_art_0: macaddr at 0 {
reg = <0x0 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
};
@@ -222,5 +226,7 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts b/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts
index 5a5e785d92..16d2087372 100644
--- a/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts
@@ -87,10 +87,20 @@
reg = <0x020000 0x3d0000>;
};
- art: partition at 3f0000 {
+ partition at 3f0000 {
label = "art";
reg = <0x3f0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -115,8 +125,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_uboot_1fc00 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wa.dtsi b/target/linux/ath79/dts/ar9341_tplink_tl-wa.dtsi
index 71e2c7b8d8..93f3a48f05 100644
--- a/target/linux/ath79/dts/ar9341_tplink_tl-wa.dtsi
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-wa.dtsi
@@ -50,10 +50,20 @@
reg = <0x020000 0x3d0000>;
};
- art: partition at 3f0000 {
+ partition at 3f0000 {
label = "art";
reg = <0x3f0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -81,7 +91,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_uboot_1fc00>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wr841-v8.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wr841-v8.dts
index 417461a595..f743bcf3ec 100644
--- a/target/linux/ath79/dts/ar9341_tplink_tl-wr841-v8.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-wr841-v8.dts
@@ -67,10 +67,20 @@
reg = <0x020000 0x3d0000>;
};
- art: partition at 3f0000 {
+ partition at 3f0000 {
label = "art";
reg = <0x3f0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -87,8 +97,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_uboot_1fc00 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts
index 3efd824246..c13c03d14b 100644
--- a/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts
@@ -88,10 +88,20 @@
reg = <0x020000 0x7d0000>;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -118,8 +128,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_uboot_1fc00 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wr941nd-v5.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wr941nd-v5.dts
index 180504523c..ad4a85b8cb 100644
--- a/target/linux/ath79/dts/ar9341_tplink_tl-wr941nd-v5.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-wr941nd-v5.dts
@@ -77,10 +77,20 @@
reg = <0x020000 0x3d0000>;
};
- art: partition at 3f0000 {
+ partition at 3f0000 {
label = "art";
reg = <0x3f0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -97,8 +107,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_uboot_1fc00 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/ar9342_ubnt_wa.dtsi b/target/linux/ath79/dts/ar9342_ubnt_wa.dtsi
index 779b3b681f..ed85c79b5e 100644
--- a/target/linux/ath79/dts/ar9342_ubnt_wa.dtsi
+++ b/target/linux/ath79/dts/ar9342_ubnt_wa.dtsi
@@ -73,7 +73,7 @@
read-only;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -87,6 +87,10 @@
reg = <0x0 0x6>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -99,6 +103,8 @@
&wmac {
status = "okay";
- ieee80211-freq-limit = <2402000 2482000>;
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
+
+ ieee80211-freq-limit = <2402000 2482001>;
};
diff --git a/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts b/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts
index 6bfa82356b..0db71ea765 100644
--- a/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts
+++ b/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts
@@ -100,7 +100,7 @@
read-only;
};
- art: partition at 10000 {
+ partition at 10000 {
label = "art";
reg = <0x010000 0x010000>;
read-only;
@@ -117,6 +117,10 @@
macaddr_art_6: macaddr at 6 {
reg = <0x6 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
@@ -149,11 +153,14 @@
ð1 {
status = "okay";
+
nvmem-cells = <&macaddr_art_6>;
nvmem-cell-names = "mac-address";
};
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts b/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts
index 8a354dfe37..57b93e6310 100644
--- a/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts
+++ b/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts
@@ -98,10 +98,20 @@
compatible = "denx,uimage";
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -122,7 +132,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
&mdio0 {
diff --git a/target/linux/ath79/dts/ar9344_devolo_dlan_wifi.dtsi b/target/linux/ath79/dts/ar9344_devolo_dlan_wifi.dtsi
index e503be08ce..3043155261 100644
--- a/target/linux/ath79/dts/ar9344_devolo_dlan_wifi.dtsi
+++ b/target/linux/ath79/dts/ar9344_devolo_dlan_wifi.dtsi
@@ -114,7 +114,7 @@
reg = <0x70000 0xf80000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x10000>;
read-only;
@@ -124,6 +124,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
macaddr_art_1002: macaddr at 1002 {
compatible = "mac-base";
reg = <0x1002 0x6>;
@@ -158,7 +162,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
&pcie {
diff --git a/target/linux/ath79/dts/ar9344_openmesh_om5p.dts b/target/linux/ath79/dts/ar9344_openmesh_om5p.dts
index 739ba583a8..d1ce727489 100644
--- a/target/linux/ath79/dts/ar9344_openmesh_om5p.dts
+++ b/target/linux/ath79/dts/ar9344_openmesh_om5p.dts
@@ -135,7 +135,7 @@
reg = <0x850000 0x7a0000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "ART";
reg = <0xff0000 0x010000>;
read-only;
@@ -152,6 +152,10 @@
macaddr_art_6: macaddr at 6 {
reg = <0x6 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
};
@@ -177,5 +181,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/ar9344_pcs_cr5000.dts b/target/linux/ath79/dts/ar9344_pcs_cr5000.dts
index 6f35bd2c1e..972febe2fd 100644
--- a/target/linux/ath79/dts/ar9344_pcs_cr5000.dts
+++ b/target/linux/ath79/dts/ar9344_pcs_cr5000.dts
@@ -99,7 +99,7 @@
reg = <0x050000 0x07a0000>;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
@@ -113,6 +113,10 @@
reg = <0x0 0x6>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
macaddr_art_5002: macaddr at 5002 {
reg = <0x5002 0x6>;
};
@@ -218,5 +222,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/ar9344_qxwlan_e750x.dtsi b/target/linux/ath79/dts/ar9344_qxwlan_e750x.dtsi
index 0f1fc3e0d5..4707b754a3 100644
--- a/target/linux/ath79/dts/ar9344_qxwlan_e750x.dtsi
+++ b/target/linux/ath79/dts/ar9344_qxwlan_e750x.dtsi
@@ -101,10 +101,20 @@
};
};
- art: partition at 60000 {
+ partition at 60000 {
label = "art";
reg = <0x60000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -117,5 +127,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/ar9344_samsung_wam250.dts b/target/linux/ath79/dts/ar9344_samsung_wam250.dts
index da8c9ac165..6b66dbe0d4 100644
--- a/target/linux/ath79/dts/ar9344_samsung_wam250.dts
+++ b/target/linux/ath79/dts/ar9344_samsung_wam250.dts
@@ -136,7 +136,7 @@
reg = <0x070000 0xf80000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -146,6 +146,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
macaddr_art_1002: macaddr at 1002 {
compatible = "mac-base";
reg = <0x1002 0x6>;
@@ -169,5 +173,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi b/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi
index 64959c9dc2..94e19a929c 100644
--- a/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi
+++ b/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi
@@ -93,10 +93,20 @@
};
};
- art: partition at 30000 {
+ partition at 30000 {
label = "art";
reg = <0x30000 0x10000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
partition at 40000 {
@@ -155,9 +165,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_config_0 2>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_config_0 2>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
&pinmux {
diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
index f15c1c320a..b65b284979 100644
--- a/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
@@ -81,10 +81,20 @@
read-only;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -93,9 +103,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_info_8>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
ð0 {
diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wr841hp-v2.dts b/target/linux/ath79/dts/ar9344_tplink_tl-wr841hp-v2.dts
index 456efc8b75..875406a425 100644
--- a/target/linux/ath79/dts/ar9344_tplink_tl-wr841hp-v2.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_tl-wr841hp-v2.dts
@@ -119,10 +119,20 @@
reg = <0x020000 0x7d0000>;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -147,10 +157,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_uboot_1fc00 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
ð0 {
diff --git a/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts b/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts
index 36802a5275..b0002e455f 100644
--- a/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts
+++ b/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts
@@ -130,7 +130,8 @@
reg = <0x50000 0xfa0000>;
};
- art: art at ff0000 {
+ art at ff0000 {
+ label = "art";
reg = <0xff0000 0x10000>;
read-only;
@@ -146,6 +147,10 @@
macaddr_art_6: macaddr at 6 {
reg = <0x6 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
};
@@ -154,7 +159,9 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
&pinmux {
diff --git a/target/linux/ath79/dts/qca9531_8dev_carambola3.dts b/target/linux/ath79/dts/qca9531_8dev_carambola3.dts
index c019f2c3d1..a1149aeaeb 100644
--- a/target/linux/ath79/dts/qca9531_8dev_carambola3.dts
+++ b/target/linux/ath79/dts/qca9531_8dev_carambola3.dts
@@ -72,7 +72,7 @@
reg = <0x040000 0x040000>;
};
- art: partition at 80000 {
+ partition at 80000 {
label = "art";
reg = <0x080000 0x040000>;
read-only;
@@ -89,6 +89,10 @@
macaddr_art_6: macaddr at 6 {
reg = <0x6 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
@@ -129,5 +133,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9531_8dev_lima.dts b/target/linux/ath79/dts/qca9531_8dev_lima.dts
index 19097d7183..884d1a588e 100644
--- a/target/linux/ath79/dts/qca9531_8dev_lima.dts
+++ b/target/linux/ath79/dts/qca9531_8dev_lima.dts
@@ -63,7 +63,7 @@
reg = <0x040000 0x040000>;
};
- art: partition at 80000 {
+ partition at 80000 {
label = "art";
reg = <0x080000 0x040000>;
read-only;
@@ -80,6 +80,10 @@
macaddr_art_6: macaddr at 6 {
reg = <0x6 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
@@ -120,5 +124,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts
index 1c96bd9a6a..2d0ad0af33 100644
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts
@@ -93,7 +93,7 @@
read-only;
};
- art: partition at 10000 {
+ partition at 10000 {
label = "art";
reg = <0x010000 0x010000>;
read-only;
@@ -106,6 +106,10 @@
macaddr_art_0: macaddr at 0 {
reg = <0x0 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
@@ -143,7 +147,6 @@
&wmac {
status = "okay";
- nvmem-cells = <&macaddr_art_0>;
- nvmem-cell-names = "mac-address";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&macaddr_art_0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
index 9a616921e5..5af98bf46b 100644
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
@@ -108,7 +108,7 @@
read-only;
};
- art: partition at 10000 {
+ partition at 10000 {
label = "art";
reg = <0x010000 0x010000>;
read-only;
@@ -125,6 +125,10 @@
macaddr_art_6: macaddr at 6 {
reg = <0x6 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
@@ -165,5 +169,7 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
index ec99ee0c4f..2cf35b0820 100644
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
@@ -92,7 +92,7 @@
read-only;
};
- art: partition at 10000 {
+ partition at 10000 {
label = "art";
reg = <0x010000 0x010000>;
read-only;
@@ -109,6 +109,10 @@
macaddr_art_6: macaddr at 6 {
reg = <0x6 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
@@ -144,7 +148,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
&pinmux {
diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
index 535676aab2..19256aa10d 100644
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
@@ -118,6 +118,10 @@
#nvmem-cell-cells = <1>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
precal_art_5000: pre-calibration at 5000 {
reg = <0x5000 0x2f20>;
};
@@ -181,7 +185,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_art_0 10>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_0 10>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-ew71-v2.dts b/target/linux/ath79/dts/qca9531_comfast_cf-ew71-v2.dts
index 05873f173d..2277646500 100644
--- a/target/linux/ath79/dts/qca9531_comfast_cf-ew71-v2.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-ew71-v2.dts
@@ -87,7 +87,7 @@
read-only;
};
- art: partition at 10000 {
+ partition at 10000 {
label = "art";
reg = <0x010000 0x010000>;
read-only;
@@ -102,6 +102,10 @@
reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
@@ -137,7 +141,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_art_0 3>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_0 3>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts b/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
index 5f9240d6c1..e5eac04138 100644
--- a/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
@@ -94,7 +94,7 @@
read-only;
};
- art: partition at 10000 {
+ partition at 10000 {
label = "art";
reg = <0x010000 0x010000>;
read-only;
@@ -110,6 +110,10 @@
#nvmem-cell-cells = <1>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
precal_art_5000: pre-calibration at 5000 {
reg = <0x5000 0x2f20>;
};
@@ -148,7 +152,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_art_0 3>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_0 3>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts b/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts
index d13e4966ae..b3df965670 100644
--- a/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts
@@ -108,6 +108,10 @@
#nvmem-cell-cells = <1>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
precal_art_5000: pre-calibration at 5000 {
reg = <0x5000 0x2f20>;
};
@@ -145,8 +149,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_art_0 10>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_0 10>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts b/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts
index 7a8f6edcee..5506da5125 100644
--- a/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts
+++ b/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts
@@ -105,10 +105,20 @@
compatible = "denx,uimage";
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -131,7 +141,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
&pcie0 {
diff --git a/target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts b/target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts
index 8f2027f250..198b08c56e 100644
--- a/target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts
+++ b/target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts
@@ -109,10 +109,20 @@
read-only;
};
- art: partition at 10000 {
+ partition at 10000 {
label = "art";
reg = <0x10000 0x10000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
partition at 20000 {
@@ -163,5 +173,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts b/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts
index 29886a4d3e..5a88731e66 100644
--- a/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts
+++ b/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts
@@ -117,7 +117,7 @@
reg = <0x040000 0x010000>;
};
- art: partition at 50000 {
+ partition at 50000 {
label = "art";
reg = <0x050000 0x010000>;
read-only;
@@ -127,6 +127,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -151,5 +155,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
index 461392660f..3084baa1e6 100644
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
@@ -114,7 +114,7 @@
reg = <0x050000 0xfa0000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -129,6 +129,10 @@
reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
};
@@ -181,7 +185,9 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
&pinmux {
diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
index b6a37754fa..4d809b922a 100644
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
@@ -112,7 +112,7 @@
read-only;
};
- art: partition at 50000 {
+ partition at 50000 {
label = "art";
reg = <0x050000 0x010000>;
read-only;
@@ -128,6 +128,10 @@
#nvmem-cell-cells = <1>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -160,5 +164,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts
index e0c65b7f1b..ba12915570 100644
--- a/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts
@@ -79,7 +79,7 @@
reg = <0x40000 0x10000>;
};
- art: partition at 50000 {
+ partition at 50000 {
label = "art";
reg = <0x50000 0x10000>;
read-only;
@@ -92,6 +92,10 @@
macaddr_art_0: macaddr at 0 {
reg = <0x0 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
@@ -141,5 +145,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-s200.dtsi b/target/linux/ath79/dts/qca9531_glinet_gl-s200.dtsi
index fef23bcd83..f6ff4f3a10 100644
--- a/target/linux/ath79/dts/qca9531_glinet_gl-s200.dtsi
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-s200.dtsi
@@ -192,6 +192,7 @@
&wmac {
status = "okay";
+
nvmem-cells = <&calibration_art_1000>;
nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-x300b.dts b/target/linux/ath79/dts/qca9531_glinet_gl-x300b.dts
index 75a8dca7d2..5135155472 100644
--- a/target/linux/ath79/dts/qca9531_glinet_gl-x300b.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-x300b.dts
@@ -106,7 +106,7 @@
reg = <0x040000 0x010000>;
};
- art: partition at 50000 {
+ partition at 50000 {
label = "art";
reg = <0x050000 0x010000>;
read-only;
@@ -121,6 +121,10 @@
reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
@@ -151,5 +155,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
index 106d81ff11..6d1674caf3 100644
--- a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
@@ -101,7 +101,7 @@
reg = <0x040000 0x010000>;
};
- art: partition at 50000 {
+ partition at 50000 {
label = "art";
reg = <0x050000 0x010000>;
read-only;
@@ -117,6 +117,10 @@
#nvmem-cell-cells = <1>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -149,5 +153,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-xe300.dts b/target/linux/ath79/dts/qca9531_glinet_gl-xe300.dts
index 2e7137bc3a..ae80e30000 100644
--- a/target/linux/ath79/dts/qca9531_glinet_gl-xe300.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-xe300.dts
@@ -108,7 +108,7 @@
reg = <0x40000 0x10000>;
};
- art: partition at 50000 {
+ partition at 50000 {
label = "art";
reg = <0x50000 0x10000>;
read-only;
@@ -123,6 +123,10 @@
reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
@@ -173,5 +177,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9531_joyit_jt-or750i.dts b/target/linux/ath79/dts/qca9531_joyit_jt-or750i.dts
index d4e35c84b3..b9d991217b 100644
--- a/target/linux/ath79/dts/qca9531_joyit_jt-or750i.dts
+++ b/target/linux/ath79/dts/qca9531_joyit_jt-or750i.dts
@@ -111,6 +111,10 @@
reg = <0x6 0x6>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -148,5 +152,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi b/target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi
index ddc3e0f3c6..a376a93046 100644
--- a/target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi
+++ b/target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi
@@ -107,10 +107,20 @@
};
};
- art: partition at 60000 {
+ partition at 60000 {
label = "art";
reg = <0x060000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -133,5 +143,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9531_telco_t1.dts b/target/linux/ath79/dts/qca9531_telco_t1.dts
index 543fad3c4f..1cb40b3aae 100644
--- a/target/linux/ath79/dts/qca9531_telco_t1.dts
+++ b/target/linux/ath79/dts/qca9531_telco_t1.dts
@@ -96,7 +96,7 @@
read-only;
};
- art: partition at 10000 {
+ partition at 10000 {
label = "art";
reg = <0x010000 0x010000>;
read-only;
@@ -113,6 +113,10 @@
macaddr_art_6: macaddr at 6 {
reg = <0x6 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
@@ -148,7 +152,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
&pinmux {
diff --git a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
index fa17cd3ce3..0daabc69a7 100644
--- a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
@@ -124,7 +124,7 @@
read-only;
};
- romfile: partition at 7d0000 {
+ partition at 7d0000 {
label = "romfile";
reg = <0x7d0000 0x010000>;
read-only;
@@ -148,7 +148,7 @@
read-only;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
@@ -158,6 +158,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -184,9 +188,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_romfile_f100 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_romfile_f100 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
&pcie0 {
diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts b/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
index be1dc66aff..b46dbc98c2 100644
--- a/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
@@ -174,10 +174,20 @@
reg = <0x020000 0x3d0000>;
};
- art: partition at 3f0000 {
+ partition at 3f0000 {
label = "art";
reg = <0x3f0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -200,9 +210,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_uboot_1fc00 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
&usb0 {
diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts b/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts
index fb9fb12b6b..0d8654b18c 100644
--- a/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts
@@ -132,10 +132,20 @@
reg = <0x020000 0x7d0000>;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -158,9 +168,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_uboot_1fc00 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
&usb0 {
diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
index 676f8adf1f..ff1cff9384 100644
--- a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
@@ -126,7 +126,7 @@
reg = <0x020000 0x730000>;
};
- info: partition at 750000 {
+ partition at 750000 {
label = "info";
reg = <0x750000 0x010000>;
read-only;
@@ -150,7 +150,7 @@
read-only;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
@@ -160,6 +160,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -185,9 +189,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_info_8 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
&pcie0 {
diff --git a/target/linux/ath79/dts/qca9531_wallys_dr531.dts b/target/linux/ath79/dts/qca9531_wallys_dr531.dts
index 9e90f99728..d16c82666e 100644
--- a/target/linux/ath79/dts/qca9531_wallys_dr531.dts
+++ b/target/linux/ath79/dts/qca9531_wallys_dr531.dts
@@ -147,10 +147,20 @@
reg = <0x050000 0x7a0000>;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -167,5 +177,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9531_yuncore_a770.dts b/target/linux/ath79/dts/qca9531_yuncore_a770.dts
index 4ad19fe600..203a192f16 100644
--- a/target/linux/ath79/dts/qca9531_yuncore_a770.dts
+++ b/target/linux/ath79/dts/qca9531_yuncore_a770.dts
@@ -88,7 +88,7 @@
reg = <0x050000 0xfa0000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -106,6 +106,10 @@
reg = <0x6 0x6>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -143,5 +147,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts b/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts
index e4b6f5fc68..8331ec7247 100644
--- a/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts
+++ b/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts
@@ -112,7 +112,7 @@
read-only;
};
- art: partition at 10000 {
+ partition at 10000 {
label = "art";
reg = <0x010000 0x010000>;
read-only;
@@ -130,6 +130,10 @@
reg = <0x6 0x6>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
macaddr_art_1002: macaddr at 1002 {
reg = <0x1002 0x6>;
};
@@ -172,7 +176,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_art_6>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_6>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9533_dlink_dap-13xx.dtsi b/target/linux/ath79/dts/qca9533_dlink_dap-13xx.dtsi
index d5609f7af1..0364cf2cd7 100644
--- a/target/linux/ath79/dts/qca9533_dlink_dap-13xx.dtsi
+++ b/target/linux/ath79/dts/qca9533_dlink_dap-13xx.dtsi
@@ -86,10 +86,20 @@
read-only;
};
- art: partition at 10000 {
+ partition at 10000 {
label = "art";
reg = <0x10000 0x10000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
partition at 20000 {
@@ -120,5 +130,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi b/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi
index c78f52152d..bd43ccad79 100644
--- a/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi
+++ b/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi
@@ -122,7 +122,7 @@
reg = <0x8c0000 0x700000>;
};
- art: partition at fc0000 {
+ partition at fc0000 {
label = "ART";
reg = <0xfc0000 0x040000>;
read-only;
@@ -141,6 +141,10 @@
macaddr_art_6: macaddr at 6 {
reg = <0x6 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
};
@@ -169,7 +173,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_art_0 2>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_0 2>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi b/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi
index 010b752995..07edeed806 100644
--- a/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi
+++ b/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi
@@ -104,7 +104,7 @@
reg = <0x8c0000 0x700000>;
};
- art: partition at fc0000 {
+ partition at fc0000 {
label = "ART";
reg = <0xfc0000 0x040000>;
read-only;
@@ -119,6 +119,10 @@
reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
};
@@ -147,7 +151,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_art_0 2>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_0 2>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9533_qca_ap143-16m.dts b/target/linux/ath79/dts/qca9533_qca_ap143-16m.dts
index ce59e8a54b..c227d679e6 100644
--- a/target/linux/ath79/dts/qca9533_qca_ap143-16m.dts
+++ b/target/linux/ath79/dts/qca9533_qca_ap143-16m.dts
@@ -41,7 +41,7 @@
reg = <0xe90000 0x160000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -58,6 +58,10 @@
macaddr_art_6: macaddr at 6 {
reg = <0x6 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
};
@@ -73,5 +77,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9533_qca_ap143-8m.dts b/target/linux/ath79/dts/qca9533_qca_ap143-8m.dts
index f04885e47d..5a6977efdc 100644
--- a/target/linux/ath79/dts/qca9533_qca_ap143-8m.dts
+++ b/target/linux/ath79/dts/qca9533_qca_ap143-8m.dts
@@ -41,7 +41,7 @@
reg = <0x690000 0x160000>;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
@@ -58,6 +58,10 @@
macaddr_art_6: macaddr at 6 {
reg = <0x6 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
};
@@ -73,5 +77,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi b/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
index f17dd513e2..d3b323e8c5 100644
--- a/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
@@ -102,10 +102,20 @@
read-only;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -123,7 +133,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_info_8>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi
index 7bad615a6c..377c37cc20 100644
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi
@@ -101,10 +101,20 @@
reg = <0x020000 0x3d0000>;
};
- art: partition at 3f0000 {
+ partition at 3f0000 {
label = "art";
reg = <0x3f0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -126,7 +136,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_uboot_1fc00>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts
index f1cdde13a2..bec3a47aa0 100644
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts
@@ -147,10 +147,20 @@
read-only;
};
- art: partition at 3f0000 {
+ partition at 3f0000 {
label = "art";
reg = <0x3f0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -172,7 +182,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_info_8>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
index b2d525acb7..0a585c0d73 100644
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
@@ -71,10 +71,20 @@
compatible = "tplink,firmware";
};
- art: partition at 3f0000 {
+ partition at 3f0000 {
label = "art";
reg = <0x3f0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -96,7 +106,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_uboot_1fc00 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
index 9487e67e99..29633865b6 100644
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
@@ -109,10 +109,20 @@
reg = <0x020000 0x3d0000>;
};
- art: partition at 3f0000 {
+ partition at 3f0000 {
label = "art";
reg = <0x3f0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -135,7 +145,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_uboot_1fc00 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr841hp-v3.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wr841hp-v3.dts
index d6768e1af2..c931e62607 100644
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr841hp-v3.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841hp-v3.dts
@@ -134,10 +134,20 @@
reg = <0x020000 0x7d0000>;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -160,7 +170,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_uboot_1fc00 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
index 4d4acd202c..59863fd52c 100644
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
@@ -145,10 +145,20 @@
reg = <0x020000 0xfd0000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -171,7 +181,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_uboot_1fc00 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts b/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts
index c5d6e66c9a..b6e6fc91df 100644
--- a/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts
+++ b/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts
@@ -62,7 +62,7 @@
read-only;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -79,6 +79,10 @@
macaddr_art_6: macaddr at 6 {
reg = <0x6 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
};
@@ -105,5 +109,7 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9533_yuncore_a930.dts b/target/linux/ath79/dts/qca9533_yuncore_a930.dts
index 30b340768f..518d88e62c 100644
--- a/target/linux/ath79/dts/qca9533_yuncore_a930.dts
+++ b/target/linux/ath79/dts/qca9533_yuncore_a930.dts
@@ -75,7 +75,7 @@
reg = <0x050000 0xfa0000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -92,6 +92,10 @@
macaddr_art_6: macaddr at 6 {
reg = <0x6 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
};
@@ -114,5 +118,7 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
index e3b35b810d..3038588370 100644
--- a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
+++ b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
@@ -88,10 +88,20 @@
reg = <0x020000 0x7d0000>;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -114,7 +124,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_uboot_1fc00 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9550_airtight_c-75.dts b/target/linux/ath79/dts/qca9550_airtight_c-75.dts
index 6ade40bfe1..ad19bab4e2 100644
--- a/target/linux/ath79/dts/qca9550_airtight_c-75.dts
+++ b/target/linux/ath79/dts/qca9550_airtight_c-75.dts
@@ -150,7 +150,7 @@
reg = <0x060000 0xf90000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -167,6 +167,10 @@
macaddr_art_6: macaddr at 6 {
reg = <0x6 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
};
@@ -201,5 +205,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9557_8dev_rambutan.dts b/target/linux/ath79/dts/qca9557_8dev_rambutan.dts
index f01ac7fc91..c71bc7ed9f 100644
--- a/target/linux/ath79/dts/qca9557_8dev_rambutan.dts
+++ b/target/linux/ath79/dts/qca9557_8dev_rambutan.dts
@@ -41,7 +41,7 @@
reg = <0x300000 0x200000>;
};
- art: partition at 500000 {
+ partition at 500000 {
label = "art";
reg = <0x500000 0x100000>;
read-only;
@@ -58,6 +58,10 @@
macaddr_art_6: macaddr at 6 {
reg = <0x6 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
@@ -111,7 +115,9 @@
status = "okay";
gpio-controller;
- mtd-cal-data = <&art 0x1000>;
+
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
&pcie0 {
diff --git a/target/linux/ath79/dts/qca9557_araknis_an-500-ap-i-ac.dts b/target/linux/ath79/dts/qca9557_araknis_an-500-ap-i-ac.dts
index 8cf1f00255..46b3640073 100644
--- a/target/linux/ath79/dts/qca9557_araknis_an-500-ap-i-ac.dts
+++ b/target/linux/ath79/dts/qca9557_araknis_an-500-ap-i-ac.dts
@@ -58,7 +58,7 @@
};
&partitions {
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -74,6 +74,10 @@
#nvmem-cell-cells = <1>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -106,10 +110,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_art_0 1>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_0 1>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
&pcie0 {
diff --git a/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts b/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts
index 33fc3f1a07..4372a07d51 100644
--- a/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts
+++ b/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts
@@ -86,7 +86,7 @@
reg = <0x030000 0x010000>;
};
- art: partition at 40000 {
+ partition at 40000 {
label = "art";
reg = <0x040000 0x010000>;
read-only;
@@ -96,6 +96,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
diff --git a/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts b/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts
index c6620969d1..5aaaacef6c 100644
--- a/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts
+++ b/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts
@@ -82,7 +82,7 @@
};
&partitions {
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -98,6 +98,10 @@
#nvmem-cell-cells = <1>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -108,9 +112,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_art_0 1>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_0 1>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
&pcie0 {
diff --git a/target/linux/ath79/dts/qca9558_araknis_an-700-ap-i-ac.dts b/target/linux/ath79/dts/qca9558_araknis_an-700-ap-i-ac.dts
index 3906b82776..fb2187be1f 100644
--- a/target/linux/ath79/dts/qca9558_araknis_an-700-ap-i-ac.dts
+++ b/target/linux/ath79/dts/qca9558_araknis_an-700-ap-i-ac.dts
@@ -58,7 +58,7 @@
};
&partitions {
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -74,6 +74,10 @@
#nvmem-cell-cells = <1>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -106,9 +110,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_art_0 1>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_0 1>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
&pcie0 {
diff --git a/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi b/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
index 9048fd3e2f..cd84e568d9 100644
--- a/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
+++ b/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
@@ -152,7 +152,7 @@
reg = <0xe80000 0x170000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
@@ -166,6 +166,10 @@
reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
};
@@ -230,5 +234,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts b/target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts
index b9c161d9a8..afe97df6d4 100644
--- a/target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts
+++ b/target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts
@@ -82,7 +82,7 @@
read-only;
};
- art: partition at 40000 {
+ partition at 40000 {
label = "art";
reg = <0x040000 0x010000>;
read-only;
@@ -98,6 +98,10 @@
#nvmem-cell-cells = <1>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -151,7 +155,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_art_0 10>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_0 10>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v1.dts b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v1.dts
index 2e6f86b0b2..d00c4f7e98 100644
--- a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v1.dts
+++ b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v1.dts
@@ -35,7 +35,7 @@
read-only;
};
- art: partition at 20000 {
+ partition at 20000 {
label = "art";
reg = <0x020000 0x010000>;
read-only;
@@ -57,6 +57,10 @@
reg = <0x18 0x6>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -89,8 +93,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_art_18>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_18>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v2.dts b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v2.dts
index a4aa4118fa..fb46f4db50 100644
--- a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v2.dts
+++ b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v2.dts
@@ -37,7 +37,7 @@
read-only;
};
- art: partition at 40000 {
+ partition at 40000 {
label = "art";
reg = <0x040000 0x010000>;
read-only;
@@ -59,6 +59,10 @@
reg = <0x18 0x6>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -91,8 +95,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_art_18>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_18>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9558_compex_wpj558-16m.dts b/target/linux/ath79/dts/qca9558_compex_wpj558-16m.dts
index d6ecc7728f..e63c3e842d 100644
--- a/target/linux/ath79/dts/qca9558_compex_wpj558-16m.dts
+++ b/target/linux/ath79/dts/qca9558_compex_wpj558-16m.dts
@@ -94,10 +94,20 @@
reg = <0x030000 0xfc0000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -135,7 +145,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
&pcie0 {
diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
index 9fea258970..63d4a75e61 100644
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
@@ -72,7 +72,7 @@
read-only;
};
- art: partition at 50000 {
+ partition at 50000 {
label = "art";
reg = <0x050000 0x010000>;
read-only;
@@ -88,6 +88,10 @@
#nvmem-cell-cells = <1>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -136,7 +140,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_art_0 (-2)>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_0 (-2)>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts b/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts
index 765cfafe15..7b1ccf410d 100644
--- a/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts
+++ b/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts
@@ -120,7 +120,7 @@
reg = <0x50000 0xfa0000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x10000>;
read-only;
@@ -146,6 +146,10 @@
reg = <0x12 0x6>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -219,7 +223,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_art_c>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_c>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
index 333b52f4d9..a8c1e75d8d 100644
--- a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
+++ b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
@@ -137,7 +137,7 @@
reg = <0xfd0000 0x20000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -158,6 +158,10 @@
macaddr_art_c: macaddr at c {
reg = <0xc 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
};
@@ -209,7 +213,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_art_c>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_c>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9558_ocedo_koala.dts b/target/linux/ath79/dts/qca9558_ocedo_koala.dts
index 891bdd95c4..1341593117 100644
--- a/target/linux/ath79/dts/qca9558_ocedo_koala.dts
+++ b/target/linux/ath79/dts/qca9558_ocedo_koala.dts
@@ -111,7 +111,7 @@
read-only;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -133,6 +133,10 @@
reg = <0xc 0x6>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -145,9 +149,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_art_6>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_6>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
&mdio0 {
diff --git a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts
index 8ddeccefb7..5cdf22ac7b 100644
--- a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts
+++ b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts
@@ -80,7 +80,7 @@
read-only;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -106,6 +106,10 @@
reg = <0x12 0x6>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -118,9 +122,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_art_6>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_6>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
&mdio0 {
diff --git a/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi b/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi
index e908c26c0d..8cd27e01cc 100644
--- a/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi
+++ b/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi
@@ -110,7 +110,7 @@
reg = <0x850000 0x7a0000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "ART";
reg = <0xff0000 0x010000>;
read-only;
@@ -130,6 +130,10 @@
reg = <0x6 0x6>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -193,9 +197,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_art_0 2>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_0 2>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
&pcie0 {
diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi b/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
index 03f2999083..d4087d511f 100644
--- a/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
+++ b/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
@@ -119,7 +119,7 @@
reg = <0x850000 0x7a0000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "ART";
reg = <0xff0000 0x010000>;
read-only;
@@ -135,6 +135,10 @@
#nvmem-cell-cells = <1>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -174,9 +178,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_art_0 1>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_0 1>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
&pcie0 {
diff --git a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts
index 8fd35a99d4..838aa1f0b8 100644
--- a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts
+++ b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts
@@ -129,7 +129,7 @@
reg = <0x850000 0x7a0000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "ART";
reg = <0xff0000 0x010000>;
read-only;
@@ -149,6 +149,10 @@
reg = <0x6 0x6>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -212,9 +216,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_art_0 2>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_0 2>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
&pcie1 {
diff --git a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
index 2e27d3d6ee..9c5b70a606 100644
--- a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
+++ b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
@@ -164,7 +164,7 @@
reg = <0x850000 0x7a0000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "ART";
reg = <0xff0000 0x010000>;
read-only;
@@ -184,6 +184,10 @@
reg = <0x6 0x6>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -251,7 +255,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_art_0 2>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_0 2>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi b/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi
index 9cbdca234d..16308395e4 100644
--- a/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi
+++ b/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi
@@ -105,10 +105,20 @@
};
};
- art: partition at 60000 {
+ partition at 60000 {
label = "art";
reg = <0x060000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -178,5 +188,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9558_sophos_ap.dtsi b/target/linux/ath79/dts/qca9558_sophos_ap.dtsi
index 92e89ff3aa..744871a931 100644
--- a/target/linux/ath79/dts/qca9558_sophos_ap.dtsi
+++ b/target/linux/ath79/dts/qca9558_sophos_ap.dtsi
@@ -107,7 +107,7 @@
reg = <0x040000 0x010000>;
};
- art: partition at 50000 {
+ partition at 50000 {
label = "art";
reg = <0x050000 0x010000>;
read-only;
@@ -117,13 +117,17 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
};
};
- config: partition at 60000 {
+ partition at 60000 {
label = "config";
reg = <0x060000 0x010000>;
read-only;
@@ -184,7 +188,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
&usb0 {
diff --git a/target/linux/ath79/dts/qca9558_sophos_ap15.dts b/target/linux/ath79/dts/qca9558_sophos_ap15.dts
index 5801303040..7949d3e88f 100644
--- a/target/linux/ath79/dts/qca9558_sophos_ap15.dts
+++ b/target/linux/ath79/dts/qca9558_sophos_ap15.dts
@@ -75,7 +75,7 @@
reg = <0x040000 0x010000>;
};
- art: partition at 50000 {
+ partition at 50000 {
label = "art";
reg = <0x050000 0x010000>;
read-only;
@@ -85,13 +85,17 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
};
};
- config: partition at 60000 {
+ partition at 60000 {
label = "config";
reg = <0x060000 0x010000>;
read-only;
@@ -154,5 +158,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts b/target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts
index 584a66ba52..17af5cb27e 100644
--- a/target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts
@@ -29,7 +29,7 @@
};
&mtdparts {
- uboot: partition at 0 {
+ partition at 0 {
label = "u-boot";
reg = <0x000000 0x020000>;
read-only;
@@ -53,7 +53,7 @@
compatible = "tplink,firmware";
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -63,6 +63,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -90,8 +94,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_uboot_1fc00 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-d7-v1.dts b/target/linux/ath79/dts/qca9558_tplink_archer-d7-v1.dts
index 20cefe0b79..0ddf23f354 100644
--- a/target/linux/ath79/dts/qca9558_tplink_archer-d7-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-d7-v1.dts
@@ -57,7 +57,7 @@
read-only;
};
- romfs: partition at fd0000 {
+ partition at fd0000 {
label = "romfs";
reg = <0xfd0000 0x010000>;
read-only;
@@ -81,7 +81,7 @@
read-only;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -91,6 +91,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -111,7 +115,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_romfs_f100 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_romfs_f100 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-d7b-v1.dts b/target/linux/ath79/dts/qca9558_tplink_archer-d7b-v1.dts
index 3418601c41..fd47f7fee3 100644
--- a/target/linux/ath79/dts/qca9558_tplink_archer-d7b-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-d7b-v1.dts
@@ -51,7 +51,7 @@
read-only;
};
- romfs: partition at fd0000 {
+ partition at fd0000 {
label = "romfs";
reg = <0xfd0000 0x010000>;
read-only;
@@ -75,7 +75,7 @@
read-only;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -85,6 +85,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -105,7 +109,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_romfs_f100 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_romfs_f100 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
index a3fb9b22d2..becd5cc44b 100644
--- a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
@@ -157,7 +157,7 @@
read-only;
};
- info: partition at da0000 {
+ partition at da0000 {
label = "info";
reg = <0xda0000 0x020000>;
read-only;
@@ -181,7 +181,7 @@
read-only;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -191,6 +191,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -203,7 +207,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_info_8 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
index 3061ae07c7..3857635672 100644
--- a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
@@ -142,7 +142,7 @@
read-only;
};
- info: partition at 610000 {
+ partition at 610000 {
label = "info";
reg = <0x610000 0x020000>;
read-only;
@@ -166,7 +166,7 @@
read-only;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
@@ -176,6 +176,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -198,7 +202,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_info_8 (-1)>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8 (-1)>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wdr7500-v3.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wdr7500-v3.dts
index 33697d3b83..0e09b5aa09 100644
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wdr7500-v3.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wdr7500-v3.dts
@@ -29,7 +29,7 @@
};
&mtdparts {
- uboot: partition at 0 {
+ partition at 0 {
label = "u-boot";
reg = <0x000000 0x020000>;
read-only;
@@ -53,7 +53,7 @@
reg = <0x020000 0x7d0000>;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
@@ -63,6 +63,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -90,8 +94,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_uboot_1fc00 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
index a72b6e6050..49af23bf02 100644
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
@@ -121,10 +121,20 @@
reg = <0x020000 0x7d0000>;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -175,7 +185,7 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_uboot_1fc00 0>;
- nvmem-cell-names = "mac-address";
+
+ nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts
index f51b89206d..3f8256ba17 100644
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts
@@ -94,10 +94,20 @@
reg = <0x020000 0x3d0000>;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x3f0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -125,7 +135,7 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_uboot_1fc00>;
- nvmem-cell-names = "mac-address";
+
+ nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts b/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts
index 23b484cdf5..d2e381eb4b 100644
--- a/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts
+++ b/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts
@@ -135,10 +135,20 @@
read-only;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -185,5 +195,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9558_watchguard_ap300.dts b/target/linux/ath79/dts/qca9558_watchguard_ap300.dts
index e3431330de..043f8dd262 100644
--- a/target/linux/ath79/dts/qca9558_watchguard_ap300.dts
+++ b/target/linux/ath79/dts/qca9558_watchguard_ap300.dts
@@ -102,7 +102,7 @@
reg = <0xff0000 0x1000000>;
};
- art: partition at 1ff0000 {
+ partition at 1ff0000 {
label = "art";
reg = <0x1ff0000 0x010000>;
read-only;
@@ -118,6 +118,10 @@
#nvmem-cell-cells = <1>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -132,10 +136,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_art_0 1>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_0 1>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
&pcie0 {
diff --git a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
index 76ae8a99a6..19f1245022 100644
--- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
+++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
@@ -96,18 +96,18 @@
#address-cells = <1>;
#size-cells = <1>;
- uboot: partition at 0 {
+ partition at 0 {
label = "u-boot";
reg = <0x000000 0x040000>;
read-only;
};
- uboot_env: partition at 40000 {
+ partition at 40000 {
label = "u-boot-env";
reg = <0x040000 0x010000>;
};
- art: partition at 50000 {
+ partition at 50000 {
label = "art";
reg = <0x050000 0x010000>;
read-only;
@@ -117,6 +117,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
diff --git a/target/linux/ath79/dts/qca955x_zyxel_nbg6x16.dtsi b/target/linux/ath79/dts/qca955x_zyxel_nbg6x16.dtsi
index 7de1c4fa69..3cbb305aad 100644
--- a/target/linux/ath79/dts/qca955x_zyxel_nbg6x16.dtsi
+++ b/target/linux/ath79/dts/qca955x_zyxel_nbg6x16.dtsi
@@ -103,7 +103,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
&usb_phy0 {
diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
index 97e9ebf0b6..e4d9b99a60 100644
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
@@ -147,13 +147,13 @@
reg = <0x030000 0x7a0000>;
};
- config: partition at 7d0000 {
+ partition at 7d0000 {
label = "config";
reg = <0x7d0000 0x010000>;
read-only;
};
- info: partition at 7e0000 {
+ partition at 7e0000 {
label = "info";
reg = <0x7e0000 0x010000>;
read-only;
@@ -171,7 +171,7 @@
};
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
@@ -181,6 +181,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -220,7 +224,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_info_8 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c58-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c58-v1.dts
index 95af751784..33ef672f45 100644
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c58-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c58-v1.dts
@@ -39,7 +39,7 @@
read-only;
};
- info: partition at 10000 {
+ partition at 10000 {
label = "info";
reg = <0x010000 0x010000>;
read-only;
@@ -69,7 +69,7 @@
read-only;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
@@ -79,6 +79,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
precal_art_5000: pre-calibration at 5000 {
reg = <0x5000 0x2f20>;
};
@@ -99,8 +103,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_info_8 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts
index e8b282b9c2..4e6e90a8c3 100644
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts
@@ -59,7 +59,7 @@
read-only;
};
- info: partition at 10000 {
+ partition at 10000 {
label = "info";
reg = <0x010000 0x010000>;
read-only;
@@ -89,7 +89,7 @@
read-only;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -99,6 +99,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
precal_art_5000: pre-calibration at 5000 {
reg = <0x5000 0x2f20>;
};
@@ -119,8 +123,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_info_8 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts
index 8a93d2b3b1..094ef7090f 100644
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts
@@ -62,7 +62,7 @@
read-only;
};
- info: partition at 30000 {
+ partition at 30000 {
label = "info";
reg = <0x030000 0x010000>;
read-only;
@@ -92,7 +92,7 @@
read-only;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -102,6 +102,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
precal_art_5000: pre-calibration at 5000 {
reg = <0x5000 0x2f20>;
};
@@ -122,8 +126,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_info_8 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts
index eb21394d04..b64f8c7cec 100644
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts
@@ -55,7 +55,7 @@
read-only;
};
- info: partition at 10000 {
+ partition at 10000 {
label = "info";
reg = <0x010000 0x010000>;
read-only;
@@ -85,7 +85,7 @@
read-only;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
@@ -95,6 +95,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
precal_art_5000: pre-calibration at 5000 {
reg = <0x5000 0x2f20>;
};
@@ -115,8 +119,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_info_8 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts
index aa4a7da10c..34fe10cb51 100644
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts
@@ -55,7 +55,7 @@
read-only;
};
- info: partition at 1fb00 {
+ partition at 1fb00 {
label = "info";
reg = <0x01fb00 0x000500>;
read-only;
@@ -91,7 +91,7 @@
read-only;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
@@ -101,6 +101,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
precal_art_5000: pre-calibration at 5000 {
reg = <0x5000 0x2f20>;
};
@@ -121,8 +125,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_info_8 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts
index ede6878d5c..d50b3af018 100644
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts
@@ -49,7 +49,7 @@
read-only;
};
- info: partition at 1fb00 {
+ partition at 1fb00 {
label = "info";
reg = <0x01fb00 0x000500>;
read-only;
@@ -85,7 +85,7 @@
read-only;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
@@ -95,6 +95,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
precal_art_5000: pre-calibration at 5000 {
reg = <0x5000 0x2f20>;
};
@@ -115,8 +119,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_info_8 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts b/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
index 5f9f575b44..b9aee571c9 100644
--- a/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
+++ b/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
@@ -89,7 +89,7 @@
read-only;
};
- art: partition at 60000 {
+ partition at 60000 {
label = "art";
reg = <0x60000 0x10000>;
read-only;
@@ -108,6 +108,10 @@
macaddr_art_6: macaddr at 6 {
reg = <0x6 0x6>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
@@ -150,7 +154,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_art_0 1>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_0 1>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts b/target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts
index ebcaeb6ddc..9fca52bf33 100644
--- a/target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts
+++ b/target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts
@@ -90,7 +90,7 @@
read-only;
};
- art: partition at 40000 {
+ partition at 40000 {
label = "art";
reg = <0x040000 0x010000>;
read-only;
@@ -106,6 +106,10 @@
#nvmem-cell-cells = <1>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
precal_art_5000: pre-calibration at 5000 {
reg = <0x5000 0x2f20>;
};
@@ -156,7 +160,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_art_0 10>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_art_0 10>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9563_compex_wpj563.dts b/target/linux/ath79/dts/qca9563_compex_wpj563.dts
index 95ca900398..dc449d8214 100644
--- a/target/linux/ath79/dts/qca9563_compex_wpj563.dts
+++ b/target/linux/ath79/dts/qca9563_compex_wpj563.dts
@@ -97,10 +97,20 @@
reg = <0x030000 0xfc0000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -151,5 +161,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi
index 0624d88d8a..3244b499c4 100644
--- a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi
+++ b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi
@@ -93,7 +93,7 @@
reg = <0x040000 0x010000>;
};
- art: partition at 50000 {
+ partition at 50000 {
label = "art";
reg = <0x050000 0x010000>;
read-only;
@@ -112,6 +112,10 @@
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
};
};
@@ -197,5 +201,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9563_phicomm_k2t.dts b/target/linux/ath79/dts/qca9563_phicomm_k2t.dts
index 614d88d383..e3d20df5f6 100644
--- a/target/linux/ath79/dts/qca9563_phicomm_k2t.dts
+++ b/target/linux/ath79/dts/qca9563_phicomm_k2t.dts
@@ -98,7 +98,7 @@
reg = <0x090000 0xf60000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -108,6 +108,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
precal_art_5000: pre-calibration at 5000 {
reg = <0x5000 0x2f20>;
};
@@ -147,5 +151,7 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi b/target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi
index a0e6489918..90f6d1a494 100644
--- a/target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi
+++ b/target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi
@@ -87,7 +87,7 @@
read-only;
};
- pridata: partition at 50000 {
+ partition at 50000 {
label = "pri-data";
reg = <0x050000 0x010000>;
read-only;
@@ -103,7 +103,7 @@
};
};
- art: partition at 60000 {
+ partition at 60000 {
label = "art";
reg = <0x060000 0x010000>;
read-only;
@@ -113,6 +113,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -168,5 +172,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9563_rosinson_wr818.dts b/target/linux/ath79/dts/qca9563_rosinson_wr818.dts
index 6e45a20aae..0f07613d1f 100644
--- a/target/linux/ath79/dts/qca9563_rosinson_wr818.dts
+++ b/target/linux/ath79/dts/qca9563_rosinson_wr818.dts
@@ -90,10 +90,20 @@
reg = <0x060000 0xf80000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -125,7 +135,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
&usb_phy0 {
diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-a7-v5.dts b/target/linux/ath79/dts/qca9563_tplink_archer-a7-v5.dts
index 50996e06c7..80874b143f 100644
--- a/target/linux/ath79/dts/qca9563_tplink_archer-a7-v5.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-a7-v5.dts
@@ -27,7 +27,7 @@
read-only;
};
- uboot: partition at 20000 {
+ partition at 20000 {
label = "u-boot";
reg = <0x020000 0x020000>;
read-only;
@@ -39,7 +39,7 @@
compatible = "denx,uimage";
};
- info: partition at f40000 {
+ partition at f40000 {
label = "info";
reg = <0xf40000 0x020000>;
read-only;
@@ -57,7 +57,7 @@
};
};
- config: partition at f60000 {
+ partition at f60000 {
label = "config";
reg = <0xf60000 0x050000>;
read-only;
@@ -69,7 +69,7 @@
read-only;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -79,6 +79,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -101,8 +105,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_info_8 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts
index 907eda9400..4006a0231c 100644
--- a/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts
@@ -127,7 +127,7 @@
compatible = "denx,uimage";
};
- info: partition at 7e0000 {
+ partition at 7e0000 {
label = "info";
reg = <0x7e0000 0x010000>;
read-only;
@@ -145,7 +145,7 @@
};
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
@@ -155,6 +155,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -202,7 +206,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_info_8 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2-us.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2-us.dts
index f78a52a120..74ac0f745a 100644
--- a/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2-us.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2-us.dts
@@ -111,7 +111,7 @@
read-only;
};
- info: partition at 20000 {
+ partition at 20000 {
label = "info";
reg = <0x020000 0x010000>;
read-only;
@@ -147,7 +147,7 @@
read-only;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -157,6 +157,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
precal_art_5000: pre-calibration at 5000 {
reg = <0x5000 0x2f20>;
};
@@ -172,8 +176,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_info_8 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2.dts
index fc7814a97e..66ae2d1ffd 100644
--- a/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2.dts
@@ -111,7 +111,7 @@
read-only;
};
- info: partition at 20000 {
+ partition at 20000 {
label = "info";
reg = <0x020000 0x010000>;
read-only;
@@ -141,7 +141,7 @@
read-only;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
@@ -151,6 +151,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
precal_art_5000: pre-calibration at 5000 {
reg = <0x5000 0x2f20>;
};
@@ -166,8 +170,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_info_8 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts
index 611cb8953e..05dd95474e 100644
--- a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts
@@ -205,7 +205,7 @@
compatible = "denx,uimage";
};
- info: partition at f00000 {
+ partition at f00000 {
label = "info";
reg = <0xf00000 0x0f0000>;
read-only;
@@ -223,7 +223,7 @@
};
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -233,6 +233,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -272,7 +276,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_info_8 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v5.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v5.dts
index d37fc14b11..89b2244ca8 100644
--- a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v5.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v5.dts
@@ -39,7 +39,7 @@
read-only;
};
- art: partition at 50000 {
+ partition at 50000 {
label = "art";
reg = <0x050000 0x010000>;
read-only;
@@ -49,13 +49,17 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
};
};
- info: partition at 60000 {
+ partition at 60000 {
label = "info";
reg = <0x060000 0x020000>;
read-only;
@@ -109,8 +113,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_info_8 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9563_tplink_deco-m4r-v1.dts b/target/linux/ath79/dts/qca9563_tplink_deco-m4r-v1.dts
index 7968bdbf6d..088ef7b63c 100644
--- a/target/linux/ath79/dts/qca9563_tplink_deco-m4r-v1.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_deco-m4r-v1.dts
@@ -93,7 +93,7 @@
#address-cells = <1>;
#size-cells = <1>;
- uboot: partition at 0 {
+ partition at 0 {
label = "u-boot";
reg = <0x000000 0x080000>;
read-only;
@@ -111,7 +111,7 @@
read-only;
};
- config: partition at e85000 {
+ partition at e85000 {
label = "config";
reg = <0xe85000 0x16b000>;
read-only;
@@ -129,7 +129,7 @@
};
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -139,6 +139,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
precal_art_5000: pre-calibration at 5000 {
reg = <0x5000 0x2f20>;
};
@@ -161,7 +165,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_config_8 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_config_8 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts b/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts
index 25a7b8229b..43f9106a49 100644
--- a/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts
@@ -30,7 +30,7 @@
read-only;
};
- info: partition at 610000 {
+ partition at 610000 {
label = "info";
reg = <0x610000 0x020000>;
read-only;
@@ -54,7 +54,7 @@
read-only;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
@@ -64,6 +64,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -86,8 +90,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_info_8 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9563_tplink_re450-v3.dts b/target/linux/ath79/dts/qca9563_tplink_re450-v3.dts
index 2572901def..5d23a1d972 100644
--- a/target/linux/ath79/dts/qca9563_tplink_re450-v3.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_re450-v3.dts
@@ -18,7 +18,7 @@
read-only;
};
- info: partition at 20000 {
+ partition at 20000 {
label = "info";
reg = <0x020000 0x002000>;
read-only;
@@ -60,7 +60,7 @@
reg = <0x050000 0x7a0000>;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
@@ -70,6 +70,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -92,8 +96,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_info_8 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9563_tplink_re455-v1.dts b/target/linux/ath79/dts/qca9563_tplink_re455-v1.dts
index 7caa356861..b22d2bfa35 100644
--- a/target/linux/ath79/dts/qca9563_tplink_re455-v1.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_re455-v1.dts
@@ -18,7 +18,7 @@
read-only;
};
- info: partition at 20000 {
+ partition at 20000 {
label = "info";
reg = <0x020000 0x002000>;
read-only;
@@ -60,7 +60,7 @@
reg = <0x050000 0x7a0000>;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
@@ -70,6 +70,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -92,8 +96,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_info_8 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wa1201-v2.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wa1201-v2.dts
index b1d564be15..50e4445707 100644
--- a/target/linux/ath79/dts/qca9563_tplink_tl-wa1201-v2.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wa1201-v2.dts
@@ -108,10 +108,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_info_8 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
&spi {
@@ -133,7 +131,7 @@
read-only;
};
- info: partition at 20000 {
+ partition at 20000 {
label = "info";
reg = <0x020000 0x010000>;
read-only;
@@ -163,7 +161,7 @@
read-only;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -173,6 +171,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
precal_art_5000: pre-calibration at 5000 {
reg = <0x5000 0x2f20>;
};
diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630-v1.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630-v1.dts
index a44caa0b6b..fd0d7af328 100644
--- a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630-v1.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630-v1.dts
@@ -12,7 +12,7 @@
};
&partitions {
- uboot: partition at 0 {
+ partition at 0 {
label = "u-boot";
reg = <0x000000 0x010000>;
read-only;
@@ -42,7 +42,7 @@
read-only;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
@@ -52,6 +52,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -74,8 +78,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_uboot_fc00 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_fc00 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-int.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-int.dts
index 1e62094c12..cf83407932 100644
--- a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-int.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-int.dts
@@ -42,7 +42,7 @@
read-only;
};
- info: partition at 7e0000 {
+ partition at 7e0000 {
label = "info";
reg = <0x7e0000 0x010000>;
read-only;
@@ -60,7 +60,7 @@
};
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
@@ -70,6 +70,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
precal_art_5000: pre-calibration at 5000 {
reg = <0x5000 0x2f20>;
};
@@ -92,8 +96,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_info_8 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.0-eu.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.0-eu.dts
index 5f834542f2..25ad244eea 100644
--- a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.0-eu.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.0-eu.dts
@@ -36,7 +36,7 @@
read-only;
};
- info: partition at 630000 {
+ partition at 630000 {
label = "info";
reg = <0x630000 0x010000>;
read-only;
@@ -60,7 +60,7 @@
read-only;
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
@@ -70,6 +70,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
precal_art_5000: pre-calibration at 5000 {
reg = <0x5000 0x2f20>;
};
@@ -92,8 +96,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_info_8 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.1-eu.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.1-eu.dts
index 7be23423df..cb9b9f0fa9 100644
--- a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.1-eu.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.1-eu.dts
@@ -38,7 +38,7 @@
read-only;
};
- info: partition at 7e0000 {
+ partition at 7e0000 {
label = "info";
reg = <0x7e0000 0x010000>;
read-only;
@@ -56,7 +56,7 @@
};
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
@@ -66,6 +66,10 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
precal_art_5000: pre-calibration at 5000 {
reg = <0x5000 0x2f20>;
};
@@ -88,8 +92,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_info_8 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n-v5.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n-v5.dts
index dac0da9fdc..895bd0fc0f 100644
--- a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n-v5.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n-v5.dts
@@ -76,10 +76,20 @@
read-only;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -91,8 +101,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_info_8>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts
index 6db4653f69..39956c5a06 100644
--- a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts
@@ -83,10 +83,20 @@
read-only;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -116,8 +126,6 @@
};
&wmac {
- mtd-cal-data = <&art 0x1000>;
-
- nvmem-cells = <&macaddr_info_8>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_info_8>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
index 48d8d9c83e..961b9faf9f 100644
--- a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
+++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
@@ -93,7 +93,7 @@
read-only;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -107,6 +107,10 @@
reg = <0x0 0x6>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -119,5 +123,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9563_xiaomi_aiot-ac2350.dts b/target/linux/ath79/dts/qca9563_xiaomi_aiot-ac2350.dts
index 27e3436f8f..cff567e497 100644
--- a/target/linux/ath79/dts/qca9563_xiaomi_aiot-ac2350.dts
+++ b/target/linux/ath79/dts/qca9563_xiaomi_aiot-ac2350.dts
@@ -108,7 +108,7 @@
read-only;
};
- art: partition at 60000 {
+ partition at 60000 {
label = "art";
reg = <0x60000 0x10000>;
read-only;
@@ -122,6 +122,10 @@
reg = <0x0 0x6>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
precal_art_5000: pre-calibration at 5000 {
reg = <0x5000 0x2f20>;
};
@@ -185,7 +189,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
&pcie {
diff --git a/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi b/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi
index 2cc227a2da..82a22ca5dc 100644
--- a/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi
+++ b/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi
@@ -92,7 +92,7 @@
reg = <0x050000 0xfa0000>;
};
- art: partition at ff0000 {
+ partition at ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
@@ -106,6 +106,10 @@
reg = <0x0 0x6>;
};
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+
cal_art_5000: calibration at 5000 {
reg = <0x5000 0x844>;
};
@@ -122,5 +126,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
+ nvmem-cells = <&cal_art_1000>;
+ nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wr941hp-v1.dts b/target/linux/ath79/dts/tp9343_tplink_tl-wr941hp-v1.dts
index aaca7fa531..04aa4bc5f9 100644
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wr941hp-v1.dts
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wr941hp-v1.dts
@@ -140,10 +140,20 @@
};
};
- art: partition at 7f0000 {
+ partition at 7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -168,7 +178,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_config_8 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_config_8 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi b/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi
index 89dff43405..77c4a88c9f 100644
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi
@@ -48,10 +48,20 @@
reg = <0x020000 0x3d0000>;
};
- art: partition at 3f0000 {
+ partition at 3f0000 {
label = "art";
reg = <0x3f0000 0x010000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cal_art_1000: calibration at 1000 {
+ reg = <0x1000 0x440>;
+ };
+ };
};
};
};
@@ -73,7 +83,6 @@
&wmac {
status = "okay";
- mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_uboot_1fc00 0>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+ nvmem-cell-names = "mac-address", "calibration";
};
More information about the lede-commits
mailing list