ath79: ar: convert to nvmem-layout
authorRosen Penev <rosenp@gmail.com>
Sun, 26 Nov 2023 03:31:17 +0000 (19:31 -0800)
committerRosen Penev <rosenp@gmail.com>
Sun, 26 Nov 2023 05:34:18 +0000 (21:34 -0800)
Will allow removing deprecated mac-address-increment.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
120 files changed:
target/linux/ath79/dts/ar7161_aruba_ap-105.dts
target/linux/ath79/dts/ar7161_aruba_ap-175.dts
target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts
target/linux/ath79/dts/ar7161_jjplus_ja76pf2.dts
target/linux/ath79/dts/ar7161_meraki_mr16.dts
target/linux/ath79/dts/ar7161_netgear_wndap360.dts
target/linux/ath79/dts/ar7161_netgear_wndr3700-v2.dts
target/linux/ath79/dts/ar7161_netgear_wndr3700.dts
target/linux/ath79/dts/ar7161_netgear_wndr3800.dts
target/linux/ath79/dts/ar7161_netgear_wndr3800ch.dts
target/linux/ath79/dts/ar7161_netgear_wndrmac-v1.dts
target/linux/ath79/dts/ar7161_netgear_wndrmac-v2.dts
target/linux/ath79/dts/ar7161_ruckus_gd11.dtsi
target/linux/ath79/dts/ar7161_ruckus_zf7341.dts
target/linux/ath79/dts/ar7161_ruckus_zf7351.dts
target/linux/ath79/dts/ar7161_ruckus_zf7363.dts
target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts
target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts
target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts
target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts
target/linux/ath79/dts/ar7240_ruckus_zf7025.dts
target/linux/ath79/dts/ar7240_tplink.dtsi
target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
target/linux/ath79/dts/ar7241_netgear_wnr2200-16m.dts
target/linux/ath79/dts/ar7241_netgear_wnr2200-8m.dts
target/linux/ath79/dts/ar7241_tplink.dtsi
target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts
target/linux/ath79/dts/ar7241_ubnt_unifi-ap-outdoor-plus.dts
target/linux/ath79/dts/ar7241_ubnt_unifi-ap.dtsi
target/linux/ath79/dts/ar7242_buffalo_bhr-4grv.dts
target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts
target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts
target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts
target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts
target/linux/ath79/dts/ar7242_meraki_mr12.dts
target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts
target/linux/ath79/dts/ar7242_ubnt_edgeswitch-5xp.dts
target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts
target/linux/ath79/dts/ar7242_ubnt_sw.dtsi
target/linux/ath79/dts/ar724x_ubnt_xm.dtsi
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_alfa-network_ap121f.dtsi
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_lan-turtle.dtsi
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_ruckus_zf7321.dts
target/linux/ath79/dts/ar9342_ubnt_aircube-ac.dts
target/linux/ath79/dts/ar9342_ubnt_wa.dtsi
target/linux/ath79/dts/ar9342_ubnt_xw.dtsi
target/linux/ath79/dts/ar9342_zyxel_nwa11xx.dtsi
target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts
target/linux/ath79/dts/ar9344_alfa-network_n5q.dts
target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts
target/linux/ath79/dts/ar9344_atheros_db120.dts
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_dlink_dir-8x5.dtsi
target/linux/ath79/dts/ar9344_engenius_eap600.dts
target/linux/ath79/dts/ar9344_engenius_ecb600.dts
target/linux/ath79/dts/ar9344_netgear_pgzng1.dts
target/linux/ath79/dts/ar9344_netgear_r6100.dts
target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
target/linux/ath79/dts/ar9344_ocedo_raccoon.dts
target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi
target/linux/ath79/dts/ar9344_openmesh_om5p-an.dts
target/linux/ath79/dts/ar9344_openmesh_om5p.dts
target/linux/ath79/dts/ar9344_pcs_cap324.dts
target/linux/ath79/dts/ar9344_pcs_cr5000.dts
target/linux/ath79/dts/ar9344_qxwlan_e750a-v4-16m.dts
target/linux/ath79/dts/ar9344_qxwlan_e750a-v4-8m.dts
target/linux/ath79/dts/ar9344_qxwlan_e750g-v8-16m.dts
target/linux/ath79/dts/ar9344_qxwlan_e750g-v8-8m.dts
target/linux/ath79/dts/ar9344_qxwlan_e750x.dtsi
target/linux/ath79/dts/ar9344_ruckus_zf7372.dts
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-wdrxxxx.dtsi
target/linux/ath79/dts/ar9344_tplink_tl-wr841hp-v2.dts
target/linux/ath79/dts/ar9344_ubnt_unifi-ap-pro.dts
target/linux/ath79/dts/ar9344_watchguard_ap100.dts
target/linux/ath79/dts/ar9344_watchguard_ap200.dts
target/linux/ath79/dts/ar9344_winchannel_wb2000.dts
target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts
target/linux/ath79/dts/ar934x_ruckus_zf73xx.dtsi

index 32d403fe6cd06dbac79afcd6e95795dfd64b3c0f..c8510a89441c4f5887270cb9fff6c75bb06acf46 100644 (file)
 
                        hwinfo: partition@fe0000 {
                                reg = <0xfe0000 0x10000>;
-                               compatible = "nvmem-cells";
                                label = "hwinfo";
                                read-only;
 
index dd29a687ba0e1d3c387cc2c7a5044115726be2ac..14b5edb0967f0efacc4fb2f077f67336fc11c53f 100644 (file)
                                label = "hwinfo";
                                reg = <0xfe0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_hwinfo_1c: macaddr@1c {
+                                               reg = <0x1c 0x6>;
+                                       };
+                               };
                        };
 
                        partition@ff0000 {
        };
 };
 
-&hwinfo {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_hwinfo_1c: macaddr@1c {
-               reg = <0x1c 0x6>;
-       };
-};
-
 &i2c0 {
        gpio_ext: gpio@21 {
                status = "okay";
index 6e1ba2d47e4c5ddc9e893e2e4a01fc61d33bef65..26147a2c80807b13da75416dfc0ede45fb44316f 100644 (file)
                                label = "art";
                                reg = <0x0050000 0x0010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_120c: macaddr@120c {
+                                               reg = <0x120c 0x6>;
+                                       };
+
+                                       macaddr_art_520c: macaddr@520c {
+                                               reg = <0x520c 0x6>;
+                                       };
+                               };
                        };
 
                        partition@60000 {
 
        phy-handle = <&phy4>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_120c: macaddr@120c {
-               reg = <0x120c 0x6>;
-       };
-
-       macaddr_art_520c: macaddr@520c {
-               reg = <0x520c 0x6>;
-       };
-};
index bdb678298d73eedeed4c28ec92a52feeb0ed0e03..b62111c110e68a03bcd23cc20170c11021486e18 100644 (file)
                        };
 
                        partition@660000 {
-                               compatible = "nvmem-cells";
                                label = "caldata";
                                reg = <0x660000 0x010000>;
                                read-only;
index 7f2a118b8457d4baa2f89ce07aa9e9c531cbc958..2d21a54fa92b8e8be5c3b38683f89a0e0dc59dfc 100644 (file)
                                label = "Atheros Board Data";
                                reg = <0xff0000 0x10000>;
                                read-only;
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
 
-                               macaddr_wan: macaddr@1000 {
-                                       reg = <0x1000 0x6>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_wan: macaddr@1000 {
+                                               reg = <0x1000 0x6>;
+                                       };
 
-                               macaddr_lan: macaddr@1006 {
-                                       reg = <0x1006 0x6>;
+                                       macaddr_lan: macaddr@1006 {
+                                               reg = <0x1006 0x6>;
+                                       };
                                };
                        };
                };
