ath79: mtd-cal-data removals
authorRosen Penev <rosenp@gmail.com>
Sat, 17 Feb 2024 05:17:20 +0000 (21:17 -0800)
committerHauke Mehrtens <hauke@hauke-m.de>
Sun, 9 Jun 2024 10:24:15 +0000 (12:24 +0200)
Replacement can be done with nvmem.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
164 files changed:
target/linux/ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi
target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts
target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts
target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts
target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi
target/linux/ath79/dts/ar9330_pqi_air-pen.dts
target/linux/ath79/dts/ar9330_ziking_cpe46b.dts
target/linux/ath79/dts/ar9331_8dev_carambola2.dts
target/linux/ath79/dts/ar9331_arduino_yun.dts
target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
target/linux/ath79/dts/ar9331_etactica_eg200.dts
target/linux/ath79/dts/ar9331_glinet_6408.dts
target/linux/ath79/dts/ar9331_glinet_6416.dts
target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts
target/linux/ath79/dts/ar9331_glinet_gl-usb150.dts
target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts
target/linux/ath79/dts/ar9331_hiwifi_hc6361.dts
target/linux/ath79/dts/ar9331_onion_omega.dts
target/linux/ath79/dts/ar9331_pisen_ts-d084.dts
target/linux/ath79/dts/ar9331_pisen_wmm003n.dts
target/linux/ath79/dts/ar9331_teltonika_rut230-v1.dts
target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts
target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi
target/linux/ath79/dts/ar9331_tplink_tl-wr710n-8m.dtsi
target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts
target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts
target/linux/ath79/dts/ar9341_openmesh_om2p-hs.dtsi
target/linux/ath79/dts/ar9341_pcs_cr3000.dts
target/linux/ath79/dts/ar9341_pisen_wmb001n.dts
target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts
target/linux/ath79/dts/ar9341_tplink_tl-wa.dtsi
target/linux/ath79/dts/ar9341_tplink_tl-wr841-v8.dts
target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts
target/linux/ath79/dts/ar9341_tplink_tl-wr941nd-v5.dts
target/linux/ath79/dts/ar9342_ubnt_wa.dtsi
target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts
target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts
target/linux/ath79/dts/ar9344_devolo_dlan_wifi.dtsi
target/linux/ath79/dts/ar9344_openmesh_om5p.dts
target/linux/ath79/dts/ar9344_pcs_cr5000.dts
target/linux/ath79/dts/ar9344_qxwlan_e750x.dtsi
target/linux/ath79/dts/ar9344_samsung_wam250.dts
target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi
target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
target/linux/ath79/dts/ar9344_tplink_tl-wr841hp-v2.dts
target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts
target/linux/ath79/dts/qca9531_8dev_carambola3.dts
target/linux/ath79/dts/qca9531_8dev_lima.dts
target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts
target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
target/linux/ath79/dts/qca9531_comfast_cf-ew71-v2.dts
target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts
target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts
target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts
target/linux/ath79/dts/qca9531_engenius_ews511ap.dts
target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
target/linux/ath79/dts/qca9531_glinet_gl-e750.dts
target/linux/ath79/dts/qca9531_glinet_gl-s200.dtsi
target/linux/ath79/dts/qca9531_glinet_gl-x300b.dts
target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
target/linux/ath79/dts/qca9531_glinet_gl-xe300.dts
target/linux/ath79/dts/qca9531_joyit_jt-or750i.dts
target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi
target/linux/ath79/dts/qca9531_telco_t1.dts
target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts
target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
target/linux/ath79/dts/qca9531_wallys_dr531.dts
target/linux/ath79/dts/qca9531_yuncore_a770.dts
target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts
target/linux/ath79/dts/qca9533_dlink_dap-13xx.dtsi
target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi
target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi
target/linux/ath79/dts/qca9533_qca_ap143-16m.dts
target/linux/ath79/dts/qca9533_qca_ap143-8m.dts
target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi
target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts
target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
target/linux/ath79/dts/qca9533_tplink_tl-wr841hp-v3.dts
target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts
target/linux/ath79/dts/qca9533_yuncore_a930.dts
target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
target/linux/ath79/dts/qca9550_airtight_c-75.dts
target/linux/ath79/dts/qca9557_8dev_rambutan.dts
target/linux/ath79/dts/qca9557_araknis_an-500-ap-i-ac.dts
target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts
target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts
target/linux/ath79/dts/qca9558_araknis_an-700-ap-i-ac.dts
target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts
target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v1.dts
target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v2.dts
target/linux/ath79/dts/qca9558_compex_wpj558-16m.dts
target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
target/linux/ath79/dts/qca9558_domywifi_dw33d.dts
target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
target/linux/ath79/dts/qca9558_ocedo_koala.dts
target/linux/ath79/dts/qca9558_ocedo_ursus.dts
target/linux/ath79/dts/qca9558_openmesh_a60.dtsi
target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts
target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi
target/linux/ath79/dts/qca9558_sophos_ap.dtsi
target/linux/ath79/dts/qca9558_sophos_ap15.dts
target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts
target/linux/ath79/dts/qca9558_tplink_archer-d7-v1.dts
target/linux/ath79/dts/qca9558_tplink_archer-d7b-v1.dts
target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
target/linux/ath79/dts/qca9558_tplink_tl-wdr7500-v3.dts
target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts
target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts
target/linux/ath79/dts/qca9558_watchguard_ap300.dts
target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
target/linux/ath79/dts/qca955x_zyxel_nbg6x16.dtsi
target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
target/linux/ath79/dts/qca9561_tplink_archer-c58-v1.dts
target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts
target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts
target/linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts
target/linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts
target/linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts
target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts
target/linux/ath79/dts/qca9563_compex_wpj563.dts
target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi
target/linux/ath79/dts/qca9563_phicomm_k2t.dts
target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi
target/linux/ath79/dts/qca9563_rosinson_wr818.dts
target/linux/ath79/dts/qca9563_tplink_archer-a7-v5.dts
target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts
target/linux/ath79/dts/qca9563_tplink_archer-c6-v2-us.dts
target/linux/ath79/dts/qca9563_tplink_archer-c6-v2.dts
target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts
target/linux/ath79/dts/qca9563_tplink_archer-c7-v5.dts
target/linux/ath79/dts/qca9563_tplink_deco-m4r-v1.dts
target/linux/ath79/dts/qca9563_tplink_re450-v2.dts
target/linux/ath79/dts/qca9563_tplink_re450-v3.dts
target/linux/ath79/dts/qca9563_tplink_re455-v1.dts
target/linux/ath79/dts/qca9563_tplink_tl-wa1201-v2.dts
target/linux/ath79/dts/qca9563_tplink_tl-wpa8630-v1.dts
target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-int.dts
target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.0-eu.dts
target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.1-eu.dts
target/linux/ath79/dts/qca9563_tplink_tl-wr1043n-v5.dts
target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts
target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
target/linux/ath79/dts/qca9563_xiaomi_aiot-ac2350.dts
target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi
target/linux/ath79/dts/tp9343_tplink_tl-wr941hp-v1.dts
target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi

index 77e7925715a3fcc4c1c3e8b133162fb1f9783756..a82546c1c1395ea52d9db30a777b50ca3baaa2ed 100644 (file)
                                read-only;
                        };
 
-                       art: partition@1fe0000 {
+                       partition@1fe0000 {
                                label = "art";
                                reg = <0x1fe0000 0x020000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_11000: calibration@11000 {
+                                               reg = <0x11000 0x440>;
+                                       };
+
                                        macaddr_art_1120c: macaddr@1120c {
                                                reg = <0x1120c 0x6>;
                                        };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x11000>;
+       nvmem-cells = <&cal_art_11000>;
+       nvmem-cell-names = "calibration";
 };
 
 &uart {
index 75aeb69eb432f87752a32397128dfe9290548ef1..ed4ca5297e7f5cd490d454bfae8217b9bcf4406d 100644 (file)
                                reg = <0x020000 0x3D0000>;
                        };
 
-                       art: partition@3f0000 {
+                       partition@3f0000 {
                                label = "art";
                                reg = <0x3f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &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";
 };
index 7957c438d6a3a7ac855818b9dd4aba5671853b85..8958ddd3a83b3f5178de76cf6ec2760d9cbd592a 100644 (file)
                                reg = <0x020000 0x7D0000>;
                        };
 
-                       art: partition@7F0000 {
+                       partition@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@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &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";
 };
index e786ad2760eeb88baf6c3395c126fd33739d7d85..d3f189479a8b8e0e54a1f63540377a657de9dbd4 100644 (file)
                                reg = <0x020000 0x3d0000>;
                        };
 
-                       art: partition@3f0000 {
+                       partition@3f0000 {
                                label = "art";
                                reg = <0x3f0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 
 &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";
 };
index 408fa12d8a3b79ba11afd5915a042ca1d40edc4b..fe1d3186cffda6ff8f52b384da1d7a9e86be55ab 100644 (file)
                                reg = <0x050000 0xfa0000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                        macaddr_art_0: macaddr@0 {
                                                reg = <0x0 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };
 &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";
 };
index 38704f91697164cabd901f92ad2ff3f33d845de1..51a2c8b2af70bed2835a5db0c24753522331fa56 100644 (file)
                                reg = <0x8c0000 0x700000>;
                        };
 
