ramips: mt7621: convert to nvmem-layout
authorRosen Penev <rosenp@gmail.com>
Tue, 7 Nov 2023 23:55:58 +0000 (15:55 -0800)
committerChristian Marangi <ansuelsmth@gmail.com>
Sun, 26 Nov 2023 00:30:32 +0000 (01:30 +0100)
Allows replacing mac-address-increment with mac-base.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
175 files changed:
target/linux/ramips/dts/mt7621_adslr_g7.dts
target/linux/ramips/dts/mt7621_afoundry_ew1200.dts
target/linux/ramips/dts/mt7621_alfa-network_ax1800rm.dts
target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts
target/linux/ramips/dts/mt7621_ampedwireless_ally.dtsi
target/linux/ramips/dts/mt7621_arcadyan_we420223-99.dts
target/linux/ramips/dts/mt7621_arcadyan_wg4xx223.dtsi
target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi
target/linux/ramips/dts/mt7621_asus_rp-ac56.dts
target/linux/ramips/dts/mt7621_asus_rp-ac87.dts
target/linux/ramips/dts/mt7621_asus_rt-ac57u-v1.dts
target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi
target/linux/ramips/dts/mt7621_asus_rt-ax53u.dts
target/linux/ramips/dts/mt7621_asus_rt-ax54.dts
target/linux/ramips/dts/mt7621_asus_rt-n56u-b1.dts
target/linux/ramips/dts/mt7621_beeline_smartbox-giga.dts
target/linux/ramips/dts/mt7621_beeline_smartbox-turbo-plus.dts
target/linux/ramips/dts/mt7621_belkin_rt1800.dts
target/linux/ramips/dts/mt7621_bolt_arion.dts
target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts
target/linux/ramips/dts/mt7621_buffalo_wsr-2533dhpl.dts
target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts
target/linux/ramips/dts/mt7621_comfast_cf-e390ax.dts
target/linux/ramips/dts/mt7621_comfast_cf-ew72-v2.dts
target/linux/ramips/dts/mt7621_cudy_m1800.dts
target/linux/ramips/dts/mt7621_cudy_wr1300-v1.dts
target/linux/ramips/dts/mt7621_cudy_wr2100.dts
target/linux/ramips/dts/mt7621_cudy_x6-v1.dts
target/linux/ramips/dts/mt7621_cudy_x6-v2.dts
target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts
target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts
target/linux/ramips/dts/mt7621_dlink_dap-x1860-a1.dts
target/linux/ramips/dts/mt7621_dlink_dir-3060-a1.dts
target/linux/ramips/dts/mt7621_dlink_dir-853-a1.dts
target/linux/ramips/dts/mt7621_dlink_dir-853-a3.dts
target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts
target/linux/ramips/dts/mt7621_dlink_dir-xx60-a1.dtsi
target/linux/ramips/dts/mt7621_dlink_dxx-1xx0-x1.dtsi
target/linux/ramips/dts/mt7621_dlink_flash-16m-a1.dtsi
target/linux/ramips/dts/mt7621_dlink_flash-16m-r1.dtsi
target/linux/ramips/dts/mt7621_dual-q_h721.dts
target/linux/ramips/dts/mt7621_edimax_re23s.dts
target/linux/ramips/dts/mt7621_edimax_rx21s.dtsi
target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts
target/linux/ramips/dts/mt7621_elecom_wrc-1167gs2-b.dts
target/linux/ramips/dts/mt7621_elecom_wrc-1167gst2.dts
target/linux/ramips/dts/mt7621_elecom_wrc-1750gs.dts
target/linux/ramips/dts/mt7621_elecom_wrc-1750gst2.dts
target/linux/ramips/dts/mt7621_elecom_wrc-1750gsv.dts
target/linux/ramips/dts/mt7621_elecom_wrc-1900gst.dts
target/linux/ramips/dts/mt7621_elecom_wrc-2533ghbk.dtsi
target/linux/ramips/dts/mt7621_elecom_wrc-2533gs2.dts
target/linux/ramips/dts/mt7621_elecom_wrc-2533gst.dts
target/linux/ramips/dts/mt7621_elecom_wrc-2533gst2.dts
target/linux/ramips/dts/mt7621_elecom_wrc-gs.dtsi
target/linux/ramips/dts/mt7621_etisalat_s3.dts
target/linux/ramips/dts/mt7621_firefly_firewrt.dts
target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts
target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts
target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts
target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts
target/linux/ramips/dts/mt7621_h3c_tx180x.dtsi
target/linux/ramips/dts/mt7621_haier-sim_wr1800k.dtsi
target/linux/ramips/dts/mt7621_hanyang_hyc-g920.dts
target/linux/ramips/dts/mt7621_hilink_hlk-7621a-evb.dts
target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts
target/linux/ramips/dts/mt7621_huasifei_ws1208v2.dts
target/linux/ramips/dts/mt7621_humax_e10.dts
target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts
target/linux/ramips/dts/mt7621_iodata_wn-deax1800gr.dts
target/linux/ramips/dts/mt7621_iodata_wn-dx1200gr.dts
target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts
target/linux/ramips/dts/mt7621_iodata_wn-xx-xr.dtsi
target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts
target/linux/ramips/dts/mt7621_iptime_a3002mesh.dts
target/linux/ramips/dts/mt7621_iptime_a3004ns-dual.dts
target/linux/ramips/dts/mt7621_iptime_a3004t.dts
target/linux/ramips/dts/mt7621_iptime_a6004ns-m.dtsi
target/linux/ramips/dts/mt7621_iptime_a8004t.dts
target/linux/ramips/dts/mt7621_iptime_ax2004m.dts
target/linux/ramips/dts/mt7621_jcg_jhr-ac876m.dts
target/linux/ramips/dts/mt7621_jcg_q20.dts
target/linux/ramips/dts/mt7621_jcg_y2.dts
target/linux/ramips/dts/mt7621_keenetic_kn-3010.dts
target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts
target/linux/ramips/dts/mt7621_linksys_e5600.dts
target/linux/ramips/dts/mt7621_linksys_e7350.dts
target/linux/ramips/dts/mt7621_linksys_re6500.dts
target/linux/ramips/dts/mt7621_linksys_re7000.dts
target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts
target/linux/ramips/dts/mt7621_meig_slt866.dts
target/linux/ramips/dts/mt7621_mercusys_mr70x-v1.dts
target/linux/ramips/dts/mt7621_mqmaker_witi.dts
target/linux/ramips/dts/mt7621_mtc_wr1201.dts
target/linux/ramips/dts/mt7621_netgear_ex6150.dts
target/linux/ramips/dts/mt7621_netgear_r6220.dts
target/linux/ramips/dts/mt7621_netgear_sercomm_bzv.dtsi
target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi
target/linux/ramips/dts/mt7621_netgear_wac104.dts
target/linux/ramips/dts/mt7621_netgear_wax202.dts
target/linux/ramips/dts/mt7621_netis_wf2881.dts
target/linux/ramips/dts/mt7621_oraybox_x3a.dts
target/linux/ramips/dts/mt7621_phicomm_k2p.dts
target/linux/ramips/dts/mt7621_planex_vr500.dts
target/linux/ramips/dts/mt7621_raisecom_msg1500-x-00.dts
target/linux/ramips/dts/mt7621_renkforce_ws-wn530hp3-a.dts
target/linux/ramips/dts/mt7621_samknows_whitebox-v8.dts
target/linux/ramips/dts/mt7621_sercomm_dxx_nand_256m.dtsi
target/linux/ramips/dts/mt7621_sercomm_na502.dts
target/linux/ramips/dts/mt7621_sercomm_na502s.dts
target/linux/ramips/dts/mt7621_sercomm_s1500.dtsi
target/linux/ramips/dts/mt7621_snr_snr-cpe-me1.dts
target/linux/ramips/dts/mt7621_snr_snr-cpe-me2-lite.dts
target/linux/ramips/dts/mt7621_snr_snr-cpe-me2-sfp.dts
target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts
target/linux/ramips/dts/mt7621_telco-electronics_x1.dts
target/linux/ramips/dts/mt7621_tenbay_t-mb5eu-v01.dts
target/linux/ramips/dts/mt7621_thunder_timecloud.dts
target/linux/ramips/dts/mt7621_totolink_a7000r.dts
target/linux/ramips/dts/mt7621_totolink_x5000r.dts
target/linux/ramips/dts/mt7621_tozed_zlt-s12-pro.dts
target/linux/ramips/dts/mt7621_tplink_archer-ax23-v1.dts
target/linux/ramips/dts/mt7621_tplink_archer-c6u-v1.dts
target/linux/ramips/dts/mt7621_tplink_archer-x6-v3.dtsi
target/linux/ramips/dts/mt7621_tplink_deco-m4r-v4.dts
target/linux/ramips/dts/mt7621_tplink_eap235-wall-v1.dts
target/linux/ramips/dts/mt7621_tplink_eap613-v1.dts
target/linux/ramips/dts/mt7621_tplink_eap615-wall-v1.dts
target/linux/ramips/dts/mt7621_tplink_ec330-g5u-v1.dts
target/linux/ramips/dts/mt7621_tplink_mr600-v2-eu.dts
target/linux/ramips/dts/mt7621_tplink_re350-v1.dts
target/linux/ramips/dts/mt7621_tplink_re650-v2.dts
target/linux/ramips/dts/mt7621_tplink_rexx0-v1.dtsi
target/linux/ramips/dts/mt7621_tplink_tl-wpa8631p-v3.dts
target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi
target/linux/ramips/dts/mt7621_ubnt_unifi-6-lite.dts
target/linux/ramips/dts/mt7621_ubnt_unifi-flexhd.dts
target/linux/ramips/dts/mt7621_ubnt_unifi-nanohd.dts
target/linux/ramips/dts/mt7621_ubnt_usw-flex.dts
target/linux/ramips/dts/mt7621_unielec_u7621-01-16m.dts
target/linux/ramips/dts/mt7621_unielec_u7621-06-16m.dts
target/linux/ramips/dts/mt7621_unielec_u7621-06-32m.dts
target/linux/ramips/dts/mt7621_unielec_u7621-06-64m.dts
target/linux/ramips/dts/mt7621_wavlink_wl-wn53xax.dtsi
target/linux/ramips/dts/mt7621_wavlink_wl-wn573hx1.dts
target/linux/ramips/dts/mt7621_wavlink_ws-wn572hp3-4g.dts
target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dtsi
target/linux/ramips/dts/mt7621_winstars_ws-wn583a6.dts
target/linux/ramips/dts/mt7621_xiaomi_mi-router-3-pro.dts
target/linux/ramips/dts/mt7621_xiaomi_mi-router-3g.dts
target/linux/ramips/dts/mt7621_xiaomi_mi-router-4.dts
target/linux/ramips/dts/mt7621_xiaomi_mi-router-4a-common.dtsi
target/linux/ramips/dts/mt7621_xiaomi_mi-router-cr660x.dtsi
target/linux/ramips/dts/mt7621_xiaomi_nand_128m.dtsi
target/linux/ramips/dts/mt7621_xiaomi_router-ac2100.dtsi
target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts
target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts
target/linux/ramips/dts/mt7621_youhua_wr1200js.dts
target/linux/ramips/dts/mt7621_youku_yk-l2.dts
target/linux/ramips/dts/mt7621_yuncore_ax820.dts
target/linux/ramips/dts/mt7621_yuncore_fap640.dts
target/linux/ramips/dts/mt7621_yuncore_fap690.dts
target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts
target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts
target/linux/ramips/dts/mt7621_zbtlink_zbt-wg1602-v04.dtsi
target/linux/ramips/dts/mt7621_zbtlink_zbt-wg1602.dtsi
target/linux/ramips/dts/mt7621_zbtlink_zbt-wg1608.dtsi
target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts
target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi
target/linux/ramips/dts/mt7621_zyxel_lte3301-plus.dts
target/linux/ramips/dts/mt7621_zyxel_lte5398-m904.dts
target/linux/ramips/dts/mt7621_zyxel_nr7101.dts
target/linux/ramips/dts/mt7621_zyxel_nwa-ax.dtsi
target/linux/ramips/dts/mt7621_zyxel_wap6805.dts
target/linux/ramips/dts/mt7621_zyxel_wsm20.dts