index 7a19da82e36ee889b92446e512278d7a2f122e50..110f1ba2df16d6b57247ce29aded54a7dae02ad4 100644 (file)
                                label = "config";
                                reg = <0x80000 0x20000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_66: macaddr@66 {
+                                               reg = <0x66 0x6>;
+                                       };
+                               };
                        };
 
                        partition@a0000 {
                };
        };
 };
-
-&config {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_config_66: macaddr@66 {
-               reg = <0x66 0x6>;
-       };
-};
index 21dc423c357632c272407d898842039f088ec369..7baae2450b9e09954834d150db067e606e769123 100644 (file)
                                reg = <0x7f0000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_art_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
-
-                               macaddr_art_120c: macaddr@120c {
-                                       reg = <0x120c 0x6>;
-                               };
-
-                               macaddr_art_520c: macaddr@520c {
-                                       reg = <0x520c 0x6>;
-                               };
-
-                               calibration_art_1000: calibration@1000 {
-                                       reg = <0x1000 0xeb8>;
-                               };
-
-                               calibration_art_5000: calibration@5000 {
-                                       reg = <0x5000 0xeb8>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_120c: macaddr@120c {
+                                               reg = <0x120c 0x6>;
+                                       };
+
+                                       macaddr_art_520c: macaddr@520c {
+                                               reg = <0x520c 0x6>;
+                                       };
+
+                                       calibration_art_1000: calibration@1000 {
+                                               reg = <0x1000 0xeb8>;
+                                       };
+
+                                       calibration_art_5000: calibration@5000 {
+                                               reg = <0x5000 0xeb8>;
+                                       };
                                };
                        };
                };
index 351d5e03647eeae6c5650446d913dc34c9ede94c..5b44505ce2be3cd01a465e5c4079a00763084794 100644 (file)
                label = "art";
                reg = <0xff0000 0x010000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_art_0: macaddr@0 {
+                               reg = <0x0 0x6>;
+                       };
+
+                       macaddr_art_6: macaddr@6 {
+                               reg = <0x6 0x6>;
+                       };
+
+                       macaddr_art_c: macaddr@c {
+                               reg = <0xc 0x6>;
+                       };
+
+                       cal_art_1000: cal@1000 {
+                               reg = <0x1000 0xeb8>;
+                       };
+
+                       cal_art_5000: cal@5000 {
+                               reg = <0x5000 0xeb8>;
+                       };
+               };
        };
 };
 
        nvmem-cells = <&macaddr_art_6>;
        nvmem-cell-names = "mac-address";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-
-       macaddr_art_c: macaddr@c {
-               reg = <0xc 0x6>;
-       };
-
-       cal_art_1000: cal@1000 {
-               reg = <0x1000 0xeb8>;
-       };
-
-       cal_art_5000: cal@5000 {
-               reg = <0x5000 0xeb8>;
-       };
-};
index eedd375cc9f32b377cf321e44c453d4f328d5e26..6b89fcd0ff9bc51186dc46466b7c15d2f7710ca3 100644 (file)
                label = "art";
                reg = <0x7f0000 0x010000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_art_0: macaddr@0 {
+                               reg = <0x0 0x6>;
+                       };
+
+                       macaddr_art_6: macaddr@6 {
+                               reg = <0x6 0x6>;
+                       };
+
+                       macaddr_art_c: macaddr@c {
+                               reg = <0xc 0x6>;
+                       };
+
+                       cal_art_1000: cal@1000 {
+                               reg = <0x1000 0xeb8>;
+                       };
+
+                       cal_art_5000: cal@5000 {
+                               reg = <0x5000 0xeb8>;
+                       };
+               };
        };
 };
 
        nvmem-cells = <&macaddr_art_6>;
        nvmem-cell-names = "mac-address";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-
-       macaddr_art_c: macaddr@c {
-               reg = <0xc 0x6>;
-       };
-
-       cal_art_1000: cal@1000 {
-               reg = <0x1000 0xeb8>;
-       };
-
-       cal_art_5000: cal@5000 {
-               reg = <0x5000 0xeb8>;
-       };
-};
index 487b00b0dd0c697a665274c22bb05fe1cb09c9d4..cf23786ae3124b3c8a586777be4dc1274c5b4734 100644 (file)
                label = "art";
                reg = <0xff0000 0x010000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_art_0: macaddr@0 {
+                               reg = <0x0 0x6>;
+                       };
+
+                       macaddr_art_6: macaddr@6 {
+                               reg = <0x6 0x6>;
+                       };
+
+                       macaddr_art_c: macaddr@c {
+                               reg = <0xc 0x6>;
+                       };
+
+                       cal_art_1000: cal@1000 {
+                               reg = <0x1000 0xeb8>;
+                       };
+
+                       cal_art_5000: cal@5000 {
+                               reg = <0x5000 0xeb8>;
+                       };
+               };
        };
 };
 
        nvmem-cells = <&macaddr_art_6>;
        nvmem-cell-names = "mac-address";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-
-       macaddr_art_c: macaddr@c {
-               reg = <0xc 0x6>;
-       };
-
-       cal_art_1000: cal@1000 {
-               reg = <0x1000 0xeb8>;
-       };
-
-       cal_art_5000: cal@5000 {
-               reg = <0x5000 0xeb8>;
-       };
-};
index 0c2eadae5c18bca0f5baae8f2f4671ab719d2367..72b169fc7693410180aa3d37996e5a05d0abb6da 100644 (file)
                label = "art";
                reg = <0xff0000 0x010000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_art_0: macaddr@0 {
+                               reg = <0x0 0x6>;
+                       };
+
+                       macaddr_art_6: macaddr@6 {
+                               reg = <0x6 0x6>;
+                       };
+
+                       macaddr_art_c: macaddr@c {
+                               reg = <0xc 0x6>;
+                       };
+
+                       cal_art_1000: cal@1000 {
+                               reg = <0x1000 0xeb8>;
+                       };
+
+                       cal_art_5000: cal@5000 {
+                               reg = <0x5000 0xeb8>;
+                       };
+               };
        };
 };
 
        nvmem-cells = <&macaddr_art_6>;
        nvmem-cell-names = "mac-address";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-
-       macaddr_art_c: macaddr@c {
-               reg = <0xc 0x6>;
-       };
-
-       cal_art_1000: cal@1000 {
-               reg = <0x1000 0xeb8>;
-       };
-
-       cal_art_5000: cal@5000 {
-               reg = <0x5000 0xeb8>;
-       };
-};
index 88c3170c6e8d7d3e3e50c8244a279bd54226c82a..2e141d07e573800f3aca6f3f9bcf388a9c35a445 100644 (file)
                label = "art";
                reg = <0xff0000 0x010000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_art_0: macaddr@0 {
+                               reg = <0x0 0x6>;
+                       };
+
+                       macaddr_art_6: macaddr@6 {
+                               reg = <0x6 0x6>;
+                       };
+
+                       macaddr_art_c: macaddr@c {
+                               reg = <0xc 0x6>;
+                       };
+
+                       cal_art_1000: cal@1000 {
+                               reg = <0x1000 0xeb8>;
+                       };
+
+                       cal_art_5000: cal@5000 {
+                               reg = <0x5000 0xeb8>;
+                       };
+               };
        };
 };
 
        nvmem-cells = <&macaddr_art_6>;
        nvmem-cell-names = "mac-address";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-