-                       art: partition@fc0000 {
+                       partition@fc0000 {
                                label = "ART";
                                reg = <0xfc0000 0x040000>;
                                read-only;
                                        macaddr_art_6: macaddr@6 {
                                                reg = <0x6 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index 98ef9abcc020ed81c0eb19fa2165a37690a359e6..121dcbcb0e26d007c04a2a7a2ac153ab414377f5 100644 (file)
@@ -85,7 +85,7 @@
                                reg = <0x040000 0x010000>;
                        };
 
-                       art: partition@50000 {
+                       partition@50000 {
                                label = "art";
                                reg = <0x050000 0x010000>;
                                read-only;
                                                reg = <0x2 0x6>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        macaddr_art_1002: macaddr@1002 {
                                                reg = <0x1002 0x6>;
                                        };
 &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";
 };
index ebd6d5384fc6bceaa5bf3d819023edb88c3358e9..b4a4e6894ddd7c1507b4369a76eefef679bb3c46 100644 (file)
@@ -76,7 +76,7 @@
                                reg = <0x020000 0x7d0000>;
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
                                                reg = <0x0 0x6>;
                                                #nvmem-cell-cells = <1>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index 73699d9bfabf16211b76ecd89f6448c2ffee98f9..6c38f54593ff3e53af513f0e4b950ef9ee3b058b 100644 (file)
@@ -90,7 +90,7 @@
                                reg = <0x50000 0xfa0000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                        macaddr_art_6: macaddr@6 {
                                                reg = <0x6 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };
 
 &eth0 {
        status = "okay";
+
        nvmem-cells = <&macaddr_art_0>;
        nvmem-cell-names = "mac-address";
 
 
 &eth1 {
        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";
 };
index c866889ce4b6cad462fbc2415ebe2325352ce107..bb2a42612f80587971d083ebc0e6f6ce14e78b6f 100644 (file)
                                reg = <0xfe0000 0x10000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index 6feee3123d6fafdbffea24b609ce012b26f9ba6e..06162281930d90c474106c69f2c6a7d973f90390 100644 (file)
@@ -83,7 +83,7 @@
                                reg = <0x050000 0xfa0000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        macaddr_art_1002: macaddr@1002 {
                                                compatible = "mac-base";
                                                reg = <0x1002 0x6>;
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index ad3b88ab2b9788d185b6c2f2f6bc8835ef4f91c3..a887056d732c4425774892efeb471f7ed83097dd 100644 (file)
                                reg = <0x50000 0xfa0000>;
                        };
 
-                       art: art@ff0000 {
+                       art@ff0000 {
                                reg = <0xff0000 0x10000>;
                                read-only;
 
                                        macaddr_art_0: macaddr@0 {
                                                reg = <0x0 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };
 
 &wmac {
        status = "okay";
-       mtd-cal-data = <&art 0x1000>;
+
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index eae6be300471541ed461434283a2fed274afaef7..ef800a6ce4f6753149d520d2cb091c1e44676eb4 100644 (file)
                                label = "firmware";
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                reg = <0x7f0000 0x10000>;
                                label = "art";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@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";
 };
index 62d0acbf5d322b73ba17a9a3cb6ad888ce4765a0..02c3372d3c97cd36d86ac3c04ec6d2d068418cb3 100644 (file)
                                label = "firmware";
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                reg = <0xff0000 0x10000>;
                                label = "art";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@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";
 };
index 37418bfc4ad946b0d51d5088886729d71402507c..067d760b04ca2bdc12244909aaf96f707e8bad5a 100644 (file)
                                reg = <0x050000 0xfa0000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                        macaddr_art_0: macaddr@0 {
                                                reg = <0x0 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index e9b1c1892490375aa668a3837e102e4cd6060bc6..f440d63b1636f3efdf3183d5678be42e4d1811cb 100644 (file)
                                reg = <0x050000 0xfa0000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                        macaddr_art_0: macaddr@0 {
                                                reg = <0x0 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index 5701dff64c4c7e3a8f94a6e922425dff3d2d6cd6..a2b6edbd5e71c2f13b9791644bd1a03493e3a372 100644 (file)
@@ -98,7 +98,7 @@
                                compatible = "tplink,firmware";
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                        macaddr_art_6: macaddr@6 {
                                                reg = <0x6 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index 5d0c02a64992c38f82517279a41331f2e7b9bb06..10b6051c3bfcc50cf72583104cf9eee9e6a9c09c 100644 (file)
                                read-only;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                reg = <0xff0000 0x10000>;
                                label = "art";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 
 &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";
 };
index 5d9e96e048e57bb29118a4ef6cde05fa945d2676..c13a33fb6c0192d1dd94ec9895a88de2d5c18e5d 100644 (file)
                                reg = <0x020000 0xfd0000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &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";
 };
index 4868ba2fa0e4e9dedccbd748a9f690a838b0fd92..a06ec37348f0a1c6fd65142c507015f6753b75f0 100644 (file)
                                label = "firmware";
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                reg = <0x7f0000 0x10000>;
                                label = "art";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 
 &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";
 };
index 63f394a4f93f1bbd5848271c10aeb9c37fcca7cc..dd3269db8be1418863b0020c65f6008dbfef568c 100644 (file)
                                label = "firmware";
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                reg = <0x7f0000 0x10000>;
                                label = "art";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 
 &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";
 };
index 054ccea52276bbeabe166ec23be639ed36cd5f39..c2c54b466295cb96299ac3d7e6cc6c198941867f 100644 (file)
                                };
                        };
 
-                       art: partition@30000 {
+                       partition@30000 {
                                label = "art";
                                reg = <0x30000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
 
                        partition@40000 {
 &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";
 };
index 0a965c2fa92520f19ea3a391e5d8edbb1e260caf..551782daa8d550c94df18a9e77108f323bb2200a 100644 (file)
                                read-only;
                        };
 
-                       art: partition@3f0000 {
+                       partition@3f0000 {
                                label = "art";
                                reg = <0x3f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &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";
 };
index df39577110e52f2eb28a686859bb3ff29cca582f..592e8596e30953603d600f38dea923b3de061aad 100644 (file)
                                reg = <0x020000 0x3d0000>;
                        };
 
-                       art: partition@3f0000 {
+                       partition@3f0000 {
                                label = "art";
                                reg = <0x3f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &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";
 };
index a8608a77e1949ecc69e8f735cea2b08f14a545d1..6c702a7eb33af84c38cc253673e7890572bbffd3 100644 (file)
                                label = "firmware";
                        };
 
-                       art: partition@3f0000 {
+                       partition@3f0000 {
                                reg = <0x3f0000 0x10000>;
                                label = "art";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &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";
 };
index d1336e968956091589d0f0d50d3f2184f5be1857..ca449338f77b9e10594d143897f6675299925ccf 100644 (file)
                                label = "firmware";
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                reg = <0x7f0000 0x10000>;
                                label = "art";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@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";
 };
index 04537fd33aa24ad7476b910fd0388f4384ac8e5a..b1b6577ae22889ce034c687c240d24194a3d7353 100644 (file)
                                label = "firmware";
                        };
 
-                       art: partition@3f0000 {
+                       partition@3f0000 {
                                reg = <0x3f0000 0x10000>;
                                label = "art";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &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";
 };
index 30f42862b22218217fd6b9b0826c85fdabde86a2..69dd46f0c7fe36694c31c0f73345b20be2a95777 100644 (file)
@@ -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@0 {
                        reg = <0x0 0x6>;
                };
+
+               cal_art_1000: calibration@1000 {
+                       reg = <0x1000 0x440>;
+               };
        };
 };
index 1b90deace53cf62136eebef4d50b302ea1c6be2c..0e455ab98297b1f5dd8574c0518ba1a9f3775908 100644 (file)
@@ -87,7 +87,8 @@
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
 
 &art {
                macaddr_art_0: macaddr@0 {
                        reg = <0x0 0x6>;
                };
+
+               cal_art_1000: calibration@1000 {
+                       reg = <0x1000 0x440>;
+               };
        };
 };
index d41dcaa3289cee1b7092ef4278fa986d9b582118..885e8bb4201a0c35192c5dbd38ab33b59694d525 100644 (file)
                                reg = <0x8c0000 0x700000>;
                        };
 