index fe04648f0e24b9f948c5f9df028940dfd725bba0..f797393f04381428cb536026cf173068116399ba 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
 
-                               macaddr_factory_e00c: macaddr@e00c {
-                                       reg = <0xe00c 0x6>;
+                                       macaddr_factory_e00c: macaddr@e00c {
+                                               reg = <0xe00c 0x6>;
+                                       };
                                };
                        };
 
index 30a03824627e3a12e48d1cfcbd18a28c35376c8f..a846e5d8d5ddffd0f2708b1315115582ac14577f 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
                                };
                        };
 
index 1ef1f7fb31f08e6ef8c139d042266e8f0893a1d1..e07cddefc5804487c8dcaa89b72400013837159f 100644 (file)
                        };
 
                        partition@50000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x50000 0x10000>;
                                read-only;
index cc048d44879be639d42477eacc36dc8410e0be75..2bc0fad9c58d922028ee23f600ae0d51388586f3 100644 (file)
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
+
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
 &uartlite3 {
        status = "okay";
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
-
-       macaddr_factory_e006: macaddr@e006 {
-               reg = <0xe006 0x6>;
-       };
-};
index 4f06271239b0f4c13503fb7447ddcefd8954794a..35274afbf3acf5757cd56439a5a8414a0f99ca64 100644 (file)
                };
 
                factory: partition@100000 {
-                       compatible = "nvmem-cells";
                        label = "factory";
                        reg = <0x100000 0x40000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x4da8>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x4da8>;
+                               };
 
-                       eeprom_factory_8000: eeprom@8000 {
-                               reg = <0x8000 0x4da8>;
+                               eeprom_factory_8000: eeprom@8000 {
+                                       reg = <0x8000 0x4da8>;
+                               };
                        };
                };
 
index 1d55453c8d53071d8ed2cccd7938c71ce61f27da..fbf276c320e15bf8024dc1b2fc35c1ba71c5bdf2 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "Factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
                                };
                        };
 
index 8e05c3af50d732fda85556d2d24949ebf868e9cc..7b3f316a8c4495a3f34903db16f8b99a4049a68e 100644 (file)
                };
 
                factory: partition@200000 {
-                       compatible = "nvmem-cells";
                        label = "Factory";
                        reg = <0x200000 0x100000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x4da8>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x4da8>;
+                               };
 
-                       /* We keep the block below to prevent eth0 MAC
-                        * from randomization. Unique WAN, LAN, WLAN MACs
-                        * are stored in u-boot-env.
-                        */
+                               /* We keep the block below to prevent eth0 MAC
+                                * from randomization. Unique WAN, LAN, WLAN MACs
+                                * are stored in u-boot-env.
+                                */
 
-                       /* Default Ralink MAC (00:0c:43:28:80:xx) */
-                       macaddr_factory_fff0: macaddr@fff0 {
-                               reg = <0xfff0 0x6>;
+                               /* Default Ralink MAC (00:0c:43:28:80:xx) */
+                               macaddr_factory_fff0: macaddr@fff0 {
+                                       reg = <0xfff0 0x6>;
+                               };
                        };
                };
 
index bea0b79df5eb95cd74ff8759d67285a0e4bff5ce..658164fe08becede30924149fce8554a6d685694 100644 (file)
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
                function = "gpio";
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
-};
index bc623067a8a5e14ef3310e67a242df4aaacfd65b..d9fdb3b675f832cfc53d655d2e9184b1f550df6a 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
 
-                               macaddr_factory_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
                                };
                        };
 
index 47df1dbe57da884e9da9249482ad877acff7b1f6..34e64182cf564956e80636cb5962a1e2766f59be 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
 
-                               macaddr_factory_8004: macaddr@8004 {
-                                       reg = <0x8004 0x6>;
+                                       macaddr_factory_8004: macaddr@8004 {
+                                               reg = <0x8004 0x6>;
+                                       };
                                };
                        };
 
index 322a96b700aea7a70f51c2fb659107f2074bd458..6790b37d1aefa7f1af9774e8fc019dd8c84a36c2 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
-                               };
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index bb9171bbac330d2665036bca5b3e6d62cb6989cc..7c607f962dbbbe2ae8b94e4f5edd46f66c0f966c 100644 (file)
                };
 
                factory: partition@1e0000 {
-                       compatible = "nvmem-cells";
                        label = "factory";
                        reg = <0x1e0000 0x100000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x4da8>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
 
-                       eeprom_factory_8000: eeprom@8000 {
-                               reg = <0x8000 0x4da8>;
-                       };
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x4da8>;
+                               };
+
+                               eeprom_factory_8000: eeprom@8000 {
+                                       reg = <0x8000 0x4da8>;
+                               };
 
-                       macaddr_factory_e000: macaddr@e000 {
-                               reg = <0xe000 0x6>;
+                               macaddr_factory_e000: macaddr@e000 {
+                                       reg = <0xe000 0x6>;
+                               };
                        };
                };
 
index d740d00c6dffd72677e5f7913c367758bf08be1c..d18a503b85f58552b4ad357ed967a3a386d9d0aa 100644 (file)
                        reg = <0x1e0000 0x100000>;
                        read-only;
 
-                       compatible = "nvmem-cells";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       macaddr_factory_4: macaddr@4 {
-                               reg = <0x4 0x6>;
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_factory_4: macaddr@4 {
+                                       reg = <0x4 0x6>;
+                               };
                        };
                };
 
index 3191692e4ef30a9d460c70ba53444588bde672d5..8466cda587bf0ea7005ac7333b77e59499211ddb 100644 (file)
                        reg = <0x1e0000 0x100000>;
                        read-only;
 
-                       compatible = "nvmem-cells";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       macaddr_factory_4: macaddr@4 {
-                               reg = <0x4 0x6>;
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_factory_4: macaddr@4 {
+                                       reg = <0x4 0x6>;
+                               };
                        };
                };
 
index 77e3fffcc18a616d28fe1046ebbdb931e145adf2..cfc8330fe5c55fa3b8f51288fc9169eb6a867f20 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               macaddr_factory_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
-                               };
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
 
-                               macaddr_factory_8004: macaddr@8004 {
-                                       reg = <0x8004 0x6>;
+                                       macaddr_factory_8004: macaddr@8004 {
+                                               reg = <0x8004 0x6>;
+                                       };
                                };
                        };
 
index eb64bd0bfde0cf8e8168a55c2a0fb95b3684d05d..24fb75778154488fbc29aaa01093de629efa17cc 100644 (file)
                };
 
                factory: partition@200000 {
-                       compatible = "nvmem-cells";
                        label = "Factory";
                        reg = <0x200000 0x100000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        sercomm,scpart-id = <2>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x400>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
 
-                       eeprom_factory_8000: eeprom@8000 {
-                               reg = <0x8000 0x4da8>;
-                       };
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               eeprom_factory_8000: eeprom@8000 {
+                                       reg = <0x8000 0x4da8>;
+                               };
 
-                       macaddr_factory_21000: macaddr@21000 {
-                               reg = <0x21000 0x6>;
+                               macaddr_factory_21000: macaddr@21000 {
+                                       reg = <0x21000 0x6>;
+                               };
                        };
                };
 
index b07346bacb46ddd300dd6b082bda3c1550e0a822..2a1f2758158c84964849a4b1ebcf7204f6ae0acd 100644 (file)
                };
 
                factory: partition@200000 {
-                       compatible = "nvmem-cells";
                        label = "Factory";
                        reg = <0x200000 0x100000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        sercomm,scpart-id = <2>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x400>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
 
-                       eeprom_factory_8000: eeprom@8000 {
-                               reg = <0x8000 0x4da8>;
-                       };
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               eeprom_factory_8000: eeprom@8000 {
+                                       reg = <0x8000 0x4da8>;
+                               };
 
-                       macaddr_factory_21000: macaddr@21000 {
-                               reg = <0x21000 0x6>;
+                               macaddr_factory_21000: macaddr@21000 {
+                                       reg = <0x21000 0x6>;
+                               };
                        };
                };
 
index 2e5fcc8bca7e3fa9c5116d30a799020c97a62dfb..e7acc55e500f4ec6c2cd05142bb6a30c278f6619 100644 (file)
                };
 
                factory: partition@100000 {
-                       compatible = "nvmem-cells";
                        label = "Factory";
                        reg = <0x100000 0x80000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0xe00>;
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0xe00>;
+                               };
                        };
                };
 
index 826d3f928aafcc8321caac5d2cdc62607da6f1a2..354c1c5314572b94cc09a5225bf74bdd35908f33 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
 
-                               macaddr_factory_28: macaddr@28 {
-                                       reg = <0x28 0x6>;
+                                       macaddr_factory_28: macaddr@28 {
+                                               reg = <0x28 0x6>;
+                                       };
                                };
                        };
 
index 795fe256b3c3c8ec49c89a23cf655814cca30496..f176691aacc8e0b77f31b5a3de2fded2d950c2a9 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
                                };
                        };
 
index 4ceb4e54e0a2c839b508c5f1948c5c5aa73498eb..81933ba21d8123fb03d00d2dc1d9e356e255e3bf 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
 
-                               macaddr_factory_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
                                };
                        };
 
index b6db48a347ac973231d0f62e7bfa54cdab574ba6..e1b82816f0cfa4b820d3a3352f502fef665261ca 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
 
-                               macaddr_factory_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
                                };
                        };
 
index 80600470e77ec28dead172aa188df4842b9dfc58..106b16573b39fe1c2c737e8613340453387bc4e8 100644 (file)
                                label = "factory";
                                reg = <0x50000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
+                               };
                        };
 
                        partition@90000 {
        };
 };
 
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
-};
-
 &gmac0 {
        nvmem-cells = <&macaddr_factory_e000>;
        nvmem-cell-names = "mac-address";
index f26e6626f5406ceff050b65dda5d0471123e13fb..a915a5d79f0f8a3ca6e615fc4c51536dc527e7fd 100644 (file)
                        
                        factory: partition@40000  {
                                label = "factory";
-                               compatible = "nvmem-cells";
                                reg = <0x40000 0x10000>;
                                read-only;
 
index 314fdb206ca112b73fada2db4dd420bf1f768e87..759abe7ba586ef888bf6fa1006be574c25021a83 100644 (file)
                                reg = <0x1ff0000 0x10000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_bdinfo_de00: macaddr@de00 {
-                                       reg = <0xde00 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_bdinfo_de00: macaddr@de00 {
+                                               reg = <0xde00 0x6>;
+                                       };
                                };
                        };
                };