-       macaddr_art_c: macaddr@c {
-               reg = <0xc 0x6>;
-       };
-
-       cal_art_1000: cal@1000 {
-               reg = <0x1000 0xeb8>;
-       };
-
-       cal_art_5000: cal@5000 {
-               reg = <0x5000 0xeb8>;
-       };
-};
index 0536ecb05332017ec13e874026d7f757a0107f62..83b8f216cc45c2ffd5e4405ac22419c1d9e84aeb 100644 (file)
                label = "art";
                reg = <0xff0000 0x010000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_art_0: macaddr@0 {
+                               reg = <0x0 0x6>;
+                       };
+
+                       macaddr_art_6: macaddr@6 {
+                               reg = <0x6 0x6>;
+                       };
+
+                       macaddr_art_c: macaddr@c {
+                               reg = <0xc 0x6>;
+                       };
+
+                       cal_art_1000: cal@1000 {
+                               reg = <0x1000 0xeb8>;
+                       };
+
+                       cal_art_5000: cal@5000 {
+                               reg = <0x5000 0xeb8>;
+                       };
+               };
        };
 };
 
        nvmem-cells = <&macaddr_art_6>;
        nvmem-cell-names = "mac-address";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-
-       macaddr_art_c: macaddr@c {
-               reg = <0xc 0x6>;
-       };
-
-       cal_art_1000: cal@1000 {
-               reg = <0x1000 0xeb8>;
-       };
-
-       cal_art_5000: cal@5000 {
-               reg = <0x5000 0xeb8>;
-       };
-};
index e97e31e58ec656603e04916e4433f2574b91e549..065068571cd85c95e0a239edf27f2a67e8a42447 100644 (file)
 &usb_phy {
        status = "okay";
 };
-
-&board_data {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_bdata_60: macaddr@60 {
-               reg = <0x60 0x6>;
-       };
-
-       macaddr_bdata_66: macaddr@66 {
-               reg = <0x66 0x6>;
-       };
-
-       macaddr_bdata_76: macaddr@76 {
-               reg = <0x76 0x6>;
-       };
-};
index 17735e596f54f7e82b424513cb1c07e1c1f15ddc..eacda20c61a41ed03249e52f881feb00458ebbf5 100644 (file)
@@ -6,3 +6,23 @@
        model = "Ruckus ZoneFlex 7341[-U]";
        compatible = "ruckus,zf7341", "qca,ar7161";
 };
+
+&board_data {
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               macaddr_bdata_60: macaddr@60 {
+                       reg = <0x60 0x6>;
+               };
+
+               macaddr_bdata_66: macaddr@66 {
+                       reg = <0x66 0x6>;
+               };
+
+               macaddr_bdata_76: macaddr@76 {
+                       reg = <0x76 0x6>;
+               };
+       };
+};
index 37ea305790083ad298c30b78c4657d1eccb5aa2e..adaeb18eda16ca3d68307baa0cf7edf462b7ce41 100644 (file)
                gpio-hog;
        };
 };
+
+&board_data {
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               macaddr_bdata_60: macaddr@60 {
+                       reg = <0x60 0x6>;
+               };
+
+               macaddr_bdata_66: macaddr@66 {
+                       reg = <0x66 0x6>;
+               };
+
+               macaddr_bdata_76: macaddr@76 {
+                       reg = <0x76 0x6>;
+               };
+       };
+};
index 4ece56dd0a0422153425e9c18c508715187200ca..723e4d9a3b12e998f8be059f0907aab50d24de36 100644 (file)
 };
 
 &board_data {
-       macaddr_bdata_6c: macaddr@6c {
-               reg = <0x6c 0x6>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               macaddr_bdata_60: macaddr@60 {
+                       reg = <0x60 0x6>;
+               };
+
+               macaddr_bdata_66: macaddr@66 {
+                       reg = <0x66 0x6>;
+               };
+
+               macaddr_bdata_6c: macaddr@6c {
+                       reg = <0x6c 0x6>;
+               };
+
+               macaddr_bdata_76: macaddr@76 {
+                       reg = <0x76 0x6>;
+               };
        };
 };
index cf51078bc32ba5f5e0904cc46c9087853d25aa61..1285cdb60987b864936b7428f54145ad9b5355f1 100644 (file)
                                reg = <0x3f0000 0x10000>;
                                label = "art";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_120c: macaddr@120c {
+                                               reg = <0x120c 0x6>;
+                                       };
+                               };
                        };
                };
        };
                pinctrl-single,bits = <0x0 0x0 0xf8>;
        };
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_120c: macaddr@120c {
-               reg = <0x120c 0x6>;
-       };
-};
index 9a233c836b7c25908e2e2f559f9898353f3ee412..ec3a3718506d0649e1066f105bf29a3839d5308d 100644 (file)
 };
 
 &art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
+               macaddr_art_0: macaddr@0 {
+                       reg = <0x0 0x6>;
+               };
        };
 };
index 91b72cf1db8961fd133af5748876718ac5b40bf1..d1cdf56d18c70901964b95d53071dbf3605ff86f 100644 (file)
                                label = "art";
                                reg = <0x3f0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
                gpio-controller;
        };
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};
index 9bae95b5575d54ad5b267c71df9318cdfbb61054..d069f1423514936eb17f1d6ceeeb83baa0ebc8fb 100644 (file)
                                reg = <0x3f0000 0x10000>;
                                label = "art";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
                gpio-controller;
        };
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};
index a66d91401509ef8daf843e4a27347dd7ef3a7bae..17a57446618712256639308e7a770702b466bf8a 100644 (file)
                                reg = <0xfc0000 0x040000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_art_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
-
-                               macaddr_art_6: macaddr@6 {
-                                       reg = <0x6 0x6>;
-                               };
-
-                               calibration_art_1000: calibration@1000 {
-                                       reg = <0x1000 0x440>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+
+                                       calibration_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };
index 9e0671d638c0c7e08c97bbd21c51d3685f083ee1..f5d0a9e3b074412878ffba473fd9af410b338722 100644 (file)
                                reg = <0xfc0000 0x40000>;
                                label = "board-data";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_board_data_60: macaddr@60 {
+                                               reg = <0x60 0x6>;
+                                       };
+
+                                       macaddr_board_data_66: macaddr@66 {
+                                               reg = <0x66 0x6>;
+                                       };
+
+                                       macaddr_board_data_6c: macaddr@6c {
+                                               reg = <0x6c 0x6>;
+                                       };
+                               };
                        };
                };
        };
                nvmem-cell-names = "mac-address";
        };
 };
-
-&board_data {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_board_data_60: macaddr@60 {
-               reg = <0x60 0x6>;
-       };
-
-       macaddr_board_data_66: macaddr@66 {
-               reg = <0x66 0x6>;
-       };
-
-       macaddr_board_data_6c: macaddr@6c {
-               reg = <0x6c 0x6>;
-       };
-};
index 60cd38c220cb4fdbeae61ccefda4446e2ca250da..959032640a850016ad01f42a00119fb065eeedc3 100644 (file)
                                reg = <0x0 0x20000>;
                                label = "u-boot";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
                pinctrl-single,bits = <0x0 0x0 0xf8>;
        };
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};
index 290871d648e668e32602dd7bdd7032c3b5f2b8b6..61886c6589fcbc4bbf3de69a02e84588860fa573 100644 (file)
                                label = "art";
                                reg = <0x3f0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
                gpio-controller;
        };
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};
index f5c060d78064f8d2aa8f32b32f6fd55d975d671a..42942834cf8c361928e6ab3d99ab038e1b08ea66 100644 (file)
                label = "art";
                reg = <0xff0000 0x10000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_art_0: macaddr@0 {
+                               reg = <0x0 0x6>;
+                       };
+
+                       macaddr_art_6: macaddr@6 {
+                               reg = <0x6 0x6>;
+                       };
+               };
        };
 };
 
        nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};