-                       art: partition@fc0000 {
+                       partition@fc0000 {
                                label = "ART";
                                reg = <0xfc0000 0x040000>;
                                read-only;
                                        macaddr_art_6: macaddr@6 {
                                                reg = <0x6 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index 1011ab4980ea22bc885babb7bd7463d7a5365cc5..bc75391dc6235fa75f2985ae63b5e946eeb04b86 100644 (file)
                                reg = <0x050000 0x07a0000>;
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
                                                reg = <0x0 0x6>;
                                                #nvmem-cell-cells = <1>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
 
 &eth0 {
index 496d6579e7671a47a22ede65262717cee4b17311..cb0fe378a484b87eadb743ead71ebfa15e00a4d4 100644 (file)
                                read-only;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x10000>;
                                read-only;
                                        macaddr_art_0: macaddr@0 {
                                                reg = <0x0 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };
 
 &wmac {
        status = "okay";
-       mtd-cal-data = <&art 0x1000>;
+
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index 5a5e785d9270e859d65a92df82c91433a455ab5c..16d2087372c343b50f59a61b2ea55510509e71a5 100644 (file)
                                reg = <0x020000 0x3d0000>;
                        };
 
-                       art: partition@3f0000 {
+                       partition@3f0000 {
                                label = "art";
                                reg = <0x3f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 };
 
 &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";
 };
index 71e2c7b8d819d05a3074a03ba3e04756011e6401..93f3a48f05a264f3dcbb4130aa8643bc91a27c68 100644 (file)
                                reg = <0x020000 0x3d0000>;
                        };
 
-                       art: partition@3f0000 {
+                       partition@3f0000 {
                                label = "art";
                                reg = <0x3f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@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";
 };
index 417461a59559f9be911b7502c6e6186845a93307..f743bcf3ec237465a1c276f33e0e6d65d8d1ec7e 100644 (file)
                                reg = <0x020000 0x3d0000>;
                        };
 
-                       art: partition@3f0000 {
+                       partition@3f0000 {
                                label = "art";
                                reg = <0x3f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@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";
 };
index 3efd8242469b0b8d35986bf20e26081cf39b1c32..c13c03d14ba64dedf74d2dc7a105231d2a50049c 100644 (file)
                                reg = <0x020000 0x7d0000>;
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 };
 
 &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";
 };
index 180504523c997bcb29d6be6a52369be01881564c..ad4a85b8cb352681e50d19e59542b612e4eb7fdc 100644 (file)
                                reg = <0x020000 0x3d0000>;
                        };
 
-                       art: partition@3f0000 {
+                       partition@3f0000 {
                                label = "art";
                                reg = <0x3f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 };
 
 &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";
 };
index 779b3b681f6b3b98eeafcc29905fcb350e52ee1a..ed85c79b5eea9d8319aedfab8c7bfeef9ae2028f 100644 (file)
@@ -73,7 +73,7 @@
                                read-only;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                                reg = <0x0 0x6>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 &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>;
 };
index 6bfa82356bfce92c55af3b614ff66c1148071d3a..0db71ea76530e259b071430e220246ace896ca79 100644 (file)
                                read-only;
                        };
 