index fcc16c31b518da3256a78a2fd098fa7429337d7e..ab9f7c6507193f983d09707f5d9a69502e652c36 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
                                };
                        };
 
                        };
 
                        bdinfo: partition@ff0000 {
-                               compatible = "nvmem-cells";
                                label = "bdinfo";
                                reg = <0xff0000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               macaddr_bdinfo_de00: macaddr@de00 {
-                                       reg = <0xde00 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_bdinfo_de00: macaddr@de00 {
+                                               reg = <0xde00 0x6>;
+                                       };
                                };
                        };
                };
index afa13973d57169aea272a643659ad39168bc509e..64beabea939247ebad8323008e0bf9eaf39a5dc3 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
                                };
                        };
 
                        };
 
                        bdinfo: partition@ff0000 {
-                               compatible = "nvmem-cells";
                                label = "bdinfo";
                                reg = <0xff0000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               macaddr_bdinfo_de00: macaddr@de00 {
-                                       reg = <0xde00 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_bdinfo_de00: macaddr@de00 {
+                                               reg = <0xde00 0x6>;
+                                       };
                                };
                        };
                };
index cfae15e5659aa8248b7b6aa69a16f64183e34f08..3ba72d5f971f151661c685f637ab4f7320d66194 100644 (file)
                reg = <0x1ff0000 0x10000>;
                read-only;
 
-               compatible = "nvmem-cells";
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               macaddr_bdinfo_de00: macaddr@de00 {
-                       reg = <0xde00 0x6>;
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_bdinfo_de00: macaddr@de00 {
+                               reg = <0xde00 0x6>;
+                       };
                };
        };
 };
index 16fa15befc4d1ee03a9c3f23abb7eb2f38977be9..f4d50d42e72c719d95c874a80142c32ff3b10e88 100644 (file)
                reg = <0xff0000 0x10000>;
                read-only;
 
-               compatible = "nvmem-cells";
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               macaddr_bdinfo_de00: macaddr@de00 {
-                       reg = <0xde00 0x6>;
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_bdinfo_de00: macaddr@de00 {
+                               reg = <0xde00 0x6>;
+                       };
                };
        };
 };
index a25787b71b873fc2f74484f81480e39fc72345f8..82160cff03f20cca99dc69676c0583b86bbd5162 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
-                               };
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index 3d27b0a942bd16d8204b5a3af9493d7a69e0bc29..29c212671cccb8bcd4bf859e0249e0ab7fca9b29 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
-                               };
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index 818d2d8c41319133851572fc5890e55bb441ecf2..73f6247b47788e0359e7503587ab16d846099fed 100644 (file)
                        reg = <0x100000 0x80000>;
                        read-only;
 
-                       compatible = "nvmem-cells";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       macaddr_factory_4: macaddr@4 {
-                               reg = <0x4 0x6>;
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_factory_4: macaddr@4 {
+                                       reg = <0x4 0x6>;
+                               };
                        };
                };
 
index 5af9ea28ea496d36615d821636c077926df8f53a..23995079fdb5f2f90a8e321de49cd2ce55d4e621 100644 (file)
                };
 
                factory: partition@100000 {
-                       compatible = "nvmem-cells";
                        label = "factory";
                        reg = <0x100000 0x40000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x4da8>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
 
-                       eeprom_factory_8000: eeprom@8000 {
-                               reg = <0x8000 0x4da8>;
-                       };
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x4da8>;
+                               };
 
-                       macaddr_factory_e000: macaddr@e000 {
-                               reg = <0xe000 0x6>;
-                       };
+                               eeprom_factory_8000: eeprom@8000 {
+                                       reg = <0x8000 0x4da8>;
+                               };
+
+                               macaddr_factory_e000: macaddr@e000 {
+                                       reg = <0xe000 0x6>;
+                               };
 
-                       macaddr_factory_e006: macaddr@e006 {
-                               reg = <0xe006 0x6>;
+                               macaddr_factory_e006: macaddr@e006 {
+                                       reg = <0xe006 0x6>;
+                               };
                        };
                };
 
index 7cd4a92aa7dfce169267ec1809b81e5c1c516ca3..8e5e35945a646934caac6d3a42609f6eac600db6 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index 36758567807a965fe7e6e7ddbd75ce0d1849144c..747d1de18a0649c594b17a134a3abb34775d9c12 100644 (file)
                };
 
                factory: partition@100000 {
-                       compatible = "nvmem-cells";
                        label = "factory";
                        reg = <0x100000 0x40000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x4da8>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
 
-                       macaddr_factory_4: macaddr@4 {
-                               reg = <0x4 0x6>;
-                       };
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x4da8>;
+                               };
 
-                       macaddr_factory_e000: macaddr@e000 {
-                               reg = <0xe000 0x6>;
-                       };
+                               macaddr_factory_4: macaddr@4 {
+                                       reg = <0x4 0x6>;
+                               };
+
+                               macaddr_factory_e000: macaddr@e000 {
+                                       reg = <0xe000 0x6>;
+                               };
 
-                       macaddr_factory_e006: macaddr@e006 {
-                               reg = <0xe006 0x6>;
+                               macaddr_factory_e006: macaddr@e006 {
+                                       reg = <0xe006 0x6>;
+                               };
                        };
                };
 
index 36d22046a95a34b8e3fb1377ab25c64e1db24508..451722743d96ce79e9c33bcc284203e481409235 100644 (file)
                        };
 
                        radio: partition@34000 {
-                               compatible = "nvmem-cells";
                                label = "radio";
                                reg = <0x34000 0x4000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               macaddr_radio_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_radio_0: eeprom@0 {
-                                       reg = <0x0 0x200>;
-                               };
+                                       macaddr_radio_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
+
+                                       eeprom_radio_0: eeprom@0 {
+                                               reg = <0x0 0x200>;
+                                       };
 
-                               eeprom_radio_2000: eeprom@2000 {
-                                       reg = <0x2000 0x200>;
+                                       eeprom_radio_2000: eeprom@2000 {
+                                               reg = <0x2000 0x200>;
+                                       };
                                };
                        };
 
index fee88647775d26cec77465ccc4486b38a7e2f143..9d770dda2f708abb74f75a86c934780dd49bd6cf 100644 (file)
                };
 
                factory: partition@100000 {
-                       compatible = "nvmem-cells";
                        label = "factory";
                        reg = <0x100000 0x40000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x4da8>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
 
-                       eeprom_factory_8000: eeprom@8000 {
-                               reg = <0x8000 0x4da8>;
-                       };
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x4da8>;
+                               };
 
-                       macaddr_factory_e000: macaddr@e000 {
-                               reg = <0xe000 0x6>;
-                       };
+                               eeprom_factory_8000: eeprom@8000 {
+                                       reg = <0x8000 0x4da8>;
+                               };
+
+                               macaddr_factory_e000: macaddr@e000 {
+                                       reg = <0xe000 0x6>;
+                               };
 
-                       macaddr_factory_e006: macaddr@e006 {
-                               reg = <0xe006 0x6>;
+                               macaddr_factory_e006: macaddr@e006 {
+                                       reg = <0xe006 0x6>;
+                               };
                        };
                };
 
index cc979df26a6725ef6ad6288ad97028f495d28221..a933b14925094e87207469eacf8d5b65759f2991 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
                                };
                        };
 
index a8e518cae46a78094d6ae0510769875cf5020e1e..021c9e17c6581a1e1e0a18038aa5162cea90bdb7 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x20000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
-                               };
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index dddd39ceaae415ec0d65d1f856a92fcd08f10418..93380e306747d36331b2cfd7fcf2e40cd3cd639c 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
 
-                               macaddr_factory_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
-                               };
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
-                               };
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index 2a18b3982d91d95d8ced7f9904c8402c4dbf3ac9..cafda8e1ecc6bc9b9a76293545c6ab9de93ac838 100644 (file)
                                reg = <0x40000 0x10000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
                                };
                        };
 
index c96292be33f1b519d6015eb19d55164a60c29a0b..80a271f6e33d4a6472a4c43f68cc96710ec46edf 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
 
-                               macaddr_factory_8004: macaddr@8004 {
-                                       reg = <0x8004 0x6>;
+                                       macaddr_factory_8004: macaddr@8004 {
+                                               reg = <0x8004 0x6>;
+                                       };
                                };
                        };
 
index 4aac3fb6d7ce0410fb64151e2e3533a63aa10e19..464e2a74441997ba81daeea40d16330bd5258a43 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
 
-                               macaddr_factory_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
                                };
                        };
 
index 6a9531eb33207ec917ddbcf7a0087a6fd4cf5ef5..b280790d64f06cc708ee35cf4d376b3e27ab1c9a 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index 81ace64e44bcbfd5a5b73cdca26f9a20c60dcd36..9ed7acac9429b7ccdf46429aa4ac00e335aed368 100644 (file)
 };
 
 &wifi {
-       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cells = <&macaddr_factory_4 (-1)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-1)>;
 };
 
 &factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       macaddr_factory_4: macaddr@4 {
-               reg = <0x4 0x6>;
-       };
+               macaddr_factory_4: macaddr@4 {
+                       compatible = "mac-base";
+                       reg = <0x4 0x6>;
+                       #nvmem-cell-cells = <1>;
+               };
 
-       macaddr_factory_fff4: macaddr@fff4 {
-               reg = <0xfff4 0x6>;
-       };
+               macaddr_factory_fff4: macaddr@fff4 {
+                       reg = <0xfff4 0x6>;
+               };
 
-       macaddr_factory_fffa: macaddr@fffa {
-               reg = <0xfffa 0x6>;
+               macaddr_factory_fffa: macaddr@fffa {
+                       reg = <0xfffa 0x6>;
+               };
        };
 };
index cb2e202793754655d6caa887f269e2a69bc4536a..d7510c292b7e6f55688976ff12d1d7e2fb4906dd 100644 (file)
 };
 
 &wifi {
-       nvmem-cells = <&macaddr_factory_e006>;
+       nvmem-cells = <&macaddr_factory_e006 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
+               macaddr_factory_e000: macaddr@e000 {
+                       reg = <0xe000 0x6>;
+               };
 
-       macaddr_factory_e006: macaddr@e006 {
-               reg = <0xe006 0x6>;
+               macaddr_factory_e006: macaddr@e006 {
+                       compatible = "mac-base";
+                       reg = <0xe006 0x6>;
+                       #nvmem-cell-cells = <1>;
+               };
        };
 };
index 8450af5907403267527690652b439e7fa2a24d89..c01533fafdd0c555e4005ddfa2d8d4b2afdea4c7 100644 (file)
 };
 
 &factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
+               macaddr_factory_e000: macaddr@e000 {
+                       reg = <0xe000 0x6>;
+               };
 
-       macaddr_factory_e006: macaddr@e006 {
-               reg = <0xe006 0x6>;
+               macaddr_factory_e006: macaddr@e006 {
+                       reg = <0xe006 0x6>;
+               };
        };
 };
index a57a4290affa8fb5dc78d994f61114783a92ec3a..4157fb6c1351cd735ecfeccc113a2a78e771a87c 100644 (file)
 };
 
 &factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
+               macaddr_factory_e000: macaddr@e000 {
+                       reg = <0xe000 0x6>;
+               };
 
-       macaddr_factory_e006: macaddr@e006 {
-               reg = <0xe006 0x6>;
+               macaddr_factory_e006: macaddr@e006 {
+                       reg = <0xe006 0x6>;
+               };
        };
 };