index e47336e4d29b19eb243ac2d87b1dd787de5d246f..95217f6a7b9272ef6477c5b2f767e942be500d04 100644 (file)
                label = "art";
                reg = <0x7f0000 0x10000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_art_0: macaddr@0 {
+                               reg = <0x0 0x6>;
+                       };
+
+                       macaddr_art_6: macaddr@6 {
+                               reg = <0x6 0x6>;
+                       };
+               };
        };
 };
 
        nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};
index 0861cc623226084ec0c68eea4a8e057304ab0357..fe3f047dc1a9e2bee7f2bbd4dc34e678896c336b 100644 (file)
                                reg = <0x0 0x20000>;
                                label = "u-boot";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};
index 6ee7d9ec4f9959e6f64d1aead1768e1875f19e3d..02b96912ba9a9dcb64db6b235f8f35ae500be91f 100644 (file)
                                reg = <0x0 0x20000>;
                                label = "u-boot";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
        nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};
index 3f965ec9deaea0c925e06ba3068360d41f3f0cd6..e3c8f2a6099a17312f664917132cd85143e049af 100644 (file)
                                reg = <0xff0000 0x10000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_art_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
-
-                               macaddr_art_6: macaddr@6 {
-                                       reg = <0x6 0x6>;
-                               };
-
-                               calibration_art_1000: calibration@1000 {
-                                       reg = <0x1000 0xeb8>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+
+                                       calibration_art_1000: calibration@1000 {
+                                               reg = <0x1000 0xeb8>;
+                                       };
                                };
                        };
                };
index 02166a26eb8610e6fba9f0a5cf2eaead030f92aa..d9c7336f91135cda884ba27d141339269732c062 100644 (file)
                                reg = <0x7f0000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_art_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
-
-                               calibration_art_1000: calibration@1000 {
-                                       reg = <0x1000 0x440>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       calibration_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };
index dde91295052f7ae1fb64869433ea9d9e0f79f087..c17a8df6fedbd4107b68ac381ebf4cb3256105b6 100644 (file)
 };
 
 &art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
+               macaddr_art_0: macaddr@0 {
+                       reg = <0x0 0x6>;
+               };
        };
 };
index 4a2f749cc4547fda789bd4bd99d048bb6af549a5..ac4c096961badf87e6bbbdf86e5f95c27c46e67e 100644 (file)
                                label = "art";
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_art_120c: macaddr@120c {
-                                       reg = <0x120c 0x6>;
-                               };
-
-                               calibration_art_1000: calibration@1000 {
-                                       reg = <0x1000 0xeb8>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_120c: macaddr@120c {
+                                               reg = <0x120c 0x6>;
+                                       };
+
+                                       calibration_art_1000: calibration@1000 {
+                                               reg = <0x1000 0xeb8>;
+                                       };
                                };
                        };
 
index 84d029b5dce2ff28816200c90c973bf898a88a2e..81290479b086c902862612e60fff6a7016d2056a 100644 (file)
 };
 
 &art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       macaddr_art_1002: macaddr@1002 {
-               reg = <0x1002 0x6>;
+               macaddr_art_1002: macaddr@1002 {
+                       reg = <0x1002 0x6>;
+               };
        };
 };
index 7458685802b835260a4ad2d51745be96927a3c59..361d70eb39c5873bcf4d0195476b628d87c7916c 100644 (file)
 };
 
 &art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
+               macaddr_art_0: macaddr@0 {
+                       reg = <0x0 0x6>;
+               };
        };
 };
index f1f86019dd9bfef9444ef1e3ec08dda1acdeab4f..2de6dab20dffb13a95afb923ec3be63f4e3bf761 100644 (file)
 };
 
 &art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
+               macaddr_art_0: macaddr@0 {
+                       reg = <0x0 0x6>;
+               };
        };
 };
index 42b4966e744b75883f548238633d51a74ea5a3a2..070cea1217dbfe553a420d7f7b35069b2e2facbc 100644 (file)
                                label = "config";
                                reg = <0x80000 0x20000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_66: macaddr@66 {
+                                               reg = <0x66 0x6>;
+                                       };
+                               };
                        };
 
                        partition@a0000 {
                };
        };
 };
-
-&config {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_config_66: macaddr@66 {
-               reg = <0x66 0x6>;
-       };
-};
index e250f2a5b45db8f0f125cb45b5fe9ff2fe8d31bc..8df1fdb4ddbe0870e134c6607f6593cd56fb7606 100644 (file)
                                label = "u-boot";
                                reg = <0x000000 0x020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: cal@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
                full-duplex;
        };
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       cal_art_1000: cal@1000 {
-               reg = <0x1000 0x440>;
-       };
-};
index b353e76028814253ba8bab1d395b7f384fba37d2..3d8f56a856dced779a8d94a274fc4ba5eaff2df5 100644 (file)
                full-duplex;
        };
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};
index 2ee7ab56c5a6c81df47fd568e4d1b1292b96fe03..d5625fefce0aecc6be190e08abdbf1d5f3b1b678 100644 (file)
                full-duplex;
        };
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};
index 0268146b061503d1d3b4b2ffebe0816717bfd671..9d4ab231ccf1bd7ec37d994ea48917d8b9d9238c 100644 (file)
                                reg = <0x7f0000 0x010000>;
                                label = "art";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
        nvmem-cells = <&macaddr_art_6>;
        nvmem-cell-names = "mac-address";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};
index 341d0bad0d6f700abfc4bbee69c776ed21839c93..d9b01e17e37088b67d66677e1654cf2ee6dd368e 100644 (file)
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
        nvmem-cells = <&macaddr_art_6>;
        nvmem-cell-names = "mac-address";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};
index ac3af134577fa270b8912ee4abca43b1d053bf28..0eb38b5712effa99d8908bb25606cc251d0dbbab 100644 (file)
                                label = "art";
                                reg = <0x1fe0000 0x020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_1120c: macaddr@1120c {
+                                               reg = <0x1120c 0x6>;
+                                       };
+                               };
                        };
                };
        };
 &usb_phy {
        status = "okay";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_1120c: macaddr@1120c {
-               reg = <0x1120c 0x6>;
-       };
-};
index fd4a6c7a4d34c764d4f12450e3434b14238376c7..476f3e18a3f45f20624c54150aa426758d78cdc1 100644 (file)
                                label = "u-boot";
                                reg = <0x000000 0x020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        partition@1 {
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};
index 6eb2a0acb5f87200db54446b6bfb71a919fc91ff..a4d19ce970a1c992b0225594a9828cc0977bd724 100644 (file)
                                label = "u-boot";
                                reg = <0x000000 0x020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};
index 106ca56e7ed69688de618423822ca8c830b8217a..41e53e1fc8d921069e029423cb61badd56a6ab45 100644 (file)
                                label = "u-boot";
                                reg = <0x000000 0x20000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};
index b31d0f961b3ef1f2380d051046ef64c937e2952d..7401cd053a70a6091523d367ece2ae09df460ff3 100644 (file)
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
                };
        };
        nvmem-cells = <&macaddr_art_0>;
        nvmem-cell-names = "mac-address";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};
index e010e5cad0c133a402ecaa05ae68b34ad6637ef9..a7fd10bd7320668dd48714a766b0aeafb5757237 100644 (file)
                                label = "ART";
                                reg = <0xfc0000 0x040000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};
