bmips: remove mac-address-increment

It's deprecated.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/target/linux/bmips/dts/bcm63167-sercomm-h500-s.dtsi b/target/linux/bmips/dts/bcm63167-sercomm-h500-s.dtsi
index 95f330d6c535204490aa5b0d8fb2f4e4518dd758..4e4431f27cec716777b91751a4d7f564e658431d 100644 (file)
--- a/target/linux/bmips/dts/bcm63167-sercomm-h500-s.dtsi
+++ b/target/linux/bmips/dts/bcm63167-sercomm-h500-s.dtsi
@@ -187,6 +187,16 @@
                                label = "cferom";
                                reg = <0x0000000 0x0020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_cferom_6a0: macaddr@6a0 {
+                                               reg = <0x6a0 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -284,13 +294,3 @@
 &usbh {
        status = "okay";
 };
-
-&cferom {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_cferom_6a0: macaddr@6a0 {
-               reg = <0x6a0 0x6>;
-       };
-};

diff --git a/target/linux/bmips/dts/bcm63168-comtrend-vr-3032u.dts b/target/linux/bmips/dts/bcm63168-comtrend-vr-3032u.dts
index 5196f90afa8fa6b8fa4df20cd5c7b83cbb132976..d4520661a58289cc8279da5f9378f3ee145fc57a 100644 (file)
--- a/target/linux/bmips/dts/bcm63168-comtrend-vr-3032u.dts
+++ b/target/linux/bmips/dts/bcm63168-comtrend-vr-3032u.dts
@@ -170,6 +170,16 @@
                                label = "cferom";
                                reg = <0x0000000 0x0020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_cferom_6a0: macaddr@6a0 {
+                                               reg = <0x6a0 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -228,13 +238,3 @@
 &usbh {
        status = "okay";
 };
-
-&cferom {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_cferom_6a0: macaddr@6a0 {
-               reg = <0x6a0 0x6>;
-       };
-};

diff --git a/target/linux/bmips/dts/bcm63168-sercomm-shg2500.dts b/target/linux/bmips/dts/bcm63168-sercomm-shg2500.dts
index 7b0ebf2aefc35d9cde5d745bcca0f37cde7a6204..bfa9835b26e12ec591b5cda295281624e2ffb73c 100644 (file)
--- a/target/linux/bmips/dts/bcm63168-sercomm-shg2500.dts
+++ b/target/linux/bmips/dts/bcm63168-sercomm-shg2500.dts
@@ -46,9 +46,8 @@
                pci-bus = <1>;
                pci-dev = <0>;
 
-               nvmem-cells = <&macaddr_cferom_6a0>;
+               nvmem-cells = <&macaddr_cferom_6a0 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
 
                brcm,sprom = "brcm/bcm4360-sprom.bin";
        };
@@ -61,7 +60,7 @@
 &ethernet {
        status = "okay";
 
-       nvmem-cells = <&macaddr_cferom_6a0>;
+       nvmem-cells = <&macaddr_cferom_6a0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -196,6 +195,18 @@
                                label = "cferom";
                                reg = <0x0000000 0x0020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_cferom_6a0: macaddr@6a0 {
+                                               compatible = "mac-base";
+                                               reg = <0x6a0 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -309,13 +320,3 @@
 &usbh {
        status = "okay";
 };
-
-&cferom {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_cferom_6a0: macaddr@6a0 {
-               reg = <0x6a0 0x6>;
-       };
-};

diff --git a/target/linux/bmips/dts/bcm63169-comtrend-vg-8050.dts b/target/linux/bmips/dts/bcm63169-comtrend-vg-8050.dts
index bf96673af8af8d65dfec54c4f333b418396e9bcb..be7f90fbd939429ee65e9bb6541d789c629bda71 100644 (file)
--- a/target/linux/bmips/dts/bcm63169-comtrend-vg-8050.dts
+++ b/target/linux/bmips/dts/bcm63169-comtrend-vg-8050.dts
@@ -185,6 +185,16 @@
                                label = "cferom";
                                reg = <0x0000000 0x0020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_cferom_6a0: macaddr@6a0 {
+                                               reg = <0x6a0 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -225,13 +235,3 @@
 &usbh {
        status = "okay";
 };
-
-&cferom {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_cferom_6a0: macaddr@6a0 {
-               reg = <0x6a0 0x6>;
-       };
-};

diff --git a/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts b/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts
index 45ed6e2a3b71231e4d7c952e7acb0bc36483b846..3321bbd0045997e392aecace4122c810634f7d19 100644 (file)
--- a/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts
+++ b/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts
@@ -38,9 +38,8 @@
                pci-bus = <1>;
                pci-dev = <0>;
 
-               nvmem-cells = <&macaddr_cfe_6a0>;
+               nvmem-cells = <&macaddr_cfe_6a0 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
 
                brcm,sprom = "brcm/bcm43217-sprom.bin";
                brcm,sprom-fixups = <6 0x1c00>,
@@ -64,7 +63,7 @@
 &ethernet {
        status = "okay";
 
-       nvmem-cells = <&macaddr_cfe_6a0>;
+       nvmem-cells = <&macaddr_cfe_6a0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -90,6 +89,18 @@
                                reg = <0x000000 0x010000>;
                                label = "cfe";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_cfe_6a0: macaddr@6a0 {
+                                               compatible = "mac-base";
+                                               reg = <0x6a0 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@10000 {
@@ -247,13 +258,3 @@
 &usbh {
        status = "okay";
 };
-
-&cfe {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_cfe_6a0: macaddr@6a0 {
-               reg = <0x6a0 0x6>;
-       };
-};

diff --git a/target/linux/bmips/dts/bcm6328-arcadyan-ar7516.dts b/target/linux/bmips/dts/bcm6328-arcadyan-ar7516.dts
index cc50f5754994d1fed81633f6d2f3b021bdc25d39..779f1da1b9f6f26c37f2c16b25fd2efbea680040 100644 (file)
--- a/target/linux/bmips/dts/bcm6328-arcadyan-ar7516.dts
+++ b/target/linux/bmips/dts/bcm6328-arcadyan-ar7516.dts
@@ -36,9 +36,8 @@
                pci-bus = <1>;
                pci-dev = <0>;
 
-               nvmem-cells = <&macaddr_cfe_6a0>;
+               nvmem-cells = <&macaddr_cfe_6a0 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
 
                brcm,sprom = "brcm/bcm43227-sprom.bin";
        };
@@ -51,7 +50,7 @@
 &ethernet {
        status = "okay";
 
-       nvmem-cells = <&macaddr_cfe_6a0>;
+       nvmem-cells = <&macaddr_cfe_6a0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -74,6 +73,18 @@
                                label = "cfe";
                                reg = <0x000000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_cfe_6a0: macaddr@6a0 {
+                                               compatible = "mac-base";
+                                               reg = <0x6a0 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@10000 {
@@ -174,13 +185,3 @@
 &usbh {
        status = "okay";
 };
-
-&cfe {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_cfe_6a0: macaddr@6a0 {
-               reg = <0x6a0 0x6>;
-       };
-};

diff --git a/target/linux/bmips/dts/bcm6328-comtrend-ar-5381u.dts b/target/linux/bmips/dts/bcm6328-comtrend-ar-5381u.dts
index 7499e7090ff49e2af8f403e89c3517aa46af8957..fc7462810c95531b7e6d652ac805f476c58beab4 100644 (file)
--- a/target/linux/bmips/dts/bcm6328-comtrend-ar-5381u.dts
+++ b/target/linux/bmips/dts/bcm6328-comtrend-ar-5381u.dts
@@ -31,9 +31,8 @@
                pci-bus = <1>;
                pci-dev = <0>;
 
-               nvmem-cells = <&macaddr_cfe_6a0>;
+               nvmem-cells = <&macaddr_cfe_6a0 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
 
                brcm,sprom = "brcm/bcm43225-sprom.bin";
                brcm,sprom-fixups = <97 0xfee5>,
@@ -52,7 +51,7 @@
 &ethernet {
        status = "okay";
 
-       nvmem-cells = <&macaddr_cfe_6a0>;
+       nvmem-cells = <&macaddr_cfe_6a0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -78,6 +77,18 @@
                                reg = <0x000000 0x010000>;
                                label = "cfe";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_cfe_6a0: macaddr@6a0 {
+                                               compatible = "mac-base";
+                                               reg = <0x6a0 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@10000 {
@@ -178,13 +189,3 @@
 &usbh {
        status = "okay";
 };
-
-&cfe {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_cfe_6a0: macaddr@6a0 {
-               reg = <0x6a0 0x6>;
-       };
-};

diff --git a/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts b/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts
index a0d1c117f74755b373dd351b81d0b6b4ea14e671..ba15a6426540a6800de7d8cc4c4a8ac09c5bc47f 100644 (file)
--- a/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts
+++ b/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts
@@ -31,9 +31,8 @@
                pci-bus = <1>;
                pci-dev = <0>;
 
-               nvmem-cells = <&macaddr_cfe_6a0>;
+               nvmem-cells = <&macaddr_cfe_6a0 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
 
                brcm,sprom = "brcm/bcm43225-sprom.bin";
                brcm,sprom-fixups = <2 0x05bb>,
@@ -70,7 +69,7 @@
 &ethernet {
        status = "okay";
 
-       nvmem-cells = <&macaddr_cfe_6a0>;
+       nvmem-cells = <&macaddr_cfe_6a0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -96,6 +95,18 @@
                                reg = <0x000000 0x010000>;
                                label = "cfe";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_cfe_6a0: macaddr@6a0 {
+                                               compatible = "mac-base";
+                                               reg = <0x6a0 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@10000 {
@@ -205,13 +216,3 @@
 &usbh {
        status = "okay";
 };
-
-&cfe {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_cfe_6a0: macaddr@6a0 {
-               reg = <0x6a0 0x6>;
-       };
-};

diff --git a/target/linux/bmips/dts/bcm6328-nucom-r5010unv2.dts b/target/linux/bmips/dts/bcm6328-nucom-r5010unv2.dts
index 826b2a61e25c5ea9a7f82d79ad1595b75944fe3f..b9cbae7af8ecc812f2256d84113540905027f4d5 100644 (file)
--- a/target/linux/bmips/dts/bcm6328-nucom-r5010unv2.dts
+++ b/target/linux/bmips/dts/bcm6328-nucom-r5010unv2.dts
@@ -38,9 +38,8 @@
                pci-bus = <1>;
                pci-dev = <0>;
 
-               nvmem-cells = <&macaddr_cfe_6a0>;
+               nvmem-cells = <&macaddr_cfe_6a0 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
 
                brcm,sprom = "brcm/bcm43217-sprom.bin";
        };
@@ -53,7 +52,7 @@
 &ethernet {
        status = "okay";
 
-       nvmem-cells = <&macaddr_cfe_6a0>;
+       nvmem-cells = <&macaddr_cfe_6a0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -76,6 +75,18 @@
                                label = "cfe";
                                reg = <0x000000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_cfe_6a0: macaddr@6a0 {
+                                               compatible = "mac-base";
+                                               reg = <0x6a0 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@10000 {
@@ -204,13 +215,3 @@
 &usbh {
        status = "okay";
 };
-
-&cfe {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_cfe_6a0: macaddr@6a0 {
-               reg = <0x6a0 0x6>;
-       };
-};

diff --git a/target/linux/bmips/dts/bcm6328-sercomm-ad1018.dts b/target/linux/bmips/dts/bcm6328-sercomm-ad1018.dts
index 5d18266818870042f254f5ed9d4e4ac2f059f9c2..aefa72235f1a22fea4afd06abc50e2ecc69bab0f 100644 (file)
--- a/target/linux/bmips/dts/bcm6328-sercomm-ad1018.dts
+++ b/target/linux/bmips/dts/bcm6328-sercomm-ad1018.dts
@@ -45,9 +45,8 @@
                pci-bus = <1>;
                pci-dev = <0>;
 
-               nvmem-cells = <&macaddr_cferom_6a0>;
+               nvmem-cells = <&macaddr_cferom_6a0 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
 
                brcm,sprom = "brcm/bcm43217-sprom.bin";
                brcm,sprom-fixups = <6 0x1c00>,
@@ -77,7 +76,7 @@
 &ethernet {
        status = "okay";
 
-       nvmem-cells = <&macaddr_cferom_6a0>;
+       nvmem-cells = <&macaddr_cferom_6a0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -192,6 +191,18 @@
                                label = "cferom";
                                reg = <0x0000000 0x0020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_cferom_6a0: macaddr@6a0 {
+                                               compatible = "mac-base";
+                                               reg = <0x6a0 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -300,13 +311,3 @@
 &usbh {
        status = "okay";
 };
-
-&cferom {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_cferom_6a0: macaddr@6a0 {
-               reg = <0x6a0 0x6>;
-       };
-};

diff --git a/target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts b/target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts
index d5f162846d24b55e6726c6d83aa50a84408e78ab..c30612191eb4488e277801031d155a8dfda63394 100644 (file)
--- a/target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts
+++ b/target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts
@@ -134,7 +134,7 @@
 &ethernet1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_cfe_6a0>;
+       nvmem-cells = <&macaddr_cfe_6a0 0>;
        nvmem-cell-names = "mac-address";
 
        phy-mode = "mii";
@@ -162,9 +162,8 @@
 
                qca,no-eeprom;
 
-               nvmem-cells = <&macaddr_cfe_6a0>;
+               nvmem-cells = <&macaddr_cfe_6a0 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
 
                #gpio-cells = <2>;
                gpio-controller;
@@ -183,6 +182,18 @@
                        label = "cfe";
                        reg = <0x000000 0x020000>;
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_cfe_6a0: macaddr@6a0 {
+                                       compatible = "mac-base";
+                                       reg = <0x6a0 0x6>;
+                                       #nvmem-cell-cells = <1>;
+                               };
+                       };
                };
 
                partition@20000 {
@@ -195,6 +206,16 @@
                        label = "cal_data";
                        reg = <0xee0000 0x100000>;
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               cal_data_1e000: cal@1e000 {
+                                       reg = <0x1e000 0xeb8>;
+                               };
+                       };
                };
 
                partition@fe0000 {
@@ -211,23 +232,3 @@
 &usbh {
        status = "okay";
 };
-
-&cal_data {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       cal_data_1e000: cal@1e000 {
-               reg = <0x1e000 0xeb8>;
-       };
-};
-
-&cfe {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_cfe_6a0: macaddr@6a0 {
-               reg = <0x6a0 0x6>;
-       };
-};

diff --git a/target/linux/bmips/dts/bcm6362-huawei-hg253s-v2.dts b/target/linux/bmips/dts/bcm6362-huawei-hg253s-v2.dts
index f562bcd9b2b24a2eb860728c3edfac9b506266ab..47be99133d35bc6c329105dc68a3d9280cf1fa39 100644 (file)
--- a/target/linux/bmips/dts/bcm6362-huawei-hg253s-v2.dts
+++ b/target/linux/bmips/dts/bcm6362-huawei-hg253s-v2.dts
@@ -164,6 +164,16 @@
                                label = "cferom";
                                reg = <0x0000000 0x0020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_cferom_6a0: macaddr@6a0 {
+                                               reg = <0x6a0 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -224,13 +234,3 @@
 &usbh {
        status = "okay";
 };
-
-&cferom {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_cferom_6a0: macaddr@6a0 {
-               reg = <0x6a0 0x6>;
-       };
-};

diff --git a/target/linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts b/target/linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts
index a335218be07d3ddd16fd7bbcb1960db797f24a6a..53a1c0c01fc7c30651a3fb977490ba802e0acd85 100644 (file)
--- a/target/linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts
+++ b/target/linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts
@@ -216,6 +216,16 @@
                                label = "cferom";
                                reg = <0x0000000 0x0004000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_cferom_6a0: macaddr@6a0 {
+                                               reg = <0x6a0 0x6>;
+                                       };
+                               };
                        };
 
                        partition@4000 {
@@ -298,13 +308,3 @@
 &usbh {
        status = "okay";
 };
-
-&cferom {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_cferom_6a0: macaddr@6a0 {
-               reg = <0x6a0 0x6>;
-       };
-};

diff --git a/target/linux/bmips/dts/bcm6368-actiontec-r1000h.dts b/target/linux/bmips/dts/bcm6368-actiontec-r1000h.dts
index ff115afb8fbd1aca0b8b958e7fbf585978c50eef..c5e2e7f67f56b9aef8c405a254c28d28b115b7fb 100644 (file)
--- a/target/linux/bmips/dts/bcm6368-actiontec-r1000h.dts
+++ b/target/linux/bmips/dts/bcm6368-actiontec-r1000h.dts
@@ -178,6 +178,16 @@
                        label = "CFE";
                        reg = <0x000000 0x020000>;
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_cfe_6a0: macaddr@6a0 {
+                                       reg = <0x6a0 0x6>;
+                               };
+                       };
                };
 
                partition@20000 {
@@ -208,13 +218,3 @@
 &usbh {
        status = "okay";
 };
-
-&cfe {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_cfe_6a0: macaddr@6a0 {
-               reg = <0x6a0 0x6>;
-       };
-};

diff --git a/target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts b/target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts
index e67db8b6bde631f276ab89943f9e2d9f0b5a1987..eecf3806f2ce29242a76e0dce5b301775c7d2c2b 100644 (file)
--- a/target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts
+++ b/target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts
@@ -61,9 +61,8 @@
                pci-bus = <0>;
                pci-dev = <1>;
 
-               nvmem-cells = <&macaddr_cfe_6a0>;
+               nvmem-cells = <&macaddr_cfe_6a0 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
 
                brcm,sprom = "brcm/bcm43222-sprom.bin";
                brcm,sprom-fixups = <97 0xfeb3>,
@@ -82,7 +81,7 @@
 &ethernet {
        status = "okay";
 
-       nvmem-cells = <&macaddr_cfe_6a0>;
+       nvmem-cells = <&macaddr_cfe_6a0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -106,6 +105,18 @@
                        label = "CFE";
                        reg = <0x0000000 0x0020000>;
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_cfe_6a0: macaddr@6a0 {
+                                       compatible = "mac-base";
+                                       reg = <0x6a0 0x6>;
+                                       #nvmem-cell-cells = <1>;
+                               };
+                       };
                };
 
                partition@20000 {
@@ -170,13 +181,3 @@
 &usbh {
        status = "okay";
 };
-
-&cfe {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_cfe_6a0: macaddr@6a0 {
-               reg = <0x6a0 0x6>;
-       };
-};

diff --git a/target/linux/bmips/dts/bcm6368-comtrend-vr-3025un.dts b/target/linux/bmips/dts/bcm6368-comtrend-vr-3025un.dts
index 3256783e0e88db6dc995a5693b9d9ad240b3ec18..fb86adb899103355c5429428785f7e1e4f61fbd1 100644 (file)
--- a/target/linux/bmips/dts/bcm6368-comtrend-vr-3025un.dts
+++ b/target/linux/bmips/dts/bcm6368-comtrend-vr-3025un.dts
@@ -61,9 +61,8 @@
                pci-bus = <0>;
                pci-dev = <1>;
 
-               nvmem-cells = <&macaddr_cfe_6a0>;
+               nvmem-cells = <&macaddr_cfe_6a0 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
 
                brcm,sprom = "brcm/bcm43222-sprom.bin";
                brcm,sprom-fixups = <97 0xfeb3>,
@@ -82,7 +81,7 @@
 &ethernet {
        status = "okay";
 
-       nvmem-cells = <&macaddr_cfe_6a0>;
+       nvmem-cells = <&macaddr_cfe_6a0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -106,6 +105,18 @@
                        label = "CFE";
                        reg = <0x000000 0x010000>;
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_cfe_6a0: macaddr@6a0 {
+                                       compatible = "mac-base";
+                                       reg = <0x6a0 0x6>;
+                                       #nvmem-cell-cells = <1>;
+                               };
+                       };
                };
 
                partition@20000 {
@@ -170,13 +181,3 @@
 &usbh {
        status = "okay";
 };
-
-&cfe {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_cfe_6a0: macaddr@6a0 {
-               reg = <0x6a0 0x6>;
-       };
-};

diff --git a/target/linux/bmips/dts/bcm6368-netgear-dgnd3700.dtsi b/target/linux/bmips/dts/bcm6368-netgear-dgnd3700.dtsi
index c878dd2cffa2b1062e11af9a1bd3124a6ab94e99..97836e92e03eaa43938176eeeeaaeb4f9275c756 100644 (file)
--- a/target/linux/bmips/dts/bcm6368-netgear-dgnd3700.dtsi
+++ b/target/linux/bmips/dts/bcm6368-netgear-dgnd3700.dtsi
@@ -207,6 +207,16 @@
                        label = "CFE";
                        reg = <0x0000000 0x0020000>;
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_cfe_6a0: macaddr@6a0 {
+                                       reg = <0x6a0 0x6>;
+                               };
+                       };
                };
 
                partition@20000 {
@@ -253,13 +263,3 @@
 &usbh {
        status = "okay";
 };
-
-&cfe {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_cfe_6a0: macaddr@6a0 {
-               reg = <0x6a0 0x6>;
-       };
-};

diff --git a/target/linux/bmips/dts/bcm6368-observa-vh4032n.dts b/target/linux/bmips/dts/bcm6368-observa-vh4032n.dts
index 14fbd856f8ffc24a4c6b0bd73622fdde3e62076a..8d6135fbdd1c09a9932a7c0dd6730b43e2e0ad06 100644 (file)
--- a/target/linux/bmips/dts/bcm6368-observa-vh4032n.dts
+++ b/target/linux/bmips/dts/bcm6368-observa-vh4032n.dts
@@ -83,9 +83,8 @@
                pci-bus = <0>;
                pci-dev = <1>;
 
-               nvmem-cells = <&macaddr_cfe_6a0>;
+               nvmem-cells = <&macaddr_cfe_6a0 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
 
                brcm,sprom = "brcm/bcm43222-sprom.bin";
                brcm,sprom-fixups = <2   0x04d2>, <4   0x4350>,
@@ -124,7 +123,7 @@
 &ethernet {
        status = "okay";
 
-       nvmem-cells = <&macaddr_cfe_6a0>;
+       nvmem-cells = <&macaddr_cfe_6a0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -157,6 +156,18 @@
                        label = "CFE";
                        reg = <0x0000000 0x0020000>;
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_cfe_6a0: macaddr@6a0 {
+                                       compatible = "mac-base";
+                                       reg = <0x6a0 0x6>;
+                                       #nvmem-cell-cells = <1>;
+                               };
+                       };
                };
 
                partition@20000 {
@@ -221,13 +232,3 @@
 &usbh {
        status = "okay";
 };
-
-&cfe {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_cfe_6a0: macaddr@6a0 {
-               reg = <0x6a0 0x6>;
-       };
-};

diff --git a/target/linux/bmips/dts/bcm6369-comtrend-wap-5813n.dts b/target/linux/bmips/dts/bcm6369-comtrend-wap-5813n.dts
index 517a894cf506a496d33ff55d78977007ab3e45f6..53d20ecba32de81c54142fc72894402997a30d9e 100644 (file)
--- a/target/linux/bmips/dts/bcm6369-comtrend-wap-5813n.dts
+++ b/target/linux/bmips/dts/bcm6369-comtrend-wap-5813n.dts
@@ -80,9 +80,8 @@
                pci-bus = <0>;
                pci-dev = <1>;
 
-               nvmem-cells = <&macaddr_cfe_6a0>;
+               nvmem-cells = <&macaddr_cfe_6a0 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
 
                brcm,sprom = "brcm/bcm4322-sprom.bin";
                brcm,sprom-fixups = <97 0xfeed>,
@@ -101,7 +100,7 @@
 &ethernet {
        status = "okay";
 
-       nvmem-cells = <&macaddr_cfe_6a0>;
+       nvmem-cells = <&macaddr_cfe_6a0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -170,6 +169,18 @@
                        label = "CFE";
                        reg = <0x000000 0x010000>;
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_cfe_6a0: macaddr@6a0 {
+                                       compatible = "mac-base";
+                                       reg = <0x6a0 0x6>;
+                                       #nvmem-cell-cells = <1>;
+                               };
+                       };
                };
 
                partition@20000 {
@@ -218,13 +229,3 @@
 &usbh {
        status = "okay";
 };
-
-&cfe {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_cfe_6a0: macaddr@6a0 {
-               reg = <0x6a0 0x6>;
-       };
-};

diff --git a/target/linux/bmips/dts/bcm6369-netgear-evg2000.dts b/target/linux/bmips/dts/bcm6369-netgear-evg2000.dts
index 460c88f755c2cb5f1f244ff51fb74de278f834a6..db7f9b0e5b6d5899c15d7af0c25f67eb2c89ece5 100644 (file)
--- a/target/linux/bmips/dts/bcm6369-netgear-evg2000.dts
+++ b/target/linux/bmips/dts/bcm6369-netgear-evg2000.dts
@@ -88,9 +88,8 @@
                pci-bus = <0>;
                pci-dev = <1>;
 
-               nvmem-cells = <&macaddr_cfe_6a0>;
+               nvmem-cells = <&macaddr_cfe_6a0 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
 
                brcm,sprom = "brcm/bcm4322-sprom.bin";
                brcm,sprom-fixups = <219 0xec08>;
@@ -104,7 +103,7 @@
 &ethernet {
        status = "okay";
 
-       nvmem-cells = <&macaddr_cfe_6a0>;
+       nvmem-cells = <&macaddr_cfe_6a0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -189,6 +188,18 @@
                        label = "CFE";
                        reg = <0x000000 0x020000>;
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_cfe_6a0: macaddr@6a0 {
+                                       compatible = "mac-base";
+                                       reg = <0x6a0 0x6>;
+                                       #nvmem-cell-cells = <1>;
+                               };
+                       };
                };
 
                partition@20000 {
@@ -225,13 +236,3 @@
 &usbh {
        status = "okay";
 };
-
-&cfe {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_cfe_6a0: macaddr@6a0 {
-               reg = <0x6a0 0x6>;
-       };
-};