index f01f6fc25f0313c9021bb7140c0ca0ba03a38b11..d978ff8238840d98cbc25b2b8330438064e417b6 100644 (file)
 };
 
 &factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
+               macaddr_factory_e000: macaddr@e000 {
+                       reg = <0xe000 0x6>;
+               };
 
-       macaddr_factory_e006: macaddr@e006 {
-               reg = <0xe006 0x6>;
+               macaddr_factory_e006: macaddr@e006 {
+                       reg = <0xe006 0x6>;
+               };
        };
 };
index ec433e265de34fed3ce5a8264421dfac015dbe8b..5e3b47e2746d3ea5471fed92a690ecb2a8d8d561 100644 (file)
 };
 
 &factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
+               macaddr_factory_e000: macaddr@e000 {
+                       reg = <0xe000 0x6>;
+               };
 
-       macaddr_factory_e006: macaddr@e006 {
-               reg = <0xe006 0x6>;
+               macaddr_factory_e006: macaddr@e006 {
+                       reg = <0xe006 0x6>;
+               };
        };
 };
index 7096b015ef872a176941df34080dc2642d5ef28b..618b07e798ded94fb68664a917a4c0da739fc1eb 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
                                };
                        };
                };
index 7e88f7be04f4269dd3559adc24253ea2e4d847a1..77fcb8c4298b2dc0a257655c298ab4b522aaf73c 100644 (file)
 };
 
 &factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       macaddr_factory_fff4: macaddr@fff4 {
-               reg = <0xfff4 0x6>;
-       };
+               macaddr_factory_fff4: macaddr@fff4 {
+                       reg = <0xfff4 0x6>;
+               };
 
-       macaddr_factory_fffa: macaddr@fffa {
-               reg = <0xfffa 0x6>;
+               macaddr_factory_fffa: macaddr@fffa {
+                       reg = <0xfffa 0x6>;
+               };
        };
 };
index 1d174006bd0d2eac56b799f5ae60dee71af61098..481734a51c1b741a81d5a35a82453c49f46c7a9c 100644 (file)
 };
 
 &factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
+               macaddr_factory_e000: macaddr@e000 {
+                       reg = <0xe000 0x6>;
+               };
 
-       macaddr_factory_e006: macaddr@e006 {
-               reg = <0xe006 0x6>;
+               macaddr_factory_e006: macaddr@e006 {
+                       reg = <0xe006 0x6>;
+               };
        };
 };
index b71a2b4390f1786f144df8d6fdaae7a56da7df03..e7c06ff359dcfe332381d77b3f9cdfffa665178c 100644 (file)
 };
 
 &factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
+               macaddr_factory_e000: macaddr@e000 {
+                       reg = <0xe000 0x6>;
+               };
 
-       macaddr_factory_e006: macaddr@e006 {
-               reg = <0xe006 0x6>;
+               macaddr_factory_e006: macaddr@e006 {
+                       reg = <0xe006 0x6>;
+               };
        };
 };
index 2c60f3d8b6b9b445f1e6a058d55ce51444cf2880..30b8d4e0104c932270af9dbf4913221ceb8ec501 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
                                };
                        };
                };
index d63be92c7853679b4bbe631ef34c3d9f91f3d816..90309dad0a12a1c788658daa9df79bc348d00ac5 100644 (file)
                };
 
                factory: partition@200000 {
-                       compatible = "nvmem-cells";
                        label = "Factory";
                        reg = <0x200000 0x100000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        sercomm,scpart-id = <2>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x400>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
 
-                       eeprom_factory_8000: eeprom@8000 {
-                               reg = <0x8000 0x4da8>;
-                       };
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               eeprom_factory_8000: eeprom@8000 {
+                                       reg = <0x8000 0x4da8>;
+                               };
 
-                       macaddr_factory_21000: macaddr@21000 {
-                               reg = <0x21000 0x6>;
+                               macaddr_factory_21000: macaddr@21000 {
+                                       reg = <0x21000 0x6>;
+                               };
                        };
                };
 
index acc9e9865f9c41a1edeab7662e26c587a87fbeb0..a9d9da872e3b9557aad42990b9c50f1bc2828ba6 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x200>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x200>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
                                };
                        };
 
index a87f82b6811a00e452197852c9a534fd36a21eb2..778b2f07981b017c395a2a8f50eef671aff5af7d 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
                                };
                        };
 
index 1565666a5d82e53be4a041abc227f235442f908c..94a9b1c092b6a6673687567f40f9a47b5d65e37d 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
 
-                               macaddr_factory_4000: macaddr@4000 {
-                                       reg = <0x4000 0x6>;
+                                       macaddr_factory_4000: macaddr@4000 {
+                                               reg = <0x4000 0x6>;
+                                       };
                                };
                        };
 
index 5d28e22776c8e1ab16a51770b6720c2da4c60827..6bdba25b2b4ce63361a19601f27c581868291493 100644 (file)
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
                function = "gpio";
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
-};
index d4998113456d7c8ace5a300810bbcf44639ddba0..9a2cffeb97cfaeeebef1bc9ee8c85b3f90038a8f 100644 (file)
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
                function = "gpio";
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
-};
index afb188dff4556c9d362b4f33f4b36667bcd27a16..59b49fbefc8b0231612781a78ce428ac2209cdfb 100644 (file)
                };
 
                factory: partition@180000 {
-                       compatible = "nvmem-cells";
                        label = "factory";
                        reg = <0x0180000 0x0080000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0xe00>;
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0xe00>;
+                               };
                        };
                };
 
index afda347ee73658a6b3a31421a62b27854feb7584..6d9608d18f8eecabedc83f41bd2531e2af673f3d 100644 (file)
                };
 
                factory: partition@100000 {
-                       compatible = "nvmem-cells";
                        label = "factory";
                        reg = <0x0100000 0x0080000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0xe00>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0xe00>;
+                               };
 
-                       macaddr_factory_8004: macaddr@8004 {
-                               reg = <0x8004 0x6>;
+                               macaddr_factory_8004: macaddr@8004 {
+                                       reg = <0x8004 0x6>;
+                               };
                        };
                };
 
index 94b211ab7a7126454b9f3c3439a4aa739b5e3160..7bec688f866fe5ac00a8edffd8ed4ea4da5e4043 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x200>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x200>;
+                                       };
 
-                               macaddr_factory_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
-                               };
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
 
-                               macaddr_factory_8004: macaddr@8004 {
-                                       reg = <0x8004 0x6>;
+                                       macaddr_factory_8004: macaddr@8004 {
+                                               reg = <0x8004 0x6>;
+                                       };
                                };
                        };
 
index 99bd01c6d938c415d3d0468cad159dab0de7f27e..41ed5088c0ab7e02fbdf992b7724e6a57f748b2f 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
                                };
                        };
 
index 63c4f5f6b24bd250d0d2f8579f998ebfc0073fdc..a21a6a455b3ad56b84c6e5b434f54a4a96348ed9 100644 (file)
                };
 
                factory: partition@100000 {
-                       compatible = "nvmem-cells";
                        label = "factory";
                        reg = <0x100000 0x40000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x400>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
 
-                       eeprom_factory_8000: eeprom@8000 {
-                               reg = <0x8000 0x200>;
+                               eeprom_factory_8000: eeprom@8000 {
+                                       reg = <0x8000 0x200>;
+                               };
                        };
                };
 
index fc548352d54c81877bf64c2057f849abf63b95d5..9b9a98310877317ece3d0ce5469e40f6553530da 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
                                };
                        };
 
index ac13b4a9c593cec83da594e8fcf667ced722b6d0..be5f23ca7d6e6aa7f225e3dc576c4e24c342c54c 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x30000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
 
-                               macaddr_factory_10007: macaddr@10007 {
-                                       reg = <0x10007 0x6>;
-                               };
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
+
+                                       macaddr_factory_10007: macaddr@10007 {
+                                               reg = <0x10007 0x6>;
+                                       };
 
-                               macaddr_factory_1000d: macaddr@1000d {
-                                       reg = <0x1000d 0x6>;
+                                       macaddr_factory_1000d: macaddr@1000d {
+                                               reg = <0x1000d 0x6>;
+                                       };
                                };
                        };
 
index b08939a451d012ed8ec39ceade8b110b0ea0328b..b93102163fbfeb3bcca99150001d1c0a7077e45d 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x200>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x200>;
+                                       };
 
-                               macaddr_factory_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
                                };
                        };
 
                        iNIC_rf: partition@50000 {
-                               compatible = "nvmem-cells";
                                label = "iNIC_rf";
                                reg = <0x50000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_iNIC_rf_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_iNIC_rf_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               macaddr_iNIC_rf_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
+                                       macaddr_iNIC_rf_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
                                };
                        };
 
index b9357632e1ac78aa4064c19f65db407a545d5418..b9b901a6ce0079f25e7137a5079affbf384c4a02 100644 (file)
                };
 
                partition@100000 {
-                       compatible = "nvmem-cells";
                        label = "factory";
                        reg = <0x100000 0x80000>;
                        read-only;
index 19868fa078b446b6cab05a51737ecb3eb5ac6cbe..9680aadfbbf970af6b38f0e9c77073a3e580e774 100644 (file)
                };
 
                factory: partition@200000 {
-                       compatible = "nvmem-cells";
                        label = "factory";
                        reg = <0x200000 0x200000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x400>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
 
-                       eeprom_factory_8000: eeprom@8000 {
-                               reg = <0x8000 0x4da8>;
-                       };
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
 
-                       macaddr_factory_1e000: macaddr@1e000 {
-                               reg = <0x1e000 0x6>;
-                       };
+                               eeprom_factory_8000: eeprom@8000 {
+                                       reg = <0x8000 0x4da8>;
+                               };
+
+                               macaddr_factory_1e000: macaddr@1e000 {
+                                       reg = <0x1e000 0x6>;
+                               };
 
-                       macaddr_factory_1e006: macaddr@1e006 {
-                               reg = <0x1e006 0x6>;
+                               macaddr_factory_1e006: macaddr@1e006 {
+                                       reg = <0x1e006 0x6>;
+                               };
                        };
                };
 
index f2cd28ad1c7da4f3425cc6f3fdf69f0d45c33408..5b9d0d59b214f730a05761ac5580ecf38c25afa4 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               macaddr_factory_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
                                };
                        };
 
index 4b42fcb7de72e5104460fb58a659ec33b70b78c4..f25d2db9b309751fe04c576bc8a8c538f8e3bf45 100644 (file)
                factory: partition@200000 {
                        label = "factory";
                        reg = <0x0200000 0x0100000>;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_factory_e000: macaddr@e000 {
+                                       reg = <0xe000 0x6>;
+                               };
+
+                               macaddr_factory_e006: macaddr@e006 {
+                                       reg = <0xe006 0x6>;
+                               };
+                       };
                };
 
                partition@300000 {
 &xhci {
        status = "disabled";
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
-
-       macaddr_factory_e006: macaddr@e006 {
-               reg = <0xe006 0x6>;
-       };
-};
index 6729e94cc5a12a0ecede16bf826e91baff41de69..1c46f57e584b2d55b51cadf6fd325040dabbddb8 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x040000 0x010000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
 
-                               macaddr_factory_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
                                };
                        };
 