index 5383d6588477b3bc3816637339372d5e9001f33b..a2665519f4622403748bcb6eb82a19e87d265823 100644 (file)
                                label = "art";
                                reg = <0x050000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_2: macaddr@2 {
+                                               reg = <0x2 0x6>;
+                                       };
+
+                                       macaddr_art_1002: macaddr@1002 {
+                                               reg = <0x1002 0x6>;
+                                       };
+                               };
                        };
 
                        partition@60000 {
        nvmem-cells = <&macaddr_art_2>;
        nvmem-cell-names = "mac-address";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_2: macaddr@2 {
-               reg = <0x2 0x6>;
-       };
-
-       macaddr_art_1002: macaddr@1002 {
-               reg = <0x1002 0x6>;
-       };
-};
index 5801044f4e8202da2ebd8ea44a1e89a7f6ba6129..f2bd0541c18506607aa39e6050608ee2ddc9ec79 100644 (file)
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
                };
        };
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};
index d99e0a422a70471b6d360fd35e2b3c44e331d86b..f786f425f05abf1a7374bacb8df0743b40ded65d 100644 (file)
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};
index 2be7cdb05d59a1d928aff8780ee4cc730220be29..98de255332d6f9d8a65bde3caa3f2f384d0cb7f0 100644 (file)
                                reg = <0x040000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               cal_art_1000: cal@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
-
-                               macaddr_art_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
-
-                               macaddr_art_1002: macaddr@1002 {
-                                       reg = <0x1002 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: cal@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_1002: macaddr@1002 {
+                                               reg = <0x1002 0x6>;
+                                       };
                                };
                        };
 
index 402fca80a1eacb63db0a3681953641393930891e..5a96d50940283f49d8b116698a15f2647c20b443 100644 (file)
                        art: art@ff0000 {
                                reg = <0xff0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
                };
        };
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};
index 0d3b7d64101bb1a69cdb585cd05749f21d1c23d2..eae6be300471541ed461434283a2fed274afaef7 100644 (file)
                                reg = <0x0 0x20000>;
                                label = "u-boot";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};
index 91b7cc0c1c43fe73f23e612aad219487b00d88cf..62d0acbf5d322b73ba17a9a3cb6ad888ce4765a0 100644 (file)
                                reg = <0x0 0x20000>;
                                label = "u-boot";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};
index e5460b299df17bcd446863481473e14871ec631b..211c565c247fa874f482a6d85e5a2b75b7f58bad 100644 (file)
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
                };
        };
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};
index 6f332dd99b3aedd28b3d4c9d77c9355e3bf27c80..541b73850a059930c86e9c4d0d523d2636b53a10 100644 (file)
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
                };
        };
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};
index 69d974eb53843234ccf62b29bd379fba3db81691..32ff360e893d4684d46a87fc0a03d97db4040949 100644 (file)
                                label = "u-boot";
                                reg = <0x000000 0x020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
 &usb_phy {
        status = "okay";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};
index 0502d5d14ce26f44aac06ea7dc9ed8c10d995cf1..5701dff64c4c7e3a8f94a6e922425dff3d2d6cd6 100644 (file)
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};
index fa000ab90c7ced443c8e0bd032375db8bed02472..3751374af679fb50f99189ecfa8225727c5c84ce 100644 (file)
@@ -77,7 +77,6 @@
                        };
 
                        bdinfo: partition@10000 {
-                               compatible = "nvmem-cells";
                                reg = <0x10000 0x10000>;
                                label = "bdinfo";
                                read-only;
index 09e42341946e872fdd013cde49280cf45bd442c7..f1bb5cbd74c29820db74f5931c7dfa252b798ee6 100644 (file)
                                label = "u-boot";
                                reg = <0x000000 0x020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};
index 58ef4ab0910cd22fe220c15f72ab4d3393ffbd57..4868ba2fa0e4e9dedccbd748a9f690a838b0fd92 100644 (file)
                                reg = <0x0 0x20000>;
                                label = "u-boot";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        firmware: partition@20000 {
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};
index f438567e52c83f869561a1ae012079fdba89bd04..61cbb1aae28247aaa1ff66d27862f260f9c138b0 100644 (file)
                                reg = <0x0 0x20000>;
                                label = "u-boot";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        firmware: partition@20000 {
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};
index 26004c1cfd6724f451d07d9aae2bb5ee62c6b790..ba1daa4fb880a1288a902966647db6bcaf28a736 100644 (file)
                                label = "config";
                                reg = <0x20000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
 
                        art: partition@30000 {
        nvmem-cell-names = "mac-address";
        mac-address-increment = <2>;
 };
-
-&config {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_config_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};
index c23e5dac5165d1de4da7300e01228ee19f4891fa..7a1a577ed7fed74a7581c1570fd112381a0da0ac 100644 (file)
                                label = "u-boot";
                                reg = <0x000000 0x020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};
index b0f24bbfa705d462b3db72aaea9eb55339fd119a..b07f9a7820659c4bfd1afc6c8506b5c305ad0f20 100644 (file)
                                label = "u-boot";
                                reg = <0x000000 0x020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};
index 5fda458fbc34e7b9e43ec818ae4597b95b37622a..a8608a77e1949ecc69e8f735cea2b08f14a545d1 100644 (file)
                                reg = <0x0 0x20000>;
                                label = "u-boot";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};
index 61ef9fb99f081add80a03ba070932d56e8632693..cd6da59b3dca747fa99e0fe7935143aa383352fd 100644 (file)
                                reg = <0x0 0x20000>;
                                label = "u-boot";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};
index 4d3b1dba1d6ff9b7c98a1c9cd9155f5555f9332e..bffe35860256475776bec44aa3218faf1b120275 100644 (file)
                                reg = <0x0 0x20000>;
                                label = "u-boot";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        firmware: partition@20000 {
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};
index 4a993c9301209e4ed7cf33b2e15067fd037ce505..9ba89324223ba946fc1eee0319d1ffe94c7df206 100644 (file)
 };
 
 &art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
+               macaddr_art_0: macaddr@0 {
+                       reg = <0x0 0x6>;
+               };
        };
 };
index ec574ccf9f0e9e0c845e87752628099010c3fc12..eb304db8a380d80df12006649100201bf25a4506 100644 (file)
 };
 
 &art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
+               macaddr_art_0: macaddr@0 {
+                       reg = <0x0 0x6>;
+               };
        };
 };
index 2dfdff03d8271cc8f77e4753de719749addc70bd..bb6af232fd2e690f11d4234e0abcf03b1395511a 100644 (file)
                                label = "ART";
                                reg = <0xfc0000 0x040000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};
index 4e4daef1c8e65eaa4b3e55e219a2901d63c4e0c7..722ce05014961b5c4e0f16b713f6c92e26d21a74 100644 (file)
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
                };
        };
                switch-phy-swap = <1>;
        };
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};
index 23b5cf745044f8eed2f42e3eddcd77e27f55dc92..496d6579e7671a47a22ede65262717cee4b17311 100644 (file)
                                label = "art";
                                reg = <0xff0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
                };
        };
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};
index 2ccd50d7836a03a70e9788429be8500daa389677..1f089affac3f421e571f563f229f4f52d3fa8f85 100644 (file)
                                label = "u-boot";
                                reg = <0x000000 0x020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};
index 5d5b88c5f3b99eb620444363950a796dc58ea1d6..71e2c7b8d819d05a3074a03ba3e04756011e6401 100644 (file)
                                label = "u-boot";
                                reg = <0x000000 0x020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};