-                       art: partition@10000 {
+                       partition@10000 {
                                label = "art";
                                reg = <0x010000 0x010000>;
                                read-only;
                                        macaddr_art_6: macaddr@6 {
                                                reg = <0x6 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
 
 
 &eth1 {
        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";
 };
index 8a354dfe374d4168479717aa88964d4252b93ab6..57b93e6310a8f854290617199ddc583794f95f96 100644 (file)
                                compatible = "denx,uimage";
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
 
 &mdio0 {
index e503be08ce0f5bd680ebf1097d769c6f65956c79..3043155261e2dbd6e014c08608ca45b4ff582d47 100644 (file)
                                reg = <0x70000 0xf80000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x10000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        macaddr_art_1002: macaddr@1002 {
                                                compatible = "mac-base";
                                                reg = <0x1002 0x6>;
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
 
 &pcie {
index 739ba583a800034e44b030ea73847c6110bae28c..d1ce727489bc4776d23e934d1332486b2104a5c8 100644 (file)
                                reg = <0x850000 0x7a0000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "ART";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                        macaddr_art_6: macaddr@6 {
                                                reg = <0x6 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index 6f35bd2c1e51c4f00f04f2e0161f9829b07ce6a4..972febe2fd7596a3a2245d638c956a73c3080546 100644 (file)
@@ -99,7 +99,7 @@
                                reg = <0x050000 0x07a0000>;
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
                                                reg = <0x0 0x6>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        macaddr_art_5002: macaddr@5002 {
                                                reg = <0x5002 0x6>;
                                        };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index 0f1fc3e0d50315d4adce83c0548220ce4ef1fc86..4707b754a3a03a64d88a76e816b5abd89707c195 100644 (file)
                                };
                        };
 
-                       art: partition@60000 {
+                       partition@60000 {
                                label = "art";
                                reg = <0x60000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index da8c9ac165d7e2d4ebfcccb3df85bf7d15c04b50..6b66dbe0d45533264cc4f359d2922f986c8a7a59 100644 (file)
                                reg = <0x070000 0xf80000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        macaddr_art_1002: macaddr@1002 {
                                                compatible = "mac-base";
                                                reg = <0x1002 0x6>;
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index 64959c9dc2998af9bc85b8f4a7221e4d53a5d87a..94e19a929c2ae8443ac321a2b6b402b70c1dd23f 100644 (file)
                                };
                        };
 
-                       art: partition@30000 {
+                       partition@30000 {
                                label = "art";
                                reg = <0x30000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
 
                        partition@40000 {
 &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 {
index f15c1c320acb9aed7043b232ae24049139ba5924..b65b284979b401561c4547c5432cf6165396f9a3 100644 (file)
                                read-only;
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &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";
 };
 
 &eth0 {
index 456efc8b75966a29b80c8c6f42300060de32f547..875406a4256410f92640f5123f299f3ea1f39e56 100644 (file)
                                reg = <0x020000 0x7d0000>;
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &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";
 };
 
 &eth0 {
index 36802a5275702dcba4a2e91a6aa2e49a770e64c2..b0002e455fa18c3b7a5be778bb19af53328008b6 100644 (file)
                                reg = <0x50000 0xfa0000>;
                        };
 
-                       art: art@ff0000 {
+                       art@ff0000 {
+                               label = "art";
                                reg = <0xff0000 0x10000>;
                                read-only;
 
                                        macaddr_art_6: macaddr@6 {
                                                reg = <0x6 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };
 
 &wmac {
        status = "okay";
-       mtd-cal-data = <&art 0x1000>;
+
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
 
 &pinmux {
index c019f2c3d195f629172867eda4ac79c2bd863908..a1149aeaeb0cb9a4899f0a3fd86a89368d7c62ee 100644 (file)
@@ -72,7 +72,7 @@
                                reg = <0x040000 0x040000>;
                        };
 
-                       art: partition@80000 {
+                       partition@80000 {
                                label = "art";
                                reg = <0x080000 0x040000>;
                                read-only;
                                        macaddr_art_6: macaddr@6 {
                                                reg = <0x6 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
 
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index 19097d718360143670ca4a2326f009c718613818..884d1a588e7949b7458a6056feb0962a5f667785 100644 (file)
@@ -63,7 +63,7 @@
                                reg = <0x040000 0x040000>;
                        };
 
-                       art: partition@80000 {
+                       partition@80000 {
                                label = "art";
                                reg = <0x080000 0x040000>;
                                read-only;
                                        macaddr_art_6: macaddr@6 {
                                                reg = <0x6 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
 
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index 1c96bd9a6ac31b757b8f57cdadb87ecfece3d71d..2d0ad0af338f9e744454552ce47623f4d2eb3a2b 100644 (file)
@@ -93,7 +93,7 @@
                                read-only;
                        };
 
-                       art: partition@10000 {
+                       partition@10000 {
                                label = "art";
                                reg = <0x010000 0x010000>;
                                read-only;
                                        macaddr_art_0: macaddr@0 {
                                                reg = <0x0 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
 
 &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";
 };
index 9a616921e5392fe3a0234d5752e497e4e07d824b..5af98bf46b558cfadd6040c624c9b90dae8c0a24 100644 (file)
                                read-only;
                        };
 
-                       art: partition@10000 {
+                       partition@10000 {
                                label = "art";
                                reg = <0x010000 0x010000>;
                                read-only;
                                        macaddr_art_6: macaddr@6 {
                                                reg = <0x6 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
 
 
 &wmac {
        status = "okay";
-       mtd-cal-data = <&art 0x1000>;
+
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index ec99ee0c4f5e2a6cafc83084573d7590cb330161..2cf35b0820190d01d1be38cd2f522d356759d649 100644 (file)
@@ -92,7 +92,7 @@
                                read-only;
                        };
 
-                       art: partition@10000 {
+                       partition@10000 {
                                label = "art";
                                reg = <0x010000 0x010000>;
                                read-only;
                                        macaddr_art_6: macaddr@6 {
                                                reg = <0x6 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
 
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
 
 &pinmux {
index 535676aab2128661e70a8d203c498a3a540852bd..19256aa10dceb11e352c838331d7c3a36f344527 100644 (file)
                                                #nvmem-cell-cells = <1>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        precal_art_5000: pre-calibration@5000 {
                                                reg = <0x5000 0x2f20>;
                                        };
 &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";
 };
index 05873f173def9ff96a1cf7b9e0660d6728e93404..227764650014569d14a40086bcea1c6fd286fe29 100644 (file)
@@ -87,7 +87,7 @@
                                read-only;
                        };
 
-                       art: partition@10000 {
+                       partition@10000 {
                                label = "art";
                                reg = <0x010000 0x010000>;
                                read-only;
                                                reg = <0x0 0x6>;
                                                #nvmem-cell-cells = <1>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
 
 &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";
 };
index 5f9240d6c1fea6d0351ac3bf18ef9602e501d970..e5eac041387a3ab5027c4c3432bc802d1acb5907 100644 (file)
@@ -94,7 +94,7 @@
                                read-only;
                        };
 
-                       art: partition@10000 {
+                       partition@10000 {
                                label = "art";
                                reg = <0x010000 0x010000>;
                                read-only;
                                                #nvmem-cell-cells = <1>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        precal_art_5000: pre-calibration@5000 {
                                                reg = <0x5000 0x2f20>;
                                        };
 &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";
 };
index d13e4966ae45862f3bc2c9b4ef0d940119156394..b3df9656703030139365c644c63c962b0774e35d 100644 (file)
                                                #nvmem-cell-cells = <1>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        precal_art_5000: pre-calibration@5000 {
                                                reg = <0x5000 0x2f20>;
                                        };
 &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";
 };
index 7a8f6edcee1cf3d71c5937aa36b12cb1b7ee9719..5506da5125a9891b3507fc7276a1b872f3e0a47d 100644 (file)
                                compatible = "denx,uimage";
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
 
 &pcie0 {
index 8f2027f25020e34d15a497ee6ce148f55bcdf701..198b08c56ea3a2441e18fcd862bfb1620a75fe35 100644 (file)
                                read-only;
                        };
 
-                       art: partition@10000 {
+                       partition@10000 {
                                label = "art";
                                reg = <0x10000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index 29886a4d3ec8ebbed03ab75a0e74b90f53473e34..5a88731e66f003ed464d4e7e0e5c2e2ea81c67aa 100644 (file)
                                reg = <0x040000 0x010000>;
                        };
 
-                       art: partition@50000 {
+                       partition@50000 {
                                label = "art";
                                reg = <0x050000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index 461392660f99c6aa232cf948c7cccc2038c0dce5..3084baa1e6228da957297651848c9b5a886aec57 100644 (file)
                                reg = <0x050000 0xfa0000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                                reg = <0x0 0x6>;
                                                #nvmem-cell-cells = <1>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };
 
 &wmac {
        status = "okay";
-       mtd-cal-data = <&art 0x1000>;
+
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
 
 &pinmux {
index b6a37754fab7f454545693633d4aa868138dc9e8..4d809b922a7c9e186c8f3304a0296a4f0bcd54cd 100644 (file)
                                read-only;
                        };
 
-                       art: partition@50000 {
+                       partition@50000 {
                                label = "art";
                                reg = <0x050000 0x010000>;
                                read-only;
                                                #nvmem-cell-cells = <1>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index e0c65b7f1b886f3c62d39d070353c42aca1ae8c4..ba1291557039f63e2a4a8c58821de960d29ddaa3 100644 (file)
@@ -79,7 +79,7 @@
                                reg = <0x40000 0x10000>;
                        };
 
-                       art: partition@50000 {
+                       partition@50000 {
                                label = "art";
                                reg = <0x50000 0x10000>;
                                read-only;
                                        macaddr_art_0: macaddr@0 {
                                                reg = <0x0 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
 
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index fef23bcd8375e3a230703cf36cd95ce99a8dacea..f6ff4f3a107e9a7b952aa2d7ff3994b65fed17d9 100644 (file)
 
 &wmac {
        status = "okay";
+
        nvmem-cells = <&calibration_art_1000>;
        nvmem-cell-names = "calibration";
 };
index 75a8dca7d201fc3bb9eb213eaecc073e2be9d853..51351554724605df3970dc8dec800d5bf380e9e9 100644 (file)
                                reg = <0x040000 0x010000>;
                        };
 
-                       art: partition@50000 {
+                       partition@50000 {
                                label = "art";
                                reg = <0x050000 0x010000>;
                                read-only;
                                                reg = <0x0 0x6>;
                                                #nvmem-cell-cells = <1>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
 
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index 106d81ff113e47e15abf368676fca0e3874db28a..6d1674caf32073a583d983403bc13a4e40c4c609 100644 (file)
                                reg = <0x040000 0x010000>;
                        };
 
-                       art: partition@50000 {
+                       partition@50000 {
                                label = "art";
                                reg = <0x050000 0x010000>;
                                read-only;
                                                #nvmem-cell-cells = <1>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index 2e7137bc3a9273d79f3150bec346027caf665115..ae80e30000cc754de55d9451f041046fb911ef13 100644 (file)
                                reg = <0x40000 0x10000>;
                        };
 
-                       art: partition@50000 {
+                       partition@50000 {
                                label = "art";
                                reg = <0x50000 0x10000>;
                                read-only;
                                                reg = <0x0 0x6>;
                                                #nvmem-cell-cells = <1>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
 
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index d4e35c84b343b74e74f4f77811cf808187f82a22..b9d991217b32ad13bfa86edcdd8fa39d72f616ce 100644 (file)
                                                reg = <0x6 0x6>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index ddc3e0f3c6e29d06f1988c395851e3bc56ebe724..a376a930467a53b3d93222be5f6b8c099e9ebd64 100644 (file)
                                };
                        };
 
-                       art: partition@60000 {
+                       partition@60000 {
                                label = "art";
                                reg = <0x060000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index 543fad3c4fc46637f24984d3031f453aa27964bf..1cb40b3aaea841a95b10009dad64054cb2e9610b 100644 (file)
@@ -96,7 +96,7 @@
                                read-only;
                        };
 
-                       art: partition@10000 {
+                       partition@10000 {
                                label = "art";
                                reg = <0x010000 0x010000>;
                                read-only;
                                        macaddr_art_6: macaddr@6 {
                                                reg = <0x6 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
 
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
 
 &pinmux {
index fa17cd3ce33a3390f44f73e3b135fc5126126e03..0daabc69a7f5fa3cb00aa1231119494e62aabe62 100644 (file)
                                read-only;
                        };
 
-                       romfile: partition@7d0000 {
+                       partition@7d0000 {
                                label = "romfile";
                                reg = <0x7d0000 0x010000>;
                                read-only;
                                read-only;
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 &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 {
index be1dc66aff6f4ea78ba7b5fce2bc951791a16471..b46dbc98c2e578dd83847995d6fe5c88156a8f88 100644 (file)
                                reg = <0x020000 0x3d0000>;
                        };
 
-                       art: partition@3f0000 {
+                       partition@3f0000 {
                                label = "art";
                                reg = <0x3f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &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 {
index fb9fb12b6b78f846523f6299937a81575330a664..0d8654b18ca8e90ca6a9f3bea9b35588b4309d52 100644 (file)
                                reg = <0x020000 0x7d0000>;
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &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 {
index 676f8adf1fce8bbd620bfb73a7997b7e47650167..ff1cff9384bb4bcc03a58b43a5b447dae4819451 100644 (file)
                                reg = <0x020000 0x730000>;
                        };
 
-                       info: partition@750000 {
+                       partition@750000 {
                                label = "info";
                                reg = <0x750000 0x010000>;
                                read-only;
                                read-only;
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 &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 {
index 9e90f99728ff83c31f373c00f1d0d1ffdb211e59..d16c82666e4521cd1a0a85d179cb6cfd040635e2 100644 (file)
                                reg = <0x050000 0x7a0000>;
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index 4ad19fe600ebc7d4dd96054d1608bd1961bb5e4e..203a192f16fbe095b0a3d4d9c4b737122bda6633 100644 (file)
@@ -88,7 +88,7 @@
                                reg = <0x050000 0xfa0000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                                reg = <0x6 0x6>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index e4b6f5fc68ad8eaf6c647d82b1d700ec97285a29..8331ec72470fc6e8027fd425de0ed244e5ef5094 100644 (file)
                                read-only;
                        };
 
-                       art: partition@10000 {
+                       partition@10000 {
                                label = "art";
                                reg = <0x010000 0x010000>;
                                read-only;
                                                reg = <0x6 0x6>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        macaddr_art_1002: macaddr@1002 {
                                                reg = <0x1002 0x6>;
                                        };
 &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";
 };
index d5609f7af10c4056aa2788dfee965e9fb316a10c..0364cf2cd70a3434b7323db6879b25fa2faf3b51 100644 (file)
                                read-only;
                        };
 
-                       art: partition@10000 {
+                       partition@10000 {
                                label = "art";
                                reg = <0x10000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index c78f52152d53cca1ef2c7e5acb8ae11b6c2da2f9..bd43ccad791722349af9af1f2393724ac0286a81 100644 (file)
                                reg = <0x8c0000 0x700000>;
                        };
 
-                       art: partition@fc0000 {
+                       partition@fc0000 {
                                label = "ART";
                                reg = <0xfc0000 0x040000>;
                                read-only;
                                        macaddr_art_6: macaddr@6 {
                                                reg = <0x6 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };
 &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";
 };
index 010b752995b8153616ae9d3b8a54faa31fb9b36e..07edeed80663083df910f0b31d7eea88cf61b003 100644 (file)
                                reg = <0x8c0000 0x700000>;
                        };
 
-                       art: partition@fc0000 {
+                       partition@fc0000 {
                                label = "ART";
                                reg = <0xfc0000 0x040000>;
                                read-only;
                                                reg = <0x0 0x6>;
                                                #nvmem-cell-cells = <1>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };
 &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";
 };
index ce59e8a54b5c18ca76a225cc46c0e84de6ced582..c227d679e69b51a471fe81e9e306ab6e956f77ed 100644 (file)
@@ -41,7 +41,7 @@
                reg = <0xe90000 0x160000>;
        };
 
-       art: partition@ff0000 {
+       partition@ff0000 {
                label = "art";
                reg = <0xff0000 0x010000>;
                read-only;
                        macaddr_art_6: macaddr@6 {
                                reg = <0x6 0x6>;
                        };
+
+                       cal_art_1000: calibration@1000 {
+                               reg = <0x1000 0x440>;
+                       };
                };
        };
 };
@@ -73,5 +77,6 @@
 };
 
 &wmac {
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index f04885e47d1625af6986da726ef083268f1e4110..5a6977efdc8d627eea6cb9f60217f67527b4f507 100644 (file)
@@ -41,7 +41,7 @@
                reg = <0x690000 0x160000>;
        };
 
-       art: partition@7f0000 {
+       partition@7f0000 {
                label = "art";
                reg = <0x7f0000 0x010000>;
                read-only;
                        macaddr_art_6: macaddr@6 {
                                reg = <0x6 0x6>;
                        };
+
+                       cal_art_1000: calibration@1000 {
+                               reg = <0x1000 0x440>;
+                       };
                };
        };
 };
@@ -73,5 +77,6 @@
 };
 
 &wmac {
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index f17dd513e295215555cc72546ae7a8f1c30db8f5..d3b323e8c5cbc06b8e62d08157d75bf563a608ec 100644 (file)
                                read-only;
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &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";
 };
index 7bad615a6c4ac756d9a8c1dac83c9d73d02e1721..377c37cc20151ee4b4f3b494348cb36180a33c28 100644 (file)
                                reg = <0x020000 0x3d0000>;
                        };
 
-                       art: partition@3f0000 {
+                       partition@3f0000 {
                                label = "art";
                                reg = <0x3f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &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";
 };
index f1cdde13a2d4cbeaab515a317fcb09a7dd9236af..bec3a47aa075154d2c0e7ed340022cdb91a912b9 100644 (file)
                                read-only;
                        };
 
-                       art: partition@3f0000 {
+                       partition@3f0000 {
                                label = "art";
                                reg = <0x3f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &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";
 };
index b2d525acb704ce1cb2317f63ece8ceeca7e43bee..0a585c0d73a6c56cff58d956746c6d0742964598 100644 (file)
                                compatible = "tplink,firmware";
                        };
 
-                       art: partition@3f0000 {
+                       partition@3f0000 {
                                label = "art";
                                reg = <0x3f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &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";
 };
index 9487e67e99bb851446eea4be1d69f6296c46c4a9..29633865b67bc6696ab141808bd812ff598e73fd 100644 (file)
                                reg = <0x020000 0x3d0000>;
                        };
 
-                       art: partition@3f0000 {
+                       partition@3f0000 {
                                label = "art";
                                reg = <0x3f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &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";
 };
index d6768e1af2da88a9b20eca5f33067806d2d4dce0..c931e626072d0b55a7deed46d72211d2fb8eb136 100644 (file)
                                reg = <0x020000 0x7d0000>;
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &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";
 };
index 4d4acd202ce15a327b96c419e70ed46ff98bcca8..59863fd52c0a3c840886bb84a9b230010b7a2b13 100644 (file)
                                reg = <0x020000 0xfd0000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &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";
 };
index c5d6e66c9a786fcf176c7fbbc17aac1ea93b4627..b6e6fc91dfef00d83fc3f6a7e6686b7cb59b874d 100644 (file)
@@ -62,7 +62,7 @@
                                read-only;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                        macaddr_art_6: macaddr@6 {
                                                reg = <0x6 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };
 
 &wmac {
        status = "okay";
-       mtd-cal-data = <&art 0x1000>;
+
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index 30b340768f74878d956aeb95039aba820ee9e704..518d88e62c282e7c223b9d37ed126acb4f59f5c6 100644 (file)
@@ -75,7 +75,7 @@
                                reg = <0x050000 0xfa0000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                        macaddr_art_6: macaddr@6 {
                                                reg = <0x6 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };
 
 &wmac {
        status = "okay";
-       mtd-cal-data = <&art 0x1000>;
+
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index e3b35b810d6397f95712dfb303999bda02fcd865..3038588370d8c4527f5913ff08ee43bc12186cb8 100644 (file)
                                reg = <0x020000 0x7d0000>;
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &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";
 };
index 6ade40bfe1e6070330056f8cc52b8114d4b28af0..ad19bab4e2e75bdfd84da6a1d508ed2e43fcdaee 100644 (file)
                                reg = <0x060000 0xf90000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                        macaddr_art_6: macaddr@6 {
                                                reg = <0x6 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index f01ac7fc91c1327e11cdb1cce090d3e6b5e3a780..c71bc7ed9f943cebab0ff53cd1352df6a6f52ac0 100644 (file)
@@ -41,7 +41,7 @@
                        reg = <0x300000 0x200000>;
                };
 
-               art: partition@500000 {
+               partition@500000 {
                        label = "art";
                        reg = <0x500000 0x100000>;
                        read-only;
                                macaddr_art_6: macaddr@6 {
                                        reg = <0x6 0x6>;
                                };
+
+                               cal_art_1000: calibration@1000 {
+                                       reg = <0x1000 0x440>;
+                               };
                        };
                };
 
        status = "okay";
 
        gpio-controller;
-       mtd-cal-data = <&art 0x1000>;
+
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
 
 &pcie0 {
index 8cf1f00255edb6a6cdb854dc963f290e63902a9d..46b364007368ce1c880e3ab5d91ca6366b9f15ee 100644 (file)
@@ -58,7 +58,7 @@
 };
 
 &partitions {
-       art: partition@ff0000 {
+       partition@ff0000 {
                label = "art";
                reg = <0xff0000 0x010000>;
                read-only;
                                #nvmem-cell-cells = <1>;
                        };
 
+                       cal_art_1000: calibration@1000 {
+                               reg = <0x1000 0x440>;
+                       };
+
                        cal_art_5000: calibration@5000 {
                                reg = <0x5000 0x844>;
                        };
 &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 {
index 33fc3f1a070f4f602ee7fe96b3477580ac02f7a4..4372a07d51c56975103fb7eb80fda2ed76621568 100644 (file)
@@ -86,7 +86,7 @@
                                reg = <0x030000 0x010000>;
                        };
 
-                       art: partition@40000 {
+                       partition@40000 {
                                label = "art";
                                reg = <0x040000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
index c6620969d100479ee3a41e2c12abd291bf574cf6..5aaaacef6c7e0e6d8af966f056338d2ccc4c2036 100644 (file)
@@ -82,7 +82,7 @@
 };
 
 &partitions {
-       art: partition@ff0000 {
+       partition@ff0000 {
                label = "art";
                reg = <0xff0000 0x010000>;
                read-only;
                                #nvmem-cell-cells = <1>;
                        };
 
+                       cal_art_1000: calibration@1000 {
+                               reg = <0x1000 0x440>;
+                       };
+
                        cal_art_5000: calibration@5000 {
                                reg = <0x5000 0x844>;
                        };
 &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 {
index 3906b82776b9c78bb4c0e1268a40bd9b9418dde5..fb2187be1f047584d2b4605e8c386b48fe830fab 100644 (file)
@@ -58,7 +58,7 @@
 };
 
 &partitions {
-       art: partition@ff0000 {
+       partition@ff0000 {
                label = "art";
                reg = <0xff0000 0x010000>;
                read-only;
                                #nvmem-cell-cells = <1>;
                        };
 
+                       cal_art_1000: calibration@1000 {
+                               reg = <0x1000 0x440>;
+                       };
+
                        cal_art_5000: calibration@5000 {
                                reg = <0x5000 0x844>;
                        };
 &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 {
index 9048fd3e2f0523631fdba39bd72f15eacba072fe..cd84e568d910d0b3a8f5db9f049704e3efee129b 100644 (file)
                                reg = <0xe80000 0x170000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
 
                                                reg = <0x0 0x6>;
                                                #nvmem-cell-cells = <1>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index b9c161d9a88e8e3b7936865a7cc43f905dcd5438..afe97df6d487307da6f59e6e84075ca82794db7b 100644 (file)
@@ -82,7 +82,7 @@
                                read-only;
                        };
 
-                       art: partition@40000 {
+                       partition@40000 {
                                label = "art";
                                reg = <0x040000 0x010000>;
                                read-only;
                                                #nvmem-cell-cells = <1>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 &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";
 };
index 2e6f86b0b24f4faea9ca262c597758eaec0553b9..d00c4f7e98def596b95281009c08581d99d52826 100644 (file)
@@ -35,7 +35,7 @@
                                read-only;
                        };
 
-                       art: partition@20000 {
+                       partition@20000 {
                                label = "art";
                                reg = <0x020000 0x010000>;
                                read-only;
                                                reg = <0x18 0x6>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@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";
 };
index a4aa4118faf29ae6b850e6961979c013bf37028a..fb46f4db50a91c87f473a02784a07ffb38d3c894 100644 (file)
@@ -37,7 +37,7 @@
                                read-only;
                        };
 
-                       art: partition@40000 {
+                       partition@40000 {
                                label = "art";
                                reg = <0x040000 0x010000>;
                                read-only;
                                                reg = <0x18 0x6>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@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";
 };
index d6ecc7728fad7ae49daa01d80b209a8f2171b620..e63c3e842dfe92d6111da47527c597c31ca079e0 100644 (file)
                                reg = <0x030000 0xfc0000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
 
 &pcie0 {
index 9fea2589701460079b56c49e3f1b8fb46251dfff..63d4a75e619a2e8a57b94aeec80552921a79abb8 100644 (file)
@@ -72,7 +72,7 @@
                                read-only;
                        };
 
-                       art: partition@50000 {
+                       partition@50000 {
                                label = "art";
                                reg = <0x050000 0x010000>;
                                read-only;
                                                #nvmem-cell-cells = <1>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 &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";
 };
index 765cfafe15ea832a3a3f18763ee842a30ff20be7..7b1ccf410d2764e2995d801cd06c2b594d216a1b 100644 (file)
                                reg = <0x50000 0xfa0000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x10000>;
                                read-only;
                                                reg = <0x12 0x6>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 &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";
 };
index 333b52f4d9150e63533ac0dadb452d3857a69f23..a8c1e75d8d233876f73cd1e0c3dd51d146bc47a2 100644 (file)
                                reg = <0xfd0000 0x20000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                        macaddr_art_c: macaddr@c {
                                                reg = <0xc 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };
 &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";
 };
index 891bdd95c43c5252aabafe900ef7b2b19f37284e..1341593117c7353a1a8a528d7eb60a4488b67829 100644 (file)
                                read-only;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                                reg = <0xc 0x6>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 &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 {
index 8ddeccefb73383613f078d38da500ef702ed6f9a..5cdf22ac7bce9ffeca674db23f6c9f26e5545ad1 100644 (file)
@@ -80,7 +80,7 @@
                                read-only;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                                reg = <0x12 0x6>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 &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 {
index e908c26c0db87b509524b4fd114da9509a226ec4..8cd27e01cc85b926d00919b82097c2c2a59abd8b 100644 (file)
                                reg = <0x850000 0x7a0000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "ART";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                                reg = <0x6 0x6>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 &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 {
index 03f2999083b36a7b9ba0759fe9504889c5ead909..d4087d511f7e49f238920175f0c81dc9ddb0a743 100644 (file)
                                reg = <0x850000 0x7a0000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "ART";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                                #nvmem-cell-cells = <1>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 &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 {
index 8fd35a99d4d388fd031689c178e54748774ee120..838aa1f0b804642e7ea19c83eaa26d35d6b19799 100644 (file)
                                reg = <0x850000 0x7a0000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "ART";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                                reg = <0x6 0x6>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 &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 {
index 2e27d3d6ee5f6d93bdc310af04c9b93759d042a3..9c5b70a606bad25d65b15f58a954270e37efe9aa 100644 (file)
                                reg = <0x850000 0x7a0000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "ART";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                                reg = <0x6 0x6>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 &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";
 };
index 9cbdca234d9bd68d1f1ba13ef91e82316ce77b32..16308395e40d8065afb7c293b90f48970f60c790 100644 (file)
                                };
                        };
 
-                       art: partition@60000 {
+                       partition@60000 {
                                label = "art";
                                reg = <0x060000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index 92e89ff3aa797e5f81925b74c341919566e31003..744871a9311fd0cb5f39a081bcb3bcb257746988 100644 (file)
                                reg = <0x040000 0x010000>;
                        };
 
-                       art: partition@50000 {
+                       partition@50000 {
                                label = "art";
                                reg = <0x050000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
                                };
                        };
 
-                       config: partition@60000 {
+                       partition@60000 {
                                label = "config";
                                reg = <0x060000 0x010000>;
                                read-only;
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
 
 &usb0 {
index 5801303040f9ce29e13e5ade6b9357b411fa2472..7949d3e88f4501dbb2617dc0cdae7f67a5c1a48e 100644 (file)
@@ -75,7 +75,7 @@
                                reg = <0x040000 0x010000>;
                        };
 
-                       art: partition@50000 {
+                       partition@50000 {
                                label = "art";
                                reg = <0x050000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
                                };
                        };
 
-                       config: partition@60000 {
+                       partition@60000 {
                                label = "config";
                                reg = <0x060000 0x010000>;
                                read-only;
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index 584a66ba524b18027debe46c03dd74bf4fbb4132..17af5cb27e730c6c5e68be574a963f7608ce393f 100644 (file)
@@ -29,7 +29,7 @@
 };
 
 &mtdparts {
-       uboot: partition@0 {
+       partition@0 {
                label = "u-boot";
                reg = <0x000000 0x020000>;
                read-only;
@@ -53,7 +53,7 @@
                compatible = "tplink,firmware";
        };
 
-       art: partition@ff0000 {
+       partition@ff0000 {
                label = "art";
                reg = <0xff0000 0x010000>;
                read-only;
                        #address-cells = <1>;
                        #size-cells = <1>;
 
+                       cal_art_1000: calibration@1000 {
+                               reg = <0x1000 0x440>;
+                       };
+
                        cal_art_5000: calibration@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";
 };
index 20cefe0b793c20d7f425f19bf2bb3a493400dd08..0ddf23f354e0bb97df072348cc28a5d49e3fda33 100644 (file)
@@ -57,7 +57,7 @@
                                read-only;
                        };
 
-                       romfs: partition@fd0000 {
+                       partition@fd0000 {
                                label = "romfs";
                                reg = <0xfd0000 0x010000>;
                                read-only;
@@ -81,7 +81,7 @@
                                read-only;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 };
 
 &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";
 };
index 3418601c41e126c37ac1695e816c812def1f5ece..fd47f7fee3968818d873acaf6c331fbde1861fca 100644 (file)
@@ -51,7 +51,7 @@
                                read-only;
                        };
 
-                       romfs: partition@fd0000 {
+                       partition@fd0000 {
                                label = "romfs";
                                reg = <0xfd0000 0x010000>;
                                read-only;
@@ -75,7 +75,7 @@
                                read-only;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 };
 
 &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";
 };
index a3fb9b22d227921586710704eb605901dad43644..becd5cc44b4380de92e18bf791e87326afe45a83 100644 (file)
                                read-only;
                        };
 
-                       info: partition@da0000 {
+                       partition@da0000 {
                                label = "info";
                                reg = <0xda0000 0x020000>;
                                read-only;
                                read-only;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 &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";
 };
index 3061ae07c7cba1c5a102832316239a08c6a8ec80..3857635672ae2fa7a04ebd9ad3bfbe16d17be9e3 100644 (file)
                                read-only;
                        };
 
-                       info: partition@610000 {
+                       partition@610000 {
                                label = "info";
                                reg = <0x610000 0x020000>;
                                read-only;
                                read-only;
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 &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";
 };
index 33697d3b836e7d596a893b6e8b3acca0d60206c9..0e09b5aa09b8d41c75bf7df098ed4b69526fe68d 100644 (file)
@@ -29,7 +29,7 @@
 };
 
 &mtdparts {
-       uboot: partition@0 {
+       partition@0 {
                label = "u-boot";
                reg = <0x000000 0x020000>;
                read-only;
@@ -53,7 +53,7 @@
                reg = <0x020000 0x7d0000>;
        };
 
-       art: partition@7f0000 {
+       partition@7f0000 {
                label = "art";
                reg = <0x7f0000 0x010000>;
                read-only;
                        #address-cells = <1>;
                        #size-cells = <1>;
 
+                       cal_art_1000: calibration@1000 {
+                               reg = <0x1000 0x440>;
+                       };
+
                        cal_art_5000: calibration@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";
 };
index a72b6e6050d195445594122b06cad5e502c29e2f..49af23bf02b8022aeeeb1953354515e17b419408 100644 (file)
                                reg = <0x020000 0x7d0000>;
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 
 &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";
 };
index f51b89206d627920ac0c47276eef2bb5f84a8976..3f8256ba1736481305f7adabf6aafdf3349f88de 100644 (file)
                                reg = <0x020000 0x3d0000>;
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                label = "art";
                                reg = <0x3f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 
 &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";
 };
index 23b484cdf58eb3d2da63573369743b49a6e76d6c..d2e381eb4b1c5d9264ec6552401a4842867ae321 100644 (file)
                                read-only;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index e3431330de0f1f6b6f7bb1e4a170fb4eecdf5cd7..043f8dd26254d31d7e50731ad06cf21180a25dd3 100644 (file)
                reg = <0xff0000 0x1000000>;
        };
 
-       art: partition@1ff0000 {
+       partition@1ff0000 {
                label = "art";
                reg = <0x1ff0000 0x010000>;
                read-only;
                                #nvmem-cell-cells = <1>;
                        };
 
+                       cal_art_1000: calibration@1000 {
+                               reg = <0x1000 0x440>;
+                       };
+
                        cal_art_5000: calibration@5000 {
                                reg = <0x5000 0x844>;
                        };
 &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 {
index 76ae8a99a691b5a21fc589f9d2ae2d30788df674..19f124502222bbe98831e94c2a90ea3aba6af502 100644 (file)
                        #address-cells = <1>;
                        #size-cells = <1>;
 
-                       uboot: partition@0 {
+                       partition@0 {
                                label = "u-boot";
                                reg = <0x000000 0x040000>;
                                read-only;
                        };
 
-                       uboot_env: partition@40000 {
+                       partition@40000 {
                                label = "u-boot-env";
                                reg = <0x040000 0x010000>;
                        };
 
-                       art: partition@50000 {
+                       partition@50000 {
                                label = "art";
                                reg = <0x050000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
index 7de1c4fa69602cde06d5c7d20a93469231f34409..3cbb305aadb4e395001ec4c4dc9794cd58de1988 100644 (file)
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
 
 &usb_phy0 {
index 97e9ebf0b64911b2c69c4725a20094ab81e02108..e4d9b99a60f946ed5e00af38296aa87a57fed02d 100644 (file)
                                reg = <0x030000 0x7a0000>;
                        };
 
-                       config: partition@7d0000 {
+                       partition@7d0000 {
                                label = "config";
                                reg = <0x7d0000 0x010000>;
                                read-only;
                        };
 
-                       info: partition@7e0000 {
+                       partition@7e0000 {
                                label = "info";
                                reg = <0x7e0000 0x010000>;
                                read-only;
                                };
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 &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";
 };
index 95af75178403bcd93a5d69f26f3d67fd040c7e21..33ef672f45288342b19ba7998b5fb8ce25a8b94b 100644 (file)
@@ -39,7 +39,7 @@
                                read-only;
                        };
 
-                       info: partition@10000 {
+                       partition@10000 {
                                label = "info";
                                reg = <0x010000 0x010000>;
                                read-only;
@@ -69,7 +69,7 @@
                                read-only;
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        precal_art_5000: pre-calibration@5000 {
                                                reg = <0x5000 0x2f20>;
                                        };
 };
 
 &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";
 };
index e8b282b9c207a69000c49f57df1e0d08e58e0d23..4e6e90a8c337dc9a64bd81592b9de17af6da17fb 100644 (file)
@@ -59,7 +59,7 @@
                                read-only;
                        };
 
-                       info: partition@10000 {
+                       partition@10000 {
                                label = "info";
                                reg = <0x010000 0x010000>;
                                read-only;
@@ -89,7 +89,7 @@
                                read-only;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        precal_art_5000: pre-calibration@5000 {
                                                reg = <0x5000 0x2f20>;
                                        };
 };
 
 &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";
 };
index 8a93d2b3b14c981b81e7b51a8848b7976e01763c..094ef7090fb9dacce97f8e0a4bdc7f7518b257d8 100644 (file)
@@ -62,7 +62,7 @@
                                read-only;
                        };
 
-                       info: partition@30000 {
+                       partition@30000 {
                                label = "info";
                                reg = <0x030000 0x010000>;
                                read-only;
@@ -92,7 +92,7 @@
                                read-only;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        precal_art_5000: pre-calibration@5000 {
                                                reg = <0x5000 0x2f20>;
                                        };
 };
 
 &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";
 };
index eb21394d046fd93f18fddeca259d562588dd2e35..b64f8c7cece1454f5accab394b0d94cb9d16a135 100644 (file)
@@ -55,7 +55,7 @@
                                read-only;
                        };
 
-                       info: partition@10000 {
+                       partition@10000 {
                                label = "info";
                                reg = <0x010000 0x010000>;
                                read-only;
@@ -85,7 +85,7 @@
                                read-only;
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        precal_art_5000: pre-calibration@5000 {
                                                reg = <0x5000 0x2f20>;
                                        };
 };
 
 &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";
 };
index aa4a7da10cf42f42de833acd53d33e19823b664c..34fe10cb51e47471d809c3b68fa2729355e0e9c5 100644 (file)
@@ -55,7 +55,7 @@
                                read-only;
                        };
 
-                       info: partition@1fb00 {
+                       partition@1fb00 {
                                label = "info";
                                reg = <0x01fb00 0x000500>;
                                read-only;
@@ -91,7 +91,7 @@
                                read-only;
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        precal_art_5000: pre-calibration@5000 {
                                                reg = <0x5000 0x2f20>;
                                        };
 };
 
 &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";
 };
index ede6878d5c1607f5dc80cd6d8f35cef2deb9222c..d50b3af018bd1adbf967ffc7d2638f79655934de 100644 (file)
@@ -49,7 +49,7 @@
                                read-only;
                        };
 
-                       info: partition@1fb00 {
+                       partition@1fb00 {
                                label = "info";
                                reg = <0x01fb00 0x000500>;
                                read-only;
@@ -85,7 +85,7 @@
                                read-only;
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        precal_art_5000: pre-calibration@5000 {
                                                reg = <0x5000 0x2f20>;
                                        };
 };
 
 &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";
 };
index 5f9f575b447325e0043eb86f3f31fabce033bd14..b9aee571c9178a9d82c2a3bf986e71ea244a21db 100644 (file)
@@ -89,7 +89,7 @@
                                read-only;
                        };
 
-                       art: partition@60000 {
+                       partition@60000 {
                                label = "art";
                                reg = <0x60000 0x10000>;
                                read-only;
                                        macaddr_art_6: macaddr@6 {
                                                reg = <0x6 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
 
 &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";
 };
index ebcaeb6ddc96d637e47d0d74b75e394afae68e8f..9fca52bf33bf7041b390cfae2d40f0e79bd9c46a 100644 (file)
@@ -90,7 +90,7 @@
                                read-only;
                        };
 
-                       art: partition@40000 {
+                       partition@40000 {
                                label = "art";
                                reg = <0x040000 0x010000>;
                                read-only;
                                                #nvmem-cell-cells = <1>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        precal_art_5000: pre-calibration@5000 {
                                                reg = <0x5000 0x2f20>;
                                        };
 &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";
 };
index 95ca9003983055fec85535375d03515c0b219ff4..dc449d82146a7255d9b2b7f9301ca00fded76ab1 100644 (file)
                                reg = <0x030000 0xfc0000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index 0624d88d8a132c5bb113adfdd45b21b8865cac2d..3244b499c44071a19b5c24bbdea63f8f1a4c08e1 100644 (file)
@@ -93,7 +93,7 @@
                                reg = <0x040000 0x010000>;
                        };
 
-                       art: partition@50000 {
+                       partition@50000 {
                                label = "art";
                                reg = <0x050000 0x010000>;
                                read-only;
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
 
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index 614d88d3830f4880f5e16a41ed47bc163dceda03..e3d20df5f63cc27b191bcc1e2da5b106a7d3f379 100644 (file)
@@ -98,7 +98,7 @@
                                reg = <0x090000 0xf60000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        precal_art_5000: pre-calibration@5000 {
                                                reg = <0x5000 0x2f20>;
                                        };
 
 &wmac {
        status = "okay";
-       mtd-cal-data = <&art 0x1000>;
+
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index a0e64899187965560c6b80af428339c60c0503f1..90f6d1a494113f6addabd9f4e741141560d9cb82 100644 (file)
@@ -87,7 +87,7 @@
                                read-only;
                        };
 
-                       pridata: partition@50000 {
+                       partition@50000 {
                                label = "pri-data";
                                reg = <0x050000 0x010000>;
                                read-only;
                                };
                        };
 
-                       art: partition@60000 {
+                       partition@60000 {
                                label = "art";
                                reg = <0x060000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index 6e45a20aaed934e3d2bc2e4dfee394684c2a1a4a..0f07613d1fc96b6d31729fbcf09c64568bd574ac 100644 (file)
                                reg = <0x060000 0xf80000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
 
 &usb_phy0 {
index 50996e06c7c31099bd81c45567fb3b57cbc7cc32..80874b143fe2e06d814e6aa054c262fa8082c921 100644 (file)
@@ -27,7 +27,7 @@
                read-only;
        };
 
-       uboot: partition@20000 {
+       partition@20000 {
                label = "u-boot";
                reg = <0x020000 0x020000>;
                read-only;
@@ -39,7 +39,7 @@
                compatible = "denx,uimage";
        };
 
-       info: partition@f40000 {
+       partition@f40000 {
                label = "info";
                reg = <0xf40000 0x020000>;
                read-only;
@@ -57,7 +57,7 @@
                };
        };
 
-       config: partition@f60000 {
+       partition@f60000 {
                label = "config";
                reg = <0xf60000 0x050000>;
                read-only;
@@ -69,7 +69,7 @@
                read-only;
        };
 
-       art: partition@ff0000 {
+       partition@ff0000 {
                label = "art";
                reg = <0xff0000 0x010000>;
                read-only;
                        #address-cells = <1>;
                        #size-cells = <1>;
 
+                       cal_art_1000: calibration@1000 {
+                               reg = <0x1000 0x440>;
+                       };
+
                        cal_art_5000: calibration@5000 {
                                reg = <0x5000 0x844>;
                        };
 };
 
 &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";
 };
index 907eda94007e23ac4bdd76550342b289ea0101bd..4006a0231ccbda9856bb271d6d4e229bb82605b6 100644 (file)
                                compatible = "denx,uimage";
                        };
 
-                       info: partition@7e0000 {
+                       partition@7e0000 {
                                label = "info";
                                reg = <0x7e0000 0x010000>;
                                read-only;
                                };
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 &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";
 };
index f78a52a1208ffa075de31ee2bbfad3722f70eb65..74ac0f745ac1546d4564902a0c744784e1b7f3ed 100644 (file)
                                read-only;
                        };
 
-                       info: partition@20000 {
+                       partition@20000 {
                                label = "info";
                                reg = <0x020000 0x010000>;
                                read-only;
                                read-only;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        precal_art_5000: pre-calibration@5000 {
                                                reg = <0x5000 0x2f20>;
                                        };
 };
 
 &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";
 };
index fc7814a97ec5b367caabb36b6f30da918b9b541c..66ae2d1ffd52c7221facb4043dab64b8f922165b 100644 (file)
                                read-only;
                        };
 
-                       info: partition@20000 {
+                       partition@20000 {
                                label = "info";
                                reg = <0x020000 0x010000>;
                                read-only;
                                read-only;
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        precal_art_5000: pre-calibration@5000 {
                                                reg = <0x5000 0x2f20>;
                                        };
 };
 
 &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";
 };
index 611cb8953ed589f2465f00a705e2df08088b4097..05dd95474e8f2fef42bf3e29dbbeb00ed3a6ef76 100644 (file)
                                compatible = "denx,uimage";
                        };
 
-                       info: partition@f00000 {
+                       partition@f00000 {
                                label = "info";
                                reg = <0xf00000 0x0f0000>;
                                read-only;
                                };
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 &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";
 };
index d37fc14b11332ceb1ee4cbf1cc175452050aee61..89b2244ca82879cfe1d480c12c047ae50abf1450 100644 (file)
@@ -39,7 +39,7 @@
                read-only;
        };
 
-       art: partition@50000 {
+       partition@50000 {
                label = "art";
                reg = <0x050000 0x010000>;
                read-only;
                        #address-cells = <1>;
                        #size-cells = <1>;
 
+                       cal_art_1000: calibration@1000 {
+                               reg = <0x1000 0x440>;
+                       };
+
                        cal_art_5000: calibration@5000 {
                                reg = <0x5000 0x844>;
                        };
                };
        };
 
-       info: partition@60000 {
+       partition@60000 {
                label = "info";
                reg = <0x060000 0x020000>;
                read-only;
 };
 
 &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";
 };
index 7968bdbf6da8207c889a56384bff5a520a2ab083..088ef7b63cc2923069bd15ea8b9cfc0dd2f66cf9 100644 (file)
@@ -93,7 +93,7 @@
                        #address-cells = <1>;
                        #size-cells = <1>;
 
-                       uboot: partition@0 {
+                       partition@0 {
                                label = "u-boot";
                                reg = <0x000000 0x080000>;
                                read-only;
                                read-only;
                        };
 
-                       config: partition@e85000 {
+                       partition@e85000 {
                                label = "config";
                                reg = <0xe85000 0x16b000>;
                                read-only;
                                };
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        precal_art_5000: pre-calibration@5000 {
                                                reg = <0x5000 0x2f20>;
                                        };
 &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";
 };
index 25a7b8229b56cfaba1e7b2abba6fb9066e61000d..43f9106a49e76097c2978313e820a28e8d929a53 100644 (file)
@@ -30,7 +30,7 @@
                read-only;
        };
 
-       info: partition@610000 {
+       partition@610000 {
                label = "info";
                reg = <0x610000 0x020000>;
                read-only;
@@ -54,7 +54,7 @@
                read-only;
        };
 
-       art: partition@7f0000 {
+       partition@7f0000 {
                label = "art";
                reg = <0x7f0000 0x010000>;
                read-only;
                        #address-cells = <1>;
                        #size-cells = <1>;
 
+                       cal_art_1000: calibration@1000 {
+                               reg = <0x1000 0x440>;
+                       };
+
                        cal_art_5000: calibration@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";
 };
index 2572901def8bcb7293e8b7498cd9b8d4fb07abdf..5d23a1d972adec312385ab02c0223d0d9e3cde9e 100644 (file)
@@ -18,7 +18,7 @@
                read-only;
        };
 
-       info: partition@20000 {
+       partition@20000 {
                label = "info";
                reg = <0x020000 0x002000>;
                read-only;
@@ -60,7 +60,7 @@
                reg = <0x050000 0x7a0000>;
        };
 
-       art: partition@7f0000 {
+       partition@7f0000 {
                label = "art";
                reg = <0x7f0000 0x010000>;
                read-only;
                        #address-cells = <1>;
                        #size-cells = <1>;
 
+                       cal_art_1000: calibration@1000 {
+                               reg = <0x1000 0x440>;
+                       };
+
                        cal_art_5000: calibration@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";
 };
index 7caa356861008dfee407213fd99694e03acba81e..b22d2bfa35071257e7ac8a718dd7bc1e6dcef976 100644 (file)
@@ -18,7 +18,7 @@
                read-only;
        };
 
-       info: partition@20000 {
+       partition@20000 {
                label = "info";
                reg = <0x020000 0x002000>;
                read-only;
@@ -60,7 +60,7 @@
                reg = <0x050000 0x7a0000>;
        };
 
-       art: partition@7f0000 {
+       partition@7f0000 {
                label = "art";
                reg = <0x7f0000 0x010000>;
                read-only;
                        #address-cells = <1>;
                        #size-cells = <1>;
 
+                       cal_art_1000: calibration@1000 {
+                               reg = <0x1000 0x440>;
+                       };
+
                        cal_art_5000: calibration@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";
 };
index b1d564be155692a394efedac628d3369b1e344e7..50e44457078eeeb1e6dc9f48ca84497533a1066a 100644 (file)
 &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 {
                                read-only;
                        };
 
-                       info: partition@20000 {
+                       partition@20000 {
                                label = "info";
                                reg = <0x020000 0x010000>;
                                read-only;
                                read-only;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        precal_art_5000: pre-calibration@5000 {
                                                reg = <0x5000 0x2f20>;
                                        };
index a44caa0b6b0189432b792498eeedabce70eb83c3..fd0d7af328470eb46ba4979fd3b9a66147b6c336 100644 (file)
@@ -12,7 +12,7 @@
 };
 
 &partitions {
-       uboot: partition@0 {
+       partition@0 {
                label = "u-boot";
                reg = <0x000000 0x010000>;
                read-only;
@@ -42,7 +42,7 @@
                read-only;
        };
 
-       art: partition@7f0000 {
+       partition@7f0000 {
                label = "art";
                reg = <0x7f0000 0x010000>;
                read-only;
                        #address-cells = <1>;
                        #size-cells = <1>;
 
+                       cal_art_1000: calibration@1000 {
+                               reg = <0x1000 0x440>;
+                       };
+
                        cal_art_5000: calibration@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";
 };
index 1e62094c12b605ed58b20539f532231a1c76a07b..cf83407932c331d2df53a79d31d485fbb46b4916 100644 (file)
@@ -42,7 +42,7 @@
                read-only;
        };
 
-       info: partition@7e0000 {
+       partition@7e0000 {
                label = "info";
                reg = <0x7e0000 0x010000>;
                read-only;
@@ -60,7 +60,7 @@
                };
        };
 
-       art: partition@7f0000 {
+       partition@7f0000 {
                label = "art";
                reg = <0x7f0000 0x010000>;
                read-only;
                        #address-cells = <1>;
                        #size-cells = <1>;
 
+                       cal_art_1000: calibration@1000 {
+                               reg = <0x1000 0x440>;
+                       };
+
                        precal_art_5000: pre-calibration@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";
 };
index 5f834542f2ff9b2b00f7763c6682586f57480397..25ad244eeaa543e0f58deade68296dbbf6032038 100644 (file)
@@ -36,7 +36,7 @@
                read-only;
        };
 
-       info: partition@630000 {
+       partition@630000 {
                label = "info";
                reg = <0x630000 0x010000>;
                read-only;
@@ -60,7 +60,7 @@
                read-only;
        };
 
-       art: partition@7f0000 {
+       partition@7f0000 {
                label = "art";
                reg = <0x7f0000 0x010000>;
                read-only;
                        #address-cells = <1>;
                        #size-cells = <1>;
 
+                       cal_art_1000: calibration@1000 {
+                               reg = <0x1000 0x440>;
+                       };
+
                        precal_art_5000: pre-calibration@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";
 };
index 7be23423df51eefc32df37e84be8219001b4dd86..cb9b9f0fa9c1c5bf3a6eb372e13b5aa7df6facc9 100644 (file)
@@ -38,7 +38,7 @@
                read-only;
        };
 
-       info: partition@7e0000 {
+       partition@7e0000 {
                label = "info";
                reg = <0x7e0000 0x010000>;
                read-only;
@@ -56,7 +56,7 @@
                };
        };
 
-       art: partition@7f0000 {
+       partition@7f0000 {
                label = "art";
                reg = <0x7f0000 0x010000>;
                read-only;
                        #address-cells = <1>;
                        #size-cells = <1>;
 
+                       cal_art_1000: calibration@1000 {
+                               reg = <0x1000 0x440>;
+                       };
+
                        precal_art_5000: pre-calibration@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";
 };
index dac0da9fdc925b8cd9f709c51d031db84b537329..895bd0fc0ff407fa8c12a068d5a6e71f46bce4b6 100644 (file)
                                read-only;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 };
 
 &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";
 };
index 6db4653f69fe6cdf284c3715aa912f2da5977700..39956c5a0680bd79c880a232a3a814849b658950 100644 (file)
                                read-only;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 };
 
 &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";
 };
index 48d8d9c83e9963e4a294e4091baf65fc8eaaf6a3..961b9faf9fc1429286823e46e9cd8ec6c7db2e06 100644 (file)
@@ -93,7 +93,7 @@
                                read-only;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                                reg = <0x0 0x6>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index 27e3436f8f215df2a761df7b2e6a433532198a3c..cff567e497f41329c12ccf1653abb50b78ceea3c 100644 (file)
                                read-only;
                        };
 
-                       art: partition@60000 {
+                       partition@60000 {
                                label = "art";
                                reg = <0x60000 0x10000>;
                                read-only;
                                                reg = <0x0 0x6>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        precal_art_5000: pre-calibration@5000 {
                                                reg = <0x5000 0x2f20>;
                                        };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
 
 &pcie {
index 2cc227a2dad674acc1efa7924bdfff2c5b515bb9..82a22ca5dcbb0d85e73b9ed7804542575790dd34 100644 (file)
@@ -92,7 +92,7 @@
                                reg = <0x050000 0xfa0000>;
                        };
 
-                       art: partition@ff0000 {
+                       partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
                                                reg = <0x0 0x6>;
                                        };
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
                                        cal_art_5000: calibration@5000 {
                                                reg = <0x5000 0x844>;
                                        };
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
 };
index aaca7fa531b9fd82b3a0642f39f45e6f291def98..04aa4bc5f9e3b7685bc0ceb27d3725c4da0999d4 100644 (file)
                                };
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
 &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";
 };
index 89dff4340569899a5b4e46c8a3bc1e1a49044ce5..77c4a88c9f7354c7d5dfde2f7de9790d250c3a5b 100644 (file)
                                reg = <0x020000 0x3d0000>;
                        };
 
-                       art: partition@3f0000 {
+                       partition@3f0000 {
                                label = "art";
                                reg = <0x3f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@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";
 };