index fc51b9ac4f048da8527f79a712b58e25adb79af3..6b77902136728812291529748ffd7c9034671b32 100644 (file)
                                reg = <0x0 0x20000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_uboot_1fc40: macaddr@1fc40 {
-                                       reg = <0x1fc40 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc40: macaddr@1fc40 {
+                                               reg = <0x1fc40 0x6>;
+                                       };
                                };
                        };
 
                        };
 
                        factory: partition@30000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x30000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
                                };
                        };
 
index 0faf24e7b05d1d5dcb5a036c6f4250d30083b7c2..3bf0600e5fec7d53b78c271e905d5b8cf338bcf1 100644 (file)
                        #size-cells = <1>;
 
                        uboot: partition@0 {
-                               compatible = "nvmem-cells";
                                label = "u-boot";
                                reg = <0x0 0x20000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               macaddr_uboot_1fc20: macaddr@1fc20 {
-                                       reg = <0x1fc20 0x6>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc20: macaddr@1fc20 {
+                                               reg = <0x1fc20 0x6>;
+                                       };
 
-                               macaddr_uboot_1fc40: macaddr@1fc40 {
-                                       reg = <0x1fc40 0x6>;
+                                       macaddr_uboot_1fc40: macaddr@1fc40 {
+                                               reg = <0x1fc40 0x6>;
+                                       };
                                };
                        };
 
                        };
 
                        factory: partition@30000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x30000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x200>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x200>;
+                                       };
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
                                };
                        };
 
index 000657c8667e8156f7b756725a5d29f79f9e66b8..92e8eab918c59b0d3a3df1e44a44668cbf5fa4a9 100644 (file)
                };
 
                factory: partition@a0000 {
-                       compatible = "nvmem-cells";
                        label = "factory";
                        reg = <0xa0000 0x20000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x4da8>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
 
-                       macaddr_factory_4: macaddr@4 {
-                               reg = <0x4 0x6>;
-                       };
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x4da8>;
+                               };
+
+                               macaddr_factory_4: macaddr@4 {
+                                       reg = <0x4 0x6>;
+                               };
 
-                       macaddr_factory_8004: macaddr@8004 {
-                               reg = <0x8004 0x6>;
+                               macaddr_factory_8004: macaddr@8004 {
+                                       reg = <0x8004 0x6>;
+                               };
                        };
                };
 
index db7743f137baf7df0dc4caea77434b50b67c2f22..ef58382ab61cd6005b3ed9e9a0ac2bd7a46d940c 100644 (file)
                        #size-cells = <1>;
 
                        uboot: partition@0 {
-                               compatible = "nvmem-cells";
                                label = "u-boot";
                                reg = <0x0 0x20000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               macaddr_uboot_1fc20: macaddr@1fc20 {
-                                       reg = <0x1fc20 0x6>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc20: macaddr@1fc20 {
+                                               reg = <0x1fc20 0x6>;
+                                       };
 
-                               macaddr_uboot_1fc40: macaddr@1fc40 {
-                                       reg = <0x1fc40 0x6>;
+                                       macaddr_uboot_1fc40: macaddr@1fc40 {
+                                               reg = <0x1fc40 0x6>;
+                                       };
                                };
                        };
 
                        };
 
                        factory: partition@30000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x30000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
                                };
                        };
 
index dc9033c3940509843ec51241cb11cf732040a147..7be11315c540e95132b0d6c1cc9c89b7b1ab29b9 100644 (file)
                        #size-cells = <1>;
 
                        uboot: partition@0 {
-                               compatible = "nvmem-cells";
                                label = "u-boot";
                                reg = <0x0 0x20000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               macaddr_uboot_1fc20: macaddr@1fc20 {
-                                       reg = <0x1fc20 0x6>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc20: macaddr@1fc20 {
+                                               reg = <0x1fc20 0x6>;
+                                       };
 
-                               macaddr_uboot_1fc40: macaddr@1fc40 {
-                                       reg = <0x1fc40 0x6>;
+                                       macaddr_uboot_1fc40: macaddr@1fc40 {
+                                               reg = <0x1fc40 0x6>;
+                                       };
                                };
                        };
 
                        };
 
                        factory: partition@30000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x30000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
                                };
                        };
 
index 554d73ce3d4cd34459b81a4d5aed8771ef2f6277..38b1c196a100a10f7a1177c521e4a85ef1600ae7 100644 (file)
                        reg = <0x100000 0x80000>;
                        read-only;
 
-                       compatible = "nvmem-cells";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       macaddr_factory_4: macaddr@4 {
-                               reg = <0x4 0x6>;
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_factory_4: macaddr@4 {
+                                       reg = <0x4 0x6>;
+                               };
                        };
                };
 
index 5714a57c4e42bee5d9d27450be6e85068f81edfd..fd9bd66bf8c74ba670fd2d8ae64955d0ec903f3b 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
 
-                               macaddr_factory_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
-                               };
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
+
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
                                };
                        };
 
index 4f480ab2c8fd4b1c1bad1d65616f90c80a75d37d..349773e22cd9063c1119e7c007ed62dab043b444 100644 (file)
                };
 
                factory: partition@100000 {
-                       compatible = "nvmem-cells";
                        label = "Factory";
                        reg = <0x100000 0x80000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0xe00>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
 
-                       macaddr_factory_3fff4: macaddr@3fff4 {
-                               reg = <0x3fff4 0x6>;
-                       };
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0xe00>;
+                               };
+
+                               macaddr_factory_3fff4: macaddr@3fff4 {
+                                       reg = <0x3fff4 0x6>;
+                               };
 
-                       macaddr_factory_3fffa: macaddr@3fffa {
-                               reg = <0x3fffa 0x6>;
+                               macaddr_factory_3fffa: macaddr@3fffa {
+                                       reg = <0x3fffa 0x6>;
+                               };
                        };
                };
 
index 9e50d9b3ed77df28011b4bdfd389c6837bbb1bcd..2cec1af23e2033d0ce4ab692023b44b9d51203dc 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index 8f617484533eff689af060f4abf519a78e7f0426..264c908c45b61bdeb8861d1222e2eb06ab08de5c 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "rf-eeprom";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_400: eeprom@400 {
-                                       reg = <0x400 0x4da8>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               macaddr_factory_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
-                               };
+                                       eeprom_factory_400: eeprom@400 {
+                                               reg = <0x400 0x4da8>;
+                                       };
+
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
 
-                               macaddr_factory_28: macaddr@28 {
-                                       reg = <0x28 0x6>;
+                                       macaddr_factory_28: macaddr@28 {
+                                               reg = <0x28 0x6>;
+                                       };
                                };
                        };
 
index a6a7fc9f427cd74e2df57e5fd80e6933862c8c3d..dd8d22445429b399be50b4459d10edb65375c9f8 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
-                               };
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index c1b8048f0cf22adcafe415e9dab56a64289b57b5..3f23aa69a4325d6a74d3bddc3ed9b8dd4543b327 100644 (file)
                };
 
                factory: partition@c0000 {
-                       compatible = "nvmem-cells";
                        label = "factory";
                        reg = <0xc0000 0x40000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x400>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
 
-                       eeprom_factory_8000: eeprom@8000 {
-                               reg = <0x8000 0x4da8>;
+                               eeprom_factory_8000: eeprom@8000 {
+                                       reg = <0x8000 0x4da8>;
+                               };
                        };
                };
 
index 4451e5e3f3eac93d2b8b7f596cdd96cb73f4abeb..2bce2d759019224afdec1f751126a8d5de76cdc0 100644 (file)
                };
 
                factory: partition@100000 {
-                       compatible = "nvmem-cells";
                        label = "Factory";
                        reg = <0x100000 0x80000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0xe00>;
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0xe00>;
+                               };
                        };
                };
 
index 5b295a06a7352774ed17afde269a7b887f6bb8d7..3a6822452685516561369f2e6e0e30649674bca2 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x200>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x200>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
 
-                               macaddr_factory_2e: macaddr@2e {
-                                       reg = <0x2e 0x6>;
+                                       macaddr_factory_2e: macaddr@2e {
+                                               reg = <0x2e 0x6>;
+                                       };
                                };
                        };
 
index c5b6ecc233e1e4d284885af485dd9f15d05464a2..9b9c84a048762f5ce9d92ef88a212a06ec32f6d9 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
 
-                               macaddr_factory_2e: macaddr@2e {
-                                       reg = <0x2e 0x6>;
+                                       macaddr_factory_2e: macaddr@2e {
+                                               reg = <0x2e 0x6>;
+                                       };
                                };
                        };
 
index 557abcc21af2eac5c3a05ba40087de759a03b951..3874953e45203789f4ad9258b9910eca64966c1b 100644 (file)
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_5: macaddr@5 {
+                                               reg = <0x5 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
 &pcie {
        status = "okay";
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_5: macaddr@5 {
-               reg = <0x5 0x6>;
-       };
-};
index 19d2f0f6fc42a6460e9eee5559e98518033c0e1b..d364a917942eb5ae5cd3fe9740fb0092aa543411 100644 (file)
                                label = "Factory";
                                reg = <0x40000 0x10000>;
                                read-only;
-                               compatible = "nvmem-cells";
 
                                nvmem-layout {
                                        compatible = "fixed-layout";
                                label = "m_custom";
                                reg = <0xfe0000 0x20000>;
                                read-only;
-                               compatible = "nvmem-cells";
 
                                nvmem-layout {
                                        compatible = "fixed-layout";
index ebfc370caf37ceee27707d63a7dda0ced78ec424..b538805851db25091af89bb06def34de01a485e3 100644 (file)
                                label = "config";
                                reg = <0xfa0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        partition@fb0000 {
                function = "gpio";
        };
 };
-
-&config {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_config_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};
index dc70414da9c2b245886b05c5bf1b5bc354106e08..90639180781083aa1bf7338a5dc118c9cd769a34 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x200>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x200>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
                                };
                        };
 
index 5872a710b886d4e04c0d58e65b1c483aa5ad8684..3065970807ba9d56c59f60fa36c62592aa127384 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x200>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x200>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
 
-                               macaddr_factory_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
                                };
                        };
 
index 0ddcd6c35ed15d75b27b75667251184771a247f7..41e603c16058b3083d8002acf52edd0dc3ef1f05 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x200>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x200>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
 
-                               macaddr_factory_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
                                };
                        };
 
index f960d8f66fee98bb4f2d1615a9ada98044bce2d5..132210cb0ce9bd748ecc7d215768bcdee389b0f4 100644 (file)
@@ -42,7 +42,6 @@
                };
 
                factory: partition@2e00000 {
-                       compatible = "nvmem-cells";
                        label = "factory";
                        reg = <0x2e00000 0x100000>;
                        read-only;
index 5c4512b508efcb96e42e5076eedb11d1b3d620e4..1589d2de4b8ebe1d8ce2e78c4a48d285c2f9800e 100644 (file)
                        reg = <0x4600000 0x200000>;
                        sercomm,scpart-id = <16>;
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_factory_4: macaddr@4 {
+                                       reg = <0x4 0x6>;
+                               };
+                       };
                };
 
                partition@4800000 {
                };
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_4: macaddr@4 {
-               reg = <0x4 0x6>;
-       };
-};
index cd9582e541207294258f2a279c3b164622ba50b8..87fe42c7774e64915d80fb883431ab54d1ebc761 100644 (file)
                        reg = <0x4600000 0x200000>;
                        sercomm,scpart-id = <16>;
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_factory_4: macaddr@4 {
+                                       reg = <0x4 0x6>;
+                               };
+                       };
                };
 
                partition@4800000 {
                };
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_4: macaddr@4 {
-               reg = <0x4 0x6>;
-       };
-};
index 53a4449b8bfebd715167cd60b4ae0c3844fca254..48a3302e79c4540c5939fd739531a9f7c392d86c 100644 (file)
                };
 
                factory: partition@2e00000 {
-                       compatible = "nvmem-cells";
                        label = "factory";
                        reg = <0x2e00000 0x100000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x400>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
 
-                       eeprom_factory_8000: eeprom@8000 {
-                               reg = <0x8000 0x200>;
-                       };
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               eeprom_factory_8000: eeprom@8000 {
+                                       reg = <0x8000 0x200>;
+                               };
 
-                       macaddr_factory_4: macaddr@4 {
-                               reg = <0x4 0x6>;
+                               macaddr_factory_4: macaddr@4 {
+                                       reg = <0x4 0x6>;
+                               };
                        };
                };
 