index d86571c53198718b51a9b5e9cceade9af518555e..d0f00a4a49432fcf95613db64cbc5e8586f2b053 100644 (file)
                                label = "u-boot";
                                reg = <0x000000 0x020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};
index 0fc34884453fe4dd0d5f925a6c03fd84ea1537fd..3713998e24a6ebe9b719106f0c33b5c0f1c72099 100644 (file)
                                label = "u-boot";
                                reg = <0x000000 0x020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};
index a61f4a381eaeec9ccfa5906589e20b91b8913e6f..492e46e95ca780198e7cf9416adec76cd14d6a7b 100644 (file)
                                label = "u-boot";
                                reg = <0x000000 0x020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};
index 7bfc85d086808bf51bb9a008e0d7330ec37ce913..917dc297fe12378b8dc71f39e79f6a1f186893b1 100644 (file)
        };
 };
 
+&board_data {
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               macaddr_board_data_60: macaddr@60 {
+                       reg = <0x60 0x6>;
+               };
+
+               macaddr_board_data_66: macaddr@66 {
+                       reg = <0x66 0x6>;
+               };
+
+               cal_board_data_41000: cal@41000 {
+                       reg = <0x41000 0x440>;
+               };
+       };
+};
+
 &eth0 {
        nvmem-cells = <&macaddr_board_data_66>;
 };
index 49cf39062a22a83e5c8d902ce09599daf8c2878d..c3c20985e2b4cfe66cb81bc054a0f89808577906 100644 (file)
                                reg = <0xff0000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_art_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
-
-                               calibration_art_1000: calibration@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
-
-                               calibration_art_5000: calibration@5000 {
-                                       reg = <0x5000 0x844>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       calibration_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
+                                       calibration_art_5000: calibration@5000 {
+                                               reg = <0x5000 0x844>;
+                                       };
                                };
                        };
                };
index ba0f7ad23e52940b1bc4ec2971a8d8e8c73062a6..d85a07a8dcb180bb2b872ebf182953d87f519068 100644 (file)
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
                };
        };
        ieee80211-freq-limit = <2402000 2482000>;
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};
index ce49c10e5ccb5bc634444cd2dbbce1deb60ef73c..899f1677488336b2df223405ad2a1a64c4be13cb 100644 (file)
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
                };
        };
        nvmem-cells = <&macaddr_art_0>;
        nvmem-cell-names = "mac-address";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};
index a05cc2e2637630315e9a3a3b9ffd93ced2d0789e..b30d545fa312e21a9edf192f4b800925cc3d9e80 100644 (file)
@@ -92,8 +92,6 @@
                                reg = <0xfe0000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-
                                nvmem-layout {
                                        compatible = "fixed-layout";
                                        #address-cells = <1>;
                                reg = <0xff0000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               calibration_ath9k: calibration@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
+                                       calibration_ath9k: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
 
-                               macaddr_art_1002: macaddr@1002 {
-                                       reg = <0x1002 0x6>;
+                                       macaddr_art_1002: macaddr@1002 {
+                                               reg = <0x1002 0x6>;
+                                       };
                                };
                        };
                };
index a2ac53b9963785c8be2edf643259fe029ca01fbd..1d4be4d3164f5bd420c8c94aec40ade07d4a38b9 100644 (file)
                                label = "hw-info";
                                reg = <0x90000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_hw_info_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
 
                        partition@a0000 {
                rxdv-delay = <1>;
        };
 };
-
-&hw_info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_hw_info_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};
index ca762c3bca40741166e2dcea4aa11eba65ad4d8c..789bd6df149083e33463ede403ff7d9386fc8326 100644 (file)
                                reg = <0x070000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               cal_art_1000: cal@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
-
-                               macaddr_art_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
-
-                               macaddr_art_6: macaddr@6 {
-                                       reg = <0x6 0x6>;
-                               };
-
-                               macaddr_art_1002: macaddr@1002 {
-                                       reg = <0x1002 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: cal@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+
+                                       macaddr_art_1002: macaddr@1002 {
+                                               reg = <0x1002 0x6>;
+                                       };
                                };
                        };
 
index ac39a626790b51baf3e549cabb661c13f9bd1326..48388862090b67f5c610d639449509aa83444f49 100644 (file)
 };
 
 &art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
+               macaddr_art_0: macaddr@0 {
+                       reg = <0x0 0x6>;
+               };
 
-       calibration_art_1000: calibration@1000 {
-               reg = <0x1000 0x440>;
-       };
+               calibration_art_1000: calibration@1000 {
+                       reg = <0x1000 0x440>;
+               };
 
-       calibration_art_5000: calibration@5000 {
-               reg = <0x5000 0x440>;
+               calibration_art_5000: calibration@5000 {
+                       reg = <0x5000 0x440>;
+               };
        };
 };
index 8811d4f4576baa7a0ac5774fba110773ec50b59e..9d5044141245c60a0586901c7cf632cd0e25d89c 100644 (file)
                                reg = <0x7f0000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_art_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
-
-                               macaddr_art_6: macaddr@6 {
-                                       reg = <0x6 0x6>;
-                               };
-
-                               calibration_art_1000: calibration@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
-
-                               calibration_art_5000: calibration@5000 {
-                                       reg = <0x5000 0x440>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+
+                                       calibration_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
+                                       calibration_art_5000: calibration@5000 {
+                                               reg = <0x5000 0x440>;
+                                       };
                                };
                        };
                };
index 94a82baddcdc0ffc7a93339709b8fc405bc03470..c53f03235fcbd0ba82aa989449fc94bcef76f00b 100644 (file)
                                label = "art";
                                reg = <0x010000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};
index e456f1f0e582a42f8b25f88124438d948eab476d..21329db2584241ed93a4b4b675c2030b8a6a098d 100644 (file)
                                label = "u-boot";
                                reg = <0x000000 0x030000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_2e010: macaddr@2e010 {
+                                               reg = <0x2e010 0x6>;
+                                       };
+                               };
                        };
 
                        partition@30000 {
        phy-mode = "rgmii";
        phy-handle = <&phy0>;
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_2e010: macaddr@2e010 {
-               reg = <0x2e010 0x6>;
-       };
-};
index 1cec6625692672bbc186cc591dd3b92bcad279b8..f1926cc1ebb2895de7db21d25102c0666ab21324 100644 (file)
                                label = "art";
                                reg = <0xff0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_1002: macaddr@1002 {
+                                               reg = <0x1002 0x6>;
+                                       };
+                               };
                        };
                };
        };
                >;
        };
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_1002: macaddr@1002 {
-               reg = <0x1002 0x6>;
-       };
-};
index 8db1bf5e0c0ded71144685f10de720a0a0966376..96235dbbc443e5fc71e74529ed6249dc93e4b0be 100644 (file)
                                reg = <0xfe0000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-
                                nvmem-layout {
                                        compatible = "fixed-layout";
                                        #address-cells = <1>;
                                reg = <0xff0000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               cal_art_1000: cal@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
+                                       cal_art_1000: cal@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
 
-                               cal_art_5000: cal@5000 {
-                                       reg = <0x5000 0x440>;
+                                       cal_art_5000: cal@5000 {
+                                               reg = <0x5000 0x440>;
+                                       };
                                };
                        };
                };
index 618660802c09e77dd944ebb7ce8e85b110f13f6e..7e906dd3e23b8916e717cf69b0a26aa4af13cca9 100644 (file)
 };
 
 &art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
+               macaddr_art_0: macaddr@0 {
+                       reg = <0x0 0x6>;
+               };
 
-       calibration_art_1000: calibration@1000 {
-               reg = <0x1000 0x440>;
-       };
+               calibration_art_1000: calibration@1000 {
+                       reg = <0x1000 0x440>;
+               };
 