index eb7d1bb7e5fede46f48e4c2d3b2af0b2f39eadc9..c0c3500af25ad98a9ec76113952f44a02879f993 100644 (file)
                };
 
                factory: partition@100000 {
-                       compatible = "nvmem-cells";
                        label = "Factory";
                        reg = <0x100000 0x80000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0xe00>;
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0xe00>;
+                               };
                        };
                };
 
index 29f111b572d9a6e3f364975e15ba7c623bfd8ba8..c58e32377e800b700407cdbea8c1b38e72a26cba 100644 (file)
                };
 
                factory: partition@100000 {
-                       compatible = "nvmem-cells";
                        label = "factory";
                        reg = <0x100000 0x40000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x200>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
 
-                       eeprom_factory_8000: eeprom@8000 {
-                               reg = <0x8000 0x200>;
-                       };
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x200>;
+                               };
 
-                       macaddr_factory_e000: macaddr@e000 {
-                               reg = <0xe000 0x6>;
-                       };
+                               eeprom_factory_8000: eeprom@8000 {
+                                       reg = <0x8000 0x200>;
+                               };
+
+                               macaddr_factory_e000: macaddr@e000 {
+                                       reg = <0xe000 0x6>;
+                               };
 
-                       macaddr_factory_e006: macaddr@e006 {
-                               reg = <0xe006 0x6>;
+                               macaddr_factory_e006: macaddr@e006 {
+                                       reg = <0xe006 0x6>;
+                               };
                        };
                };
 
index 56711332556c809884a6db525528b765e18bc9fd..880a04710bd38cf19fc26ecf195e446e12968c66 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
                                };
                        };
 
                                reg = <0xfe0000 0x10000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               macaddr_bdinfo_9: macaddr@9 {
-                                       reg = <0x9 0x6>;
+                                       macaddr_bdinfo_9: macaddr@9 {
+                                               reg = <0x9 0x6>;
+                                       };
                                };
                        };
 
index fd3b42f6edbd446d22b7a29dfeff7c432dd8529c..85cf8ecfd3ef6028c02f3ae74ceccd861dc38f51 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               macaddr_factory_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
-                               };
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index 1da6d2cca125838472ab59878b2a4748c6ada5e7..93e7280b4c06f9b4b19ba4de041dee55a934ee20 100644 (file)
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
+
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
                function = "gpio";
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
-
-       macaddr_factory_e006: macaddr@e006 {
-               reg = <0xe006 0x6>;
-       };
-};
index 6dd4b58139976e3fcba52b542d663d4c5c30c412..4a9e420370a47b92397094d5fa7d9d5d16041645 100644 (file)
@@ -81,8 +81,6 @@
                        reg = <0x80000 0x80000>;
                        read-only;
 
-                       compatible = "nvmem-cells";
-
                        nvmem-layout {
                                compatible = "fixed-layout";
                                #address-cells = <1>;
                };
 
                factory: partition@100000 {
-                       compatible = "nvmem-cells";
                        label = "Factory";
                        reg = <0x100000 0x40000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x4da8>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x4da8>;
+                               };
 
-                       macaddr_factory_4: macaddr@4 {
-                               reg = <0x4 0x6>;
+                               macaddr_factory_4: macaddr@4 {
+                                       reg = <0x4 0x6>;
+                               };
                        };
                };
 
index 3cf29d1729520d90cd8fe07dd6124ca0890486b4..b01a976c18691535556772dcc7bf776f3fd56d13 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
 
-                               macaddr_factory_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
                                };
                        };
 
index e5946af9094f57e273582496fd7143bd6b6866e8..c3c5a2ff4a82001a3f1a3535359e68361f812ba7 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
-                               };
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index 479ea067a7b136bf1db10e92683f02b680b2f335..67f70a3b60c5764553e2b9af2e2585f8a86ea577 100644 (file)
                };
 
                factory: partition@200000 {
-                       compatible = "nvmem-cells";
                        label = "Factory";
                        reg = <0x200000 0x100000>;
                        sercomm,scpart-id = <2>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x400>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
 
-                       eeprom_factory_8000: eeprom@8000 {
-                               reg = <0x8000 0x4da8>;
-                       };
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               eeprom_factory_8000: eeprom@8000 {
+                                       reg = <0x8000 0x4da8>;
+                               };
 
-                       macaddr_factory_21000: macaddr@21000 {
-                               reg = <0x21000 0x6>;
+                               macaddr_factory_21000: macaddr@21000 {
+                                       reg = <0x21000 0x6>;
+                               };
                        };
                };
 
index 7fe0258223b8cd0b7ab77bdea21a4a5bd5a59370..576273cc99a023bdde3458bc36961f17208c1da9 100644 (file)
                };
 
                factory: partition@100000 {
-                       compatible = "nvmem-cells";
                        label = "factory";
                        reg = <0x100000 0x40000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x400>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
 
-                       eeprom_factory_8000: eeprom@8000 {
-                               reg = <0x8000 0x200>;
-                       };
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               eeprom_factory_8000: eeprom@8000 {
+                                       reg = <0x8000 0x200>;
+                               };
 
-                       macaddr_factory_e000: macaddr@e000 {
-                               reg = <0xe000 0x6>;
+                               macaddr_factory_e000: macaddr@e000 {
+                                       reg = <0xe000 0x6>;
+                               };
                        };
                };
 
index d36440fd0abf1d14f37dd6c1e6545e4459493c37..651466a3a4662469036ec72fdf8a295c248743e6 100644 (file)
                };
 
                factory: partition@100000 {
-                       compatible = "nvmem-cells";
                        label = "factory";
                        reg = <0x100000 0x40000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x400>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
 
-                       eeprom_factory_8000: eeprom@8000 {
-                               reg = <0x8000 0x200>;
-                       };
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               eeprom_factory_8000: eeprom@8000 {
+                                       reg = <0x8000 0x200>;
+                               };
 
-                       macaddr_factory_e000: macaddr@e000 {
-                               reg = <0xe000 0x6>;
+                               macaddr_factory_e000: macaddr@e000 {
+                                       reg = <0xe000 0x6>;
+                               };
                        };
                };
 
index 11cf7752aba580dd1cec8555c886da2644a1cb3d..6344f477e8e565e0be69524a3fa995a7286b6f0d 100644 (file)
                };
 
                factory: partition@100000 {
-                       compatible = "nvmem-cells";
                        label = "Factory";
                        reg = <0x100000 0x100000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x200>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
 
-                       eeprom_factory_8000: eeprom@8000 {
-                               reg = <0x8000 0x200>;
-                       };
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x200>;
+                               };
+
+                               eeprom_factory_8000: eeprom@8000 {
+                                       reg = <0x8000 0x200>;
+                               };
 
-                       macaddr_factory_1000: macaddr@1000 {
-                               reg = <0x1000 0x6>;
+                               macaddr_factory_1000: macaddr@1000 {
+                                       reg = <0x1000 0x6>;
+                               };
                        };
                };
 
index 9dbcbaa3c0c0857c0a794c717c2e8d6ae5552c6a..7383ba1e20942ec663175fa0f9dc34f28cc86d20 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "Factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
-                               };
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index 1cc9b45c403a0637a17790faf7f0097267dd52b8..51425b9a1569f1df3f68a00d54d5a9090dbf1db5 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
-                               };
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index 9e498b78ed7bc78307e85455929d020754d0d191..65f33f615bec2e1b8edab2b098d194bf00d5d061 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index d9f7281a77aec4d60d3cfb5a6a665a719d055b34..39d7f0398fbbc8c256b30386fc685863ab367c40 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x200>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x200>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index 8eb406541b366e8ac5c0bdbbc7ab7693194ec1da..6c983dd54a0b0a39eb79c2a9922bc7d614ec38da 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index a7e048f9ae6c5186e89b4174d423e097e1a17f55..f4b8d171767ce965c56a0baa46cf2a45ffe73947 100644 (file)
                        };
 
                        factory: partition@50000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x50000 0x40000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0xe00>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0xe00>;
+                                       };
 
-                               macaddr_factory_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
                                };
                        };
 
index 917a6beb512228e3b78452cb5539e0bf76cb195e..da1db0366f461e1b92858814970a84031623e0ee 100644 (file)
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
                function = "gpio";
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
-};
index 16d8edb341111e1b529694168317f7efd38de140..8edae7de875d56864539e70a52b3159fc2b9e2fe 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
                                };
                        };
 
index 23d47d6ea35b14e88df0ce16cf98493d2f0fabb2..d2c242be6f4328252e13efd38067d07804a8c62b 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0xe00>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0xe00>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index d90c0b4b59c832e62530c762aca603f06e218593..2d8717e3cdd082d132bf91e96ed592e9acc00d69 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
                                };
                        };
 
index 50834c586643ec62a2069b8054854b415a07dbc5..74b9a9541b145b77284307b12aa62d924757a9c7 100644 (file)
                                label = "config";
                                reg = <0xfa0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        partition@fb0000 {
                function = "gpio";
        };
 };
-
-&config {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_config_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};
index 330f6a0f34048b0230bc196773fd79b91ea8949e..a2c7d8e635c5fe261d0dc38b188f4b8b8ffe5dc0 100644 (file)
                        };
 
                        config: partition@fa0000 {
-                               compatible = "nvmem-cells";
                                label = "config";
                                reg = <0xfa0000 0x010000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               macaddr_config_8: macaddr@8 {
-                                       reg = <0x8 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
                                };
                        };
 
                        };
 
                        radio: partition@ff0000 {
-                               compatible = "nvmem-cells";
                                label = "radio";
                                reg = <0xff0000 0x010000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_radio_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_radio_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               eeprom_radio_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
+                                       eeprom_radio_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
                                };
                        };
                };
index 08867064ed4dcffd98d1f617f124d60458eff471..f8fa7487ce829997cfedef2b55f92b39f05754df 100644 (file)
                        };
 
                        config: partition@fa0000 {
-                               compatible = "nvmem-cells";
                                label = "config";
                                reg = <0xfa0000 0x50000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               macaddr_config_8: macaddr@8 {
-                                       reg = <0x8 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
                                };
                        };
 
                        radio: partition@ff0000 {
-                               compatible = "nvmem-cells";
                                label = "radio";
                                reg = <0xff0000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_radio_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_radio_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               eeprom_radio_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
+                                       eeprom_radio_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
                                };
                        };
                };