-       calibration_art_5000: calibration@5000 {
-               reg = <0x5000 0x440>;
+               calibration_art_5000: calibration@5000 {
+                       reg = <0x5000 0x440>;
+               };
        };
 };
index 5f6ffb130d79a8fdd2b2570efe0c73722ea91206..53456d40939cb90c0a02fa8b913b32232681911b 100644 (file)
 };
 
 &art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
+               macaddr_art_0: macaddr@0 {
+                       reg = <0x0 0x6>;
+               };
 
-       calibration_art_1000: calibration@1000 {
-               reg = <0x1000 0x440>;
-       };
+               calibration_art_1000: calibration@1000 {
+                       reg = <0x1000 0x440>;
+               };
 
-       calibration_art_5000: calibration@5000 {
-               reg = <0x5000 0x440>;
+               calibration_art_5000: calibration@5000 {
+                       reg = <0x5000 0x440>;
+               };
        };
 };
index 5b91dd1e4d8400f1dfe269e0dd49d40464a54153..b513a36035271275dbf39925d9d4dd0eff96cd64 100644 (file)
                        reg = <0xffe0000 0x20000>;
                        read-only;
 
-                       compatible = "nvmem-cells";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       macaddr_caldata_0: macaddr@0 {
-                               reg = <0x0 0x6>;
-                       };
-
-                       macaddr_caldata_6: macaddr@6 {
-                               reg = <0x6 0x6>;
-                       };
-
-                       cal_caldata_1000: cal@1000 {
-                               reg = <0x1000 0x440>;
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_caldata_0: macaddr@0 {
+                                       reg = <0x0 0x6>;
+                               };
+
+                               macaddr_caldata_6: macaddr@6 {
+                                       reg = <0x6 0x6>;
+                               };
+
+                               cal_caldata_1000: cal@1000 {
+                                       reg = <0x1000 0x440>;
+                               };
                        };
                };
        };
index 76bd77d4c65ef3f63b464cf3f1d55d8508383a6b..419fa51f6175b6774051f98971e3e7ce72aa015b 100644 (file)
                        label = "caldata";
                        reg = <0x0020000 0x0040000>;
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               cal_ath9k: calibration@1000 {
+                                       reg = <0x1000 0x440>;
+                               };
+
+                               cal_ath10k: calibration@5000 {
+                                       reg = <0x5000 0x844>;
+                               };
+
+                               macaddr_caldata_0: macaddr@0 {
+                                       reg = <0x0 0x6>;
+                               };
+
+                               macaddr_caldata_6: macaddr@6 {
+                                       reg = <0x6 0x6>;
+                               };
+
+                               macaddr_caldata_c: macaddr@c {
+                                       reg = <0xc 0x6>;
+                               };
+                       };
                };
 
                partition@60000 {
        nvmem-cells = <&cal_ath9k>;
        nvmem-cell-names = "calibration";
 };
-
-&caldata {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       cal_ath9k: calibration@1000 {
-               reg = <0x1000 0x440>;
-       };
-
-       cal_ath10k: calibration@5000 {
-               reg = <0x5000 0x844>;
-       };
-
-       macaddr_caldata_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_caldata_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-
-       macaddr_caldata_c: macaddr@c {
-               reg = <0xc 0x6>;
-       };
-};
index 331a4c6fa32c867af855da288882eca2a59bbcfa..d2a30000044e63d0af0b2213672ab4c74107ad3a 100644 (file)
                        label = "caldata";
                        reg = <0x80000 0x40000>;
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_caldata_0: macaddr@0 {
+                                       reg = <0x0 0x6>;
+                               };
+
+                               macaddr_caldata_c: macaddr@c {
+                                       reg = <0xc 0x6>;
+                               };
+
+                               cal_art_1000: cal@1000 {
+                                       reg = <0x1000 0x440>;
+                               };
+
+                               cal_art_5000: cal@5000 {
+                                       reg = <0x5000 0x440>;
+                               };
+                       };
                };
 
                partition@c0000 {
                gpio-controller;
        };
 };
-
-&caldata {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_caldata_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_caldata_c: macaddr@c {
-               reg = <0xc 0x6>;
-       };
-
-       cal_art_1000: cal@1000 {
-               reg = <0x1000 0x440>;
-       };
-
-       cal_art_5000: cal@5000 {
-               reg = <0x5000 0x440>;
-       };
-};
index 11205413f4ce434f29d4db0c866765d3a2eb8e43..39ba2ffc3aff4c8d4d6be65863daac2a9e8c0845 100644 (file)
                                reg = <0xff0000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_art_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
-
-                               macaddr_art_6: macaddr@6 {
-                                       reg = <0x6 0x6>;
-                               };
-
-                               macaddr_art_c: macaddr@c {
-                                       reg = <0xc 0x6>;
-                               };
-
-                               calibration_art_1000: calibration@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
-
-                               calibration_art_5000: calibration@5000 {
-                                       reg = <0x5000 0x440>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+
+                                       macaddr_art_c: macaddr@c {
+                                               reg = <0xc 0x6>;
+                                       };
+
+                                       calibration_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
+                                       calibration_art_5000: calibration@5000 {
+                                               reg = <0x5000 0x440>;
+                                       };
                                };
                        };
                };
index b35d699bdc1675d8b0d7fb68186246b8f72e3ddc..b7ec8199e9b814a71bab16e312a6d8af0c3078a7 100644 (file)
                                reg = <0xff0000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_art_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
-
-                               calibration_art_1000: calibration@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
-
-                               calibration_art_5000: calibration@5000 {
-                                       reg = <0x5000 0x440>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       calibration_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
+                                       calibration_art_5000: calibration@5000 {
+                                               reg = <0x5000 0x440>;
+                                       };
                                };
                        };
                };
index 6fab2b3219b9598f270ad9dd56e64a752caf2777..9a7e5e16ca1697e07a2f93b3dca54ac03fce9086 100644 (file)
                                reg = <0xff0000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_art_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
-
-                               calibration_art_1000: calibration@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
-
-                               calibration_art_5000: calibration@5000 {
-                                       reg = <0x5000 0x440>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       calibration_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
+                                       calibration_art_5000: calibration@5000 {
+                                               reg = <0x5000 0x440>;
+                                       };
                                };
                        };
                };
index 3e60d05ed32f5c37cc6929deda808625e1c8013c..e3aa19c82de6ff0f9fb77eacd8828dcc12f6de1e 100644 (file)
                                label = "ART";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};
index ea7077d2c8f7075021c0ca70d84b38dfe28d7583..451b0ecaca66ef5ed220f4640f3316d7581ddbd7 100644 (file)
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
                };
        };
        phy-mode = "rgmii";
        phy-handle = <&phy0>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};
index b5fef91eacc5f2c88a1e1acb16ac0bd3dba4a8f3..a5fc1160c2ce883ea0d807e275b595a62c0afe5f 100644 (file)
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_5002: macaddr@5002 {
+                                               reg = <0x5002 0x6>;
+                                       };
+                               };
                        };
                };
        };
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_5002: macaddr@5002 {
-               reg = <0x5002 0x6>;
-       };
-};
index 7c2f90e72c3a78836cf5d090c4d9990e923172e7..31145b39298d14758d42e8cc6d78686ae0afec8c 100644 (file)
                reg = <0x070000 0xf90000>;
        };
 };
-
-&pridata {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_pridata_400: macaddr@400 {
-               reg = <0x400 0x6>;
-       };
-};
index 042974610ca09c7114f0c85cb2eaaee0f969deb1..f44e7a01bed1da57a625d49d170159b02eb973a1 100644 (file)
                reg = <0x070000 0x790000>;
        };
 };
-
-&pridata {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_pridata_400: macaddr@400 {
-               reg = <0x400 0x6>;
-       };
-};
index ecc3d8b8cdd22b784580a6729bdb57c4e55ff120..6b84cb0ef9764d2c70abee87735d5cebf385ebae 100644 (file)
                reg = <0x070000 0xf90000>;
        };
 };
-
-&pridata {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_pridata_400: macaddr@400 {
-               reg = <0x400 0x6>;
-       };
-};
index e2152ff464f9fef00940cdb2b0807e51e8071ce9..13aaf322b76e02e1a3e391f4f50dfc3208bd6f94 100644 (file)
                reg = <0x070000 0x790000>;
        };
 };
-
-&pridata {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_pridata_400: macaddr@400 {
-               reg = <0x400 0x6>;
-       };
-};
index a41e626ea4a11c399ad9f4f34ff6af1d8f38280c..0bc735c0a9b5b3fd37fbcce31fa3b86cca250433 100644 (file)
                                label = "pri-data";
                                reg = <0x050000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_pridata_400: macaddr@400 {
+                                               reg = <0x400 0x6>;
+                                       };
+                               };
                        };
 
                        art: partition@60000 {
index 2cf7240931177c6894b9eff7069522455385ad27..dbccbef023b7f00964e48b16d9241a988fa5c856 100644 (file)
 };
 
 &board_data {
-       macaddr_board_data_6c: macaddr@6c {
-               reg = <0x6c 0x6>;
-       };
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               macaddr_board_data_60: macaddr@60 {
+                       reg = <0x60 0x6>;
+               };
+
+               macaddr_board_data_66: macaddr@66 {
+                       reg = <0x66 0x6>;
+               };
 
-       macaddr_board_data_76: macaddr@76 {
-               reg = <0x76 0x6>;
+               macaddr_board_data_6c: macaddr@6c {
+                       reg = <0x6c 0x6>;
+               };
+
+               macaddr_board_data_76: macaddr@76 {
+                       reg = <0x76 0x6>;
+               };
+
+               cal_board_data_41000: cal@41000 {
+                       reg = <0x41000 0x440>;
+               };
        };
 };
index fd5bf9e81d46acbbafece517c8f54f3082a36766..4b7bad787372fe1e7764b7b341fc5bbecb4e378e 100644 (file)
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_1002: macaddr@1002 {
+                                               reg = <0x1002 0x6>;
+                                       };
+                               };
                        };
                };
        };
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_1002: macaddr@1002 {
-               reg = <0x1002 0x6>;
-       };
-};
index 937095959c9e0a89a365ea70c7f94ff8a6b90ad2..e8b6e0893684c3294beddc5bdf788476b1212274 100644 (file)
                                label = "config";
                                reg = <0x20000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
 
                        art: partition@30000 {
                                        <0x3c 0x000b0000 0x00ff0000>;
        };
 };
-
-&config {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_config_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};
index 9d8873ddaf1b3232aee81e59f3f522ac9b3a9b73..f15c1c320acb9aed7043b232ae24049139ba5924 100644 (file)
                                label = "info";
                                reg = <0x030000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        partition@40000 {
                line-name = "tp-link:ext:lna1";
        };
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};
index a2649d19e9356e9615b2ff4d8f65f3f33b46d41f..138582166bb06398dd464fcd9241fc5791ac7ea7 100644 (file)
                                label = "u-boot";
                                reg = <0x000000 0x020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: cal@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
+                                       cal_art_5000: cal@5000 {
+                                               reg = <0x5000 0x440>;
+                                       };
+                               };
                        };
                };
        };
        nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       cal_art_1000: cal@1000 {
-               reg = <0x1000 0x440>;
-       };
-
-       cal_art_5000: cal@5000 {
-               reg = <0x5000 0x440>;
-       };
-};
index 49526fb6d233ff7905d5e1cc3af52b1f611194a6..a3910d512bc9006df677902c803e6570f530f1c0 100644 (file)
                                label = "u-boot";
                                reg = <0x000000 0x020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
                switch-phy-swap = <1>;
        };
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};
index 55626c42995a57bc57c367e810272281808c58ec..2aba2bd2c013c71420396f5da96b1541a09b716c 100644 (file)
                                reg = <0xff0000 0x10000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_art_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
-
-                               calibration_art_1000: calibration@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
-
-                               calibration_art_5000: calibration@5000 {
-                                       reg = <0x5000 0x440>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       calibration_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
+                                       calibration_art_5000: calibration@5000 {
+                                               reg = <0x5000 0x440>;
+                                       };
                                };
                        };
                };
index 0ab10c36ce2ab26311256b9a1f1a4679be61327b..b08dce2950ba6b2aac326cb6afca09baed60d9c8 100644 (file)
 };
 
 &art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
+               macaddr_art_0: macaddr@0 {
+                       reg = <0x0 0x6>;
+               };
 
-       calibration_art_1000: calibration@1000 {
-               reg = <0x1000 0x440>;
-       };
+               calibration_art_1000: calibration@1000 {
+                       reg = <0x1000 0x440>;
+               };
 
-       calibration_art_5000: calibration@5000 {
-               reg = <0x5000 0x440>;
+               calibration_art_5000: calibration@5000 {
+                       reg = <0x5000 0x440>;
+               };
        };
 };
index 88c7637fc9b11fef34fa56b3f2afcb83f513b52b..56f0c8e0487982dba82e9bbd24613ff822544251 100644 (file)
 };
 
 &art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
+               macaddr_art_0: macaddr@0 {
+                       reg = <0x0 0x6>;
+               };
 
-       calibration_art_1000: calibration@1000 {
-               reg = <0x1000 0x440>;
-       };
+               calibration_art_1000: calibration@1000 {
+                       reg = <0x1000 0x440>;
+               };
 
-       calibration_art_5000: calibration@5000 {
-               reg = <0x5000 0x440>;
+               calibration_art_5000: calibration@5000 {
+                       reg = <0x5000 0x440>;
+               };
        };
 };
index cbde191ac783526d83f99d67582b63982bcfb784..1ab92c698cc9a936f8d4d64e7f92c2b774e544db 100644 (file)
                                reg = <0xfe0000 0x10000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               calibration_art_1000: calibration@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
-
-                               calibration_art_5000: calibration@5000 {
-                                       reg = <0x5000 0x440>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       calibration_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
+                                       calibration_art_5000: calibration@5000 {
+                                               reg = <0x5000 0x440>;
+                                       };
                                };
                        };
 
                                reg = <0xff0000 0x10000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               macaddr_addr_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
+                                       macaddr_addr_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
                                };
                        };
                };
index 8dc1ceb666608c76302ed183b7ccdecf11cf862a..36802a5275702dcba4a2e91a6aa2e49a770e64c2 100644 (file)
                        art: art@ff0000 {
                                reg = <0xff0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
                pinctrl-single,bits = <0x14 0x0 0xff00>;
        };
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};
index a0348e7213a8a80c56b37f715be6a29d53a766e2..d494f9b1ed86f6102020502383007b4a0766694d 100644 (file)
 &usb_phy {
        status = "okay";
 };
-
-&board_data {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_board_data_60: macaddr@60 {
-               reg = <0x60 0x6>;
-       };
-
-       macaddr_board_data_66: macaddr@66 {
-               reg = <0x66 0x6>;
-       };
-
-       cal_board_data_41000: cal@41000 {
-               reg = <0x41000 0x440>;
-       };
-};