index 4603263e8ddf2950f0d87aaa6ae136f161a4c774..087910233e28c1590a490adc1c82663d1d117c63 100644 (file)
                                reg = <0xfa0000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_config_8: macaddr@8 {
-                                       reg = <0x8 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
                                };
                        };
 
                        };
 
                        radio: partition@ff0000 {
-                               compatible = "nvmem-cells";
                                label = "radio";
                                reg = <0xff0000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_radio_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_radio_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               eeprom_radio_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
+                                       eeprom_radio_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
                                };
                        };
                };
index f2aea644fa2b064482909adf91dc54138abe9b42..64df8cf6b1f2262d33fce29ca58cfc433fc33a22 100644 (file)
                        };
 
                        info: partition@90000 {
-                               compatible = "nvmem-cells";
                                label = "product-info";
                                reg = <0x90000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               macaddr_info_8: macaddr@8 {
-                                       reg = <0x8 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
                                };
                        };
 
                        };
 
                        radio: partition@ff0000 {
-                               compatible = "nvmem-cells";
                                label = "radio";
                                reg = <0xff0000 0x010000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_radio_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_radio_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               eeprom_radio_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
+                                       eeprom_radio_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
                                };
                        };
                };
index d25bf5756022e5cd83a1e801f6293cc3dbef04f9..cf08452c50dba472531dbdedda8cdb492c11585f 100644 (file)
                        };
 
                        partition@90000 {
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
                                label = "product-info";
                                reg = <0x90000 0x10000>;
                                read-only;
 
-                               macaddr: macaddr@8 {
-                                       reg = <0x8 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
                                };
                        };
 
index 58e4bbf75741f0ff99bde6951e104fb62556144d..f9bbd9b39286e1fdc34b93310f3f934b7b037733 100644 (file)
                                label = "product-info";
                                reg = <0x90000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        partition@a0000 {
                };
        };
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};
index 016ab03c7b7a921497e1df3ba1467231616581c6..84b3efe8df9d712fbdf859fb60eff4c8153bb268 100644 (file)
                };
 
                factory: partition@7800000 {
-                       compatible = "nvmem-cells";
                        label = "factory";
                        reg = <0x7800000 0x400000>;
                        read-only;
index b9d5995ed5b3b58ddaefa9fcc40db37046071256..f4bc79a165842e44d7548579b667643f30adf79a 100644 (file)
                        };
 
                        romfile: partition@fc0000 {
-                               compatible = "nvmem-cells";
                                label = "romfile";
                                reg = <0xfc0000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               macaddr_romfile_f100: romfile@f100 {
-                                       reg = <0xf100 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_romfile_f100: romfile@f100 {
+                                               reg = <0xf100 0x6>;
+                                       };
                                };
                        };
 
                        };
 
                        radio: partition@fe0000 {
-                               compatible = "nvmem-cells";
                                label = "radio";
                                reg = <0xfe0000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_radio_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_radio_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               eeprom_radio_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
+                                       eeprom_radio_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
                                };
                        };
                };
index 890365c199b231163ca4b3429c723e56fe0fd4b0..be1011d1da43c82ea0b574f8052328f27b5053b3 100644 (file)
                        };
 
                        config: partition@600000 {
-                               compatible = "nvmem-cells";
                                label = "config";
                                reg = <0x600000 0x50000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               macaddr_config_10008: macaddr@10008 {
-                                       reg = <0x10008 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_10008: macaddr@10008 {
+                                               reg = <0x10008 0x6>;
+                                       };
                                };
                        };
 
                        radio: partition@7f0000 {
-                               compatible = "nvmem-cells";
                                label = "radio";
                                reg = <0x7f0000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_radio_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_radio_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               eeprom_radio_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
+                                       eeprom_radio_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
                                };
                        };
                };
index 42b9c3cc3e324a71349efda57bf8126fbcaaa1f2..692aed5bfc3e172c6367c6fb7c564180ac578df9 100644 (file)
                        };
 
                        config: partition@7c0000 {
-                               compatible = "nvmem-cells";
                                label = "config";
                                reg = <0x7c0000 0x2d440>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               macaddr_config_10008: macaddr@10008 {
-                                       reg = <0x10008 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_10008: macaddr@10008 {
+                                               reg = <0x10008 0x6>;
+                                       };
                                };
                        };
 
                        radio: partition@7f0000 {
-                               compatible = "nvmem-cells";
                                label = "radio";
                                reg = <0x7f0000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_radio_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_radio_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
 
-                               eeprom_radio_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
+                                       eeprom_radio_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
                                };
                        };
                };
index 4207100f34326f408147562787950e4111710ef8..650f741eff7f58b1277e82305957585b6014df98 100644 (file)
                        };
 
                        config: partition@e00000 {
-                               compatible = "nvmem-cells";
                                label = "config";
                                reg = <0xe00000 0x50000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               macaddr_config_10008: macaddr@10008 {
-                                       reg = <0x10008 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_10008: macaddr@10008 {
+                                               reg = <0x10008 0x6>;
+                                       };
                                };
                        };
 
                         */
 
                        radio: partition@ff0000 {
-                               compatible = "nvmem-cells";
                                label = "radio";
                                reg = <0xff0000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_radio_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_radio_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
 
-                               eeprom_radio_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
+                                       eeprom_radio_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
                                };
                        };
                };
index 7d8948bb371412b9ccdb873070f7c56e9a422f19..3c133dd0168b9a262a91b845687faf380c6b49da 100644 (file)
                        };
 
                        config: partition@730000 {
-                               compatible = "nvmem-cells";
                                label = "config";
                                reg = <0x730000 0xc0000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               macaddr_config_2008: macaddr@2008 {
-                                       reg = <0x2008 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_2008: macaddr@2008 {
+                                               reg = <0x2008 0x6>;
+                                       };
                                };
                        };
 
                        radio: partition@7f0000 {
-                               compatible = "nvmem-cells";
                                label = "radio";
                                reg = <0x7f0000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_radio_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_radio_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               eeprom_radio_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
+                                       eeprom_radio_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
                                };
                        };
                };
index 411bf6a85ac6e5b7219651aee6ade3a67e8cf310..b2b78aba6322d967ac9f4ba51e1d568217498054 100644 (file)
@@ -83,7 +83,6 @@
                };
 
                factory: partition@e0000 {
-                       compatible = "nvmem-cells";
                        label = "factory";
                        reg = <0xe0000 0x60000>;
 
index 8f78a60557c9090e6ba52ae04ccd1ea3e3c3ee36..488a40db5c3d2e23f8cc544f2ee0b8759ab8ded7 100644 (file)
                        };
 
                        factory: partition@70000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x70000 0x40000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
                                };
                        };
 
                        eeprom: partition@b0000 {
-                               compatible = "nvmem-cells";
                                label = "eeprom";
                                reg = <0xb0000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               macaddr_eeprom_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_eeprom_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
 
-                               macaddr_eeprom_6: macaddr@6 {
-                                       reg = <0x6 0x6>;
+                                       macaddr_eeprom_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
                                };
                        };
 
index 615bdf4e13b7febe397471ab3c24828f8689c65a..f9cdf4433c602c57d42d8b0a1a460e61e058b2ff 100644 (file)
                                label = "eeprom";
                                reg = <0x80000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_eeprom_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
 
                        partition@90000 {
        };
 };
 
-&eeprom {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_eeprom_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};
-
 &gmac0 {
        nvmem-cells = <&macaddr_eeprom_0>;
        nvmem-cell-names = "mac-address";
index 2762a777a3533a2624b116a72efa395cd6e93e89..b4000464f7be6e6aaeaa1c1193596186024dccd7 100644 (file)
                                label = "eeprom";
                                reg = <0x80000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_eeprom_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
 
                        partition@90000 {
 &wlan_5g {
        mediatek,mtd-eeprom = <&factory 0x8000>;
 };
-
-&eeprom {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_eeprom_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};
index ff328bd858b397b3a6e4ec09710dd9b227a75146..f09ccba58556fb39b3c39a1c3f05a81093c7fa52 100644 (file)
                        };
 
                        part_eeprom: partition@80000 {
-                               compatible = "nvmem-cells";
-
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
                                label = "eeprom";
                                reg = <0x80000 0x10000>;
                                read-only;
 
-                               macaddr_eeprom: macaddr@0 {
-                                       reg = <0x0 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_eeprom: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
                                };
                        };
 
index 42cf121f3b0c106f8fbfe408cca9d540e3df1004..c933e443c12e6bf0fad9b068dd78e34a34eed202 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
-                               };
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index 212c0009425f044f82268f1d7d5398b14cb461f8..c51b6eebee0acafc72cd0cf4a4181c175c7a816d 100644 (file)
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
+
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
+                               };
                        };
 
                        firmware: partition@50000 {
        nvmem-cells = <&macaddr_factory_e006>;
        nvmem-cell-names = "mac-address";
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
-
-       macaddr_factory_e006: macaddr@e006 {
-               reg = <0xe006 0x6>;
-       };
-};
index dc9a9773a240fd5c6a1a0a2aa5f1580822273dd8..4d34a787b6682d77356439d0ef3d576f424d0824 100644 (file)
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
+
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
+                               };
                        };
 
                        firmware: partition@50000 {
        nvmem-cells = <&macaddr_factory_e006>;
        nvmem-cell-names = "mac-address";
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
-
-       macaddr_factory_e006: macaddr@e006 {
-               reg = <0xe006 0x6>;
-       };
-};
index f196432111b6886a18efe95094e52986243f41d8..edc3a7723a2618670bf215e918b22e4a9e3db277 100644 (file)
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
+
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
+                               };
                        };
 
                        firmware: partition@50000 {
        nvmem-cells = <&macaddr_factory_e006>;
        nvmem-cell-names = "mac-address";
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
-
-       macaddr_factory_e006: macaddr@e006 {
-               reg = <0xe006 0x6>;
-       };
-};
index 843e9a30c7e341e0e1f51187f4d67ef17dbebf17..e0db05724e7b90b78df20f6272348eb5f2eb3254 100644 (file)
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
+
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
 &uartlite2 {
        status = "okay";
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
-
-       macaddr_factory_e006: macaddr@e006 {
-               reg = <0xe006 0x6>;
-       };
-};
index d8a94c85b9fa6980a9c093d1ff11cb53eaf28bc9..dd2150c1a6bf2e7fc03b79c0164414fd58e0a4ae 100644 (file)
                                reg = <0x30000 0x10000>;
                        };
 
-                       factory:partition@50000 {
+                       factory: partition@50000 {
                                label = "factory";
                                reg = <0x50000 0x40000>;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_3fff4: macaddr@3fff4 {
+                                               reg = <0x3fff4 0x6>;
+                                       };
+                               };
                        };
 
                        partition@90000 {
                };
        };
 };
-
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_3fff4: macaddr@3fff4 {
-               reg = <0x3fff4 0x6>;
-       };
-
-};
index 76fbbb99b14921cd55abded64680b8d84e3dd15d..55e828a29557f19927b29a42cf1a91e3a265e6ad 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
-                               };
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index 6c5a638e0f006e3cec922284bf8a0adc6a2d2972..8b018e18ae4402f8f991dfdaec67229ddb62bb06 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               macaddr_factory_2e: macaddr@2e {
-                                       reg = <0x2e 0x6>;
-                               };
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_2e: macaddr@2e {
+                                               reg = <0x2e 0x6>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
                                };
                        };
 
index f699b4c47a14df1c3095aec173b2a5a9139ec89a..78f81314fc1274b6ede246ac8a076f221010c92d 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
-                               };
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index 62111520c011fdcc3804bfcd2239938b0a25221f..a403cd3e14ff18d69d5afcf9725f606a7eaa4bab 100644 (file)
                };
 
                factory: partition@c0000 {
-                       compatible = "nvmem-cells";
                        label = "factory";
                        reg = <0x0c0000 0x40000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x4da8>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
 
-                       eeprom_factory_8000: eeprom@8000 {
-                               reg = <0x8000 0x4da8>;
-                       };
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x4da8>;
+                               };
 
-                       macaddr_factory_e000: macaddr@e000 {
-                               reg = <0xe000 0x6>;
-                       };
+                               eeprom_factory_8000: eeprom@8000 {
+                                       reg = <0x8000 0x4da8>;
+                               };
+
+                               macaddr_factory_e000: macaddr@e000 {
+                                       reg = <0xe000 0x6>;
+                               };
 
-                       macaddr_factory_e006: macaddr@e006 {
-                               reg = <0xe006 0x6>;
+                               macaddr_factory_e006: macaddr@e006 {
+                                       reg = <0xe006 0x6>;
+                               };
                        };
                };
 
index c13c0c95709994c2966a2ca335edd4ff8ccbbc9a..763973a193fde2d841c5c1f224970d49df1a6b6e 100644 (file)
                function = "gpio";
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
-
-       macaddr_factory_e006: macaddr@e006 {
-               reg = <0xe006 0x6>;
-       };
-};
index 232a720e5492cfbfc1624c902b52dc0624b7585c..8340ca5d287f3923b0c68574e891c4fa24095b14 100644 (file)
                function = "gpio";
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
-
-       macaddr_factory_e006: macaddr@e006 {
-               reg = <0xe006 0x6>;
-       };
-};
index efc32733e9bc163e61adffdb965f9783874e170a..7ce9aea3351fec57c845af25b66114ebe533d959 100644 (file)
                                label = "factory";
                                reg = <0x50000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
+
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
+                               };
                        };
 
                        partition@60000 {
                function = "gpio";
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
-
-       macaddr_factory_e006: macaddr@e006 {
-               reg = <0xe006 0x6>;
-       };
-};
index f0e0ae8e7e7102050b2899246f5cd2d83bdef012..d1a2c08c6dee6216b6ec6356d41e3caa316a2b7a 100644 (file)
                };
 
                factory: partition@100000 {
-                       compatible = "nvmem-cells";
                        label = "Factory";
                        reg = <0x100000 0x80000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0xe00>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
 
-                       macaddr_factory_3fff4: macaddr@3fff4 {
-                               reg = <0x3fff4 0x6>;
-                       };
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0xe00>;
+                               };
+
+                               macaddr_factory_3fff4: macaddr@3fff4 {
+                                       reg = <0x3fff4 0x6>;
+                               };
 
-                       macaddr_factory_3fffa: macaddr@3fffa {
-                               reg = <0x3fffa 0x6>;
+                               macaddr_factory_3fffa: macaddr@3fffa {
+                                       reg = <0x3fffa 0x6>;
+                               };
                        };
                };
 
index 12e6bccc2e26969bed62b23bf9e09e4f62ae9674..1dc91d8b47eeef0431543d9a7ee7550a146ced29 100644 (file)
                        label = "factory";
                        reg = <0x100000 0x40000>;
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_factory_e000: macaddr@e000 {
+                                       reg = <0xe000 0x6>;
+                               };
+
+                               macaddr_factory_e006: macaddr@e006 {
+                                       reg = <0xe006 0x6>;
+                               };
+                       };
                };
 
                partition@140000 {
index 78f154b3aed18bb367a330d058cc015835c5d693..c7d6c574aa0c67052a6a2f6434f499105f65e92b 100644 (file)
                function = "gpio";
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
-
-       macaddr_factory_e006: macaddr@e006 {
-               reg = <0xe006 0x6>;
-       };
-};
index e4de0b82310fd77462e0fb68ffa54e2b7636ab42..a1eca2807e7006f71e52acdd3ce3c3a7db84d3a5 100644 (file)
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
                function = "gpio";
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_4: macaddr@4 {
-               reg = <0x4 0x6>;
-       };
-};
index 48f52eed2f7dc515465866ba0832db1d2de4e86a..ac638ad92944481e0b6e6feb0e2bd10f27300adc 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
                                };
                        };
 
index 2389112c3e6bff20f5d37a30eb34da0200d8fdae..e715237a40124324791dda371034dabde4d993ec 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
-                               };
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index 99da11a614792cced7f7eaa8357b3ef2bd2b9759..98d2e6892254b079313945748fb555145d34bf7d 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
-                               };
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index 1aba94a9125591832b384d396c54cd5598ac41ae..b153cae918b33d4abf38dcc8594dec06f2c0abc7 100644 (file)
                                label = "Factory";
                                reg = <0x50000 0x40000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
+                               };
                        };
 
                        partition@90000 {
                function = "gpio";
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
-};
index d525dde385b4d921655a374cfc44534c0010b899..8c662b86cd4b571894bbc7f42fbca73fce76ef91 100644 (file)
                                label = "Factory";
                                reg = <0x50000 0x40000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_0004: macaddr@0004 {
+                                               reg = <0x0004 0x6>;
+                                       };
+
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
+                               };
                        };
 
                        partition@90000 {
                function = "gpio";
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_0004: macaddr@0004 {
-               reg = <0x0004 0x6>;
-       };
-
-       macaddr_factory_e006: macaddr@e006 {
-               reg = <0xe006 0x6>;
-       };
-};
-
index a998b95d4c51eee523643b140868e2ba77d61ed7..ce6a60215e27b533c6026a744e8b76d66b81ebae 100644 (file)
                                label = "Factory";
                                reg = <0x50000 0x40000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_0004: macaddr@0004 {
+                                               reg = <0x0004 0x6>;
+                                       };
+                               };
                        };
 
                        partition@90000 {
                function = "gpio";
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_0004: macaddr@0004 {
-               reg = <0x0004 0x6>;
-       };
-};
index e76ce933c1cf27ecacd02d7b9ccc78adc7623536..2c78dea114f6e848f654e9b897501cf7d2db8fb8 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
-                               };
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index 73f3ea91731d7b095e411ec0876ad4767e635b60..571b50d3c770d30e2c6798e407a108a59ea0b208 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
-                               };
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index ec9d2398cdd6cedaf963ac1e2df9e9ea3ae6f98f..1a3387326a6b906bb654dc29284125254a9944af 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
-                               };
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index c578018e755720afdb3e1dd843e52119d493af42..e92982a8796b8f0518a3330abc91ef64b26a4bc3 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
-                               };
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
                                };
                        };
 
index ff748b781c00ab2b33af0a312cd112557fb58796..d1697060a84d42a0d5a1b03fc862f15829d46a1e 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
-                               };
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
 
-                               macaddr_factory_e006: macaddr@e006 {
-                                       reg = <0xe006 0x6>;
-                               };
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
 
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
+                               };
                        };
 
                        firmware: partition@50000 {
index c1d5b03964f2d02cf153e5cc047f3e9a850a68fb..6423b69ebdab22e340280117f939bd58ced5852a 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x200>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x200>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
                                };
                        };
 
index 296c5a205f9bbbbbdbf6f711a79d3819a0e5058c..5c21352cd9e6fcd3ba1653ffbe5365fad01a36c4 100644 (file)
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
                                };
                        };
 
index d449fccd284b24be1123f77f73147f2573d4df07..4333ece42e75b5adc2a096721c74959e878e870d 100644 (file)
                        reg = <0x80000 0x80000>; /* 64 KB */
                };
                factory: partition@100000 {
-                       compatible = "nvmem-cells";
                        label = "factory";
                        reg = <0x100000 0x40000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x4da8>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x4da8>;
+                               };
 
-                       macaddr_factory_fe6e: macaddr@fe6e {
-                               reg = <0xfe6e 0x6>;
+                               macaddr_factory_fe6e: macaddr@fe6e {
+                                       reg = <0xfe6e 0x6>;
+                               };
                        };
                };
                partition@140000 {
index d6f00d9edc881060545d56aaa4f04df5e2655e49..307819e746e9038d6218c64cf72c54e5cac718cf 100644 (file)
                };
 
                factory: partition@100000 {
-                       compatible = "nvmem-cells";
                        label = "Factory";
                        reg = <0x100000 0x40000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x400>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
 
-                       eeprom_factory_8000: eeprom@8000 {
-                               reg = <0x8000 0x4da8>;
-                       };
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               eeprom_factory_8000: eeprom@8000 {
+                                       reg = <0x8000 0x4da8>;
+                               };
 
-                       macaddr_factory_fe6e: macaddr@fe6e {
-                               reg = <0xfe6e 0x6>;
+                               macaddr_factory_fe6e: macaddr@fe6e {
+                                       reg = <0xfe6e 0x6>;
+                               };
                        };
                };
 
index ace7a08bd89dd6e57e418004a7e16b6b2f45a2b2..2ceb6228b260405d953b072904290a5917ddca23 100644 (file)
                };
 
                factory: partition@100000 {
-                       compatible = "nvmem-cells";
                        label = "Factory";
                        reg = <0x100000 0x40000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x400>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
 
-                       macaddr_factory_e000: macaddr@e000 {
-                               reg = <0xe000 0x6>;
+                               macaddr_factory_e000: macaddr@e000 {
+                                       reg = <0xe000 0x6>;
+                               };
                        };
                };
 
index fa7e23dd47133cf64dfe2234551c37b236975fb5..85dbe2d857957528ccc37286034e63b753c47e12 100644 (file)
                        label = "mrd";
                        reg = <0x7780000 0x80000>;
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_mrd_1fff8: macaddr@1fff8 {
+                                       reg = <0x1fff8 0x6>;
+                               };
+                       };
                };
        };
 };
        };
 };
 
-&mrd {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_mrd_1fff8: macaddr@1fff8 {
-               reg = <0x1fff8 0x6>;
-       };
-};
-
 &state_default {
        gpio {
                groups = "uart3";
index 5df2f3c6ab69f918045514fe658c27bdb81fc6ea..2f6654da5c3e8703d29309dd6746bd9148671bba 100644 (file)
                };
 
                factory: partition@200000 {
-                       compatible = "nvmem-cells";
                        label = "Factory";
                        reg = <0x200000 0x100000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
                        read-only;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x400>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
 
-                       macaddr_factory_e000: macaddr@e000 {
-                               reg = <0xe000 0x6>;
+                               macaddr_factory_e000: macaddr@e000 {
+                                       reg = <0xe000 0x6>;
+                               };
                        };
                };
 
index 299d982dc1179550407521a98f489a5c0d757e56..0cd1f3274cce3d0f56fcb7fb168ff275b6724e41 100644 (file)
                        reg = <0x200000 0x1c0000>;
                        label = "Factory";
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_factory_1fdfa: macaddr@1fdfa {
+                                       reg = <0x1fdfa 0x6>;
+                               };
+
+                               macaddr_factory_1fdf4: macaddr@1fdf4 {
+                                       reg = <0x1fdf4 0x6>;
+                               };
+                       };
                };
 
                partition@3c0000 {
                function = "gpio";
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_1fdfa: macaddr@1fdfa {
-               reg = <0x1fdfa 0x6>;
-       };
-
-       macaddr_factory_1fdf4: macaddr@1fdf4 {
-               reg = <0x1fdf4 0x6>;
-       };
-};