lantiq: remove mac-address-increment

It's deprecated.

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

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts
index c8e67537a94971ae8cab34fafb26b48948f77e0d..ba2b82dd670ae6f364446d49ed8dedc886b63504 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts
@@ -97,9 +97,8 @@
 &gsw {
        phy-mode = "rmii";
        phy-handle = <&phy0>;
-       nvmem-cells = <&macaddr_ath9k_cal_a91>;
+       nvmem-cells = <&macaddr_ath9k_cal_a91 (-2)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-2)>;
 
        mdio-bus {
                #address-cells = <1>;
@@ -128,6 +127,18 @@
                                label = "urlader";
                                reg = <0x00000 0x20000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_ath9k_cal_a91: macaddr@a91 {
+                                               compatible = "mac-base";
+                                               reg = <0xa91 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -171,13 +182,3 @@
                qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
        };
 };
-
-&ath9k_cal {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_ath9k_cal_a91: macaddr@a91 {
-               reg = <0xa91 0x6>;
-       };
-};

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
index cd7b29ca6d1d604ad1bdfdf633a3148c3d327cf9..b04efd8a846cc4b48010e8e84464c5dd00fe93cc 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
@@ -99,9 +99,8 @@
 &gsw {
        phy-mode = "mii";
        phy-handle = <&phy0>;
-       nvmem-cells = <&macaddr_ath9k_cal_a91>;
+       nvmem-cells = <&macaddr_ath9k_cal_a91 (-2)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-2)>;
 
        mdio-bus {
                #address-cells = <1>;
@@ -155,6 +154,18 @@
                                label = "urlader";
                                reg = <0x00000 0x20000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_ath9k_cal_a91: macaddr@a91 {
+                                               compatible = "mac-base";
+                                               reg = <0xa91 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -215,13 +226,3 @@
        status = "okay";
        vbus-supply = <&usb1_vbus>;
 };
-
-&ath9k_cal {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_ath9k_cal_a91: macaddr@a91 {
-               reg = <0xa91 0x6>;
-       };
-};

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts
index 8eaf566b26144abea89e4001ecdc08c7abb14d52..7e0f157bf323fe4838c70fbab4846366a28a0cd6 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts
@@ -175,6 +175,16 @@
                                label = "board";
                                reg = <0x1fc0000 0x20000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_boardconfig_10024: macaddr@10024 {
+                                               reg = <0x10024 0x6>;
+                                       };
+                               };
                        };
 
                        partition@1fe0000 {
@@ -194,13 +204,3 @@
        status = "okay";
        vbus-supply = <&usb_vbus>;
 };
-
-&boardconfig {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_boardconfig_10024: macaddr@10024 {
-               reg = <0x10024 0x6>;
-       };
-};

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dtsi
index b5e4537838bc91f1b4ff3a2f6225a7fc7f007eb5..3d56e76c46e77ea52846a55fd429a48154b2c9d4 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dtsi
@@ -160,6 +160,16 @@
                                label = "boardconfig";
                                reg = <0x3f0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_boardconfig_16: macaddr@16 {
+                                               reg = <0x16 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -199,13 +209,3 @@
        status = "okay";
        gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
 };
-
-&boardconfig {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_boardconfig_16: macaddr@16 {
-               reg = <0x16 0x6>;
-       };
-};

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts
index 35caf647a71c0d1b9e02becd770304acc3aaf956..72f8c3bc6615cdbfc36da664ac4e8e729ff21895 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts
@@ -167,6 +167,16 @@
                                label = "boardconfig";
                                reg = <0x3f0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_boardconfig_16: macaddr@16 {
+                                               reg = <0x16 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -202,13 +212,3 @@
        status = "okay";
        gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
 };
-
-&boardconfig {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_boardconfig_16: macaddr@16 {
-               reg = <0x16 0x6>;
-       };
-};

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts
index 9a1c8b1bcb218d80a6bc67eb2a9929bf90fa1bfc..775aab4ba96b60b8a0d9cf5aea0ad66cc951f4db 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts
@@ -180,6 +180,16 @@
                                label = "boardconfig";
                                reg = <0x3f0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_boardconfig_16: macaddr@16 {
+                                               reg = <0x16 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -219,13 +229,3 @@
        gpios = <&gpio 31 GPIO_ACTIVE_HIGH
                &gpiomm 7 GPIO_ACTIVE_HIGH>;
 };
-
-&boardconfig {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_boardconfig_16: macaddr@16 {
-               reg = <0x16 0x6>;
-       };
-};

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts
index 650c8872c959eab08d3d295c7f8317b389678a5c..182b0c0bb183bfeac1a06b865e5f73b03eabcdbd 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts
@@ -129,6 +129,16 @@
                                label = "boardconfig";
                                reg = <0x3f0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_boardconfig_16: macaddr@16 {
+                                               reg = <0x16 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -148,13 +158,3 @@
        status = "okay";
        gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
 };
-
-&boardconfig {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_boardconfig_16: macaddr@16 {
-               reg = <0x16 0x6>;
-       };
-};

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts
index dddf904af4c5d3fe64b5cde6e2407b8dc88a47aa..4825eb2952eae9465cb0a596ce841e5248cc26de 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts
@@ -198,6 +198,16 @@
                                label = "boardconfig";
                                reg = <0x3f0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_boardconfig_16: macaddr@16 {
+                                               reg = <0x16 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -237,13 +247,3 @@
        gpios = <&gpio 31 GPIO_ACTIVE_HIGH
                &gpiomm 7 GPIO_ACTIVE_HIGH>;
 };
-
-&boardconfig {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_boardconfig_16: macaddr@16 {
-               reg = <0x16 0x6>;
-       };
-};

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
index cfa5dba7c6c822ac72d3719b88b6d42a34e8bb9b..3f957c63a604087b04884c25dcaaf5dad381f766 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
@@ -100,7 +100,7 @@
 /* GPIO 19: switch reset */
 &gsw {
        phy-mode = "rmii";
-       nvmem-cells = <&macaddr_boardconfig_16>;
+       nvmem-cells = <&macaddr_boardconfig_16 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -136,6 +136,18 @@
                                label = "board_config";
                                reg = <0x7f0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_boardconfig_16: macaddr@16 {
+                                               compatible = "mac-base";
+                                               reg = <0x16 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
                };
        };
@@ -155,18 +167,7 @@
                reg = <0x7000 0 0 0 0>;
                ralink,mtd-eeprom = <&boardconfig 0x410>;
                ralink,eeprom-swap;
-               nvmem-cells = <&macaddr_boardconfig_16>;
+               nvmem-cells = <&macaddr_boardconfig_16 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
-       };
-};
-
-&boardconfig {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_boardconfig_16: macaddr@16 {
-               reg = <0x16 0x6>;
        };
 };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts
index 9299f11fe32be4c74763b9f6c666d6ab87881239..52ba5e1a3bff4223e021c441ec47851212c4ecb4 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts
@@ -153,6 +153,16 @@
                                label = "board_config";
                                reg = <0xfe0000 0x20000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_boardconfig_16: macaddr@16 {
+                                               reg = <0x16 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -195,13 +205,3 @@
        status = "okay";
        gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
 };
-
-&boardconfig {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_boardconfig_16: macaddr@16 {
-               reg = <0x16 0x6>;
-       };
-};

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
index a327635c3310d780409e5b5b05a53ab1f16d7e19..fb3363b2e2aab8c7b8ea97e82ce7d324c2862ade 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
@@ -149,7 +149,7 @@
 */
 &gsw {
        phy-mode = "mii";
-       nvmem-cells = <&macaddr_boardconfig_16>;
+       nvmem-cells = <&macaddr_boardconfig_16 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -184,6 +184,18 @@
                                label = "boardconfig";
                                reg = <0x7f0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_boardconfig_16: macaddr@16 {
+                                               compatible = "mac-base";
+                                               reg = <0x16 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
                };
        };
@@ -213,9 +225,8 @@
                compatible = "pci168c,0029";
                reg = <0x7000 0 0 0 0>;
                qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
-               nvmem-cells = <&macaddr_boardconfig_16>;
+               nvmem-cells = <&macaddr_boardconfig_16 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
        };
 };
 
@@ -231,13 +242,3 @@
 &vmmc {
        status = "okay";
 };
-
-&boardconfig {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_boardconfig_16: macaddr@16 {
-               reg = <0x16 0x6>;
-       };
-};

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts
index 4f8f941c8b7360e48eb65ea61f19f192c4aca0f3..1f8db69f3096d030b1f1e4b1e053fbc2f257e64b 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts
@@ -179,6 +179,16 @@
                                label = "board_config";
                                reg = <0xfe0000 0x20000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_boardconfig_16: macaddr@16 {
+                                               reg = <0x16 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -214,13 +224,3 @@
 &vmmc {
        status = "okay";
 };
-
-&boardconfig {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_boardconfig_16: macaddr@16 {
-               reg = <0x16 0x6>;
-       };
-};

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts
index 12de92ec530522de1e045ac2ce035057c969ac3a..d67efb4fca5f2fef85da6f91e99201fb61a197b8 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts
@@ -122,6 +122,16 @@
                                label = "board_config";
                                reg = <0x3f0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_boardconfig_16: macaddr@16 {
+                                               reg = <0x16 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -146,13 +156,3 @@
        status = "okay";
        gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
 };
-
-&boardconfig {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_boardconfig_16: macaddr@16 {
-               reg = <0x16 0x6>;
-       };
-};

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
index f0900b56cc58b4a84bab5aee569a417fc01605c7..41a0e1b74a963b32ee77d9bb2ad2f968cea0ca48 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
@@ -192,6 +192,16 @@
                                label = "board_config";
                                reg = <0x7f0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_boardconfig_16: macaddr@16 {
+                                               reg = <0x16 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -241,13 +251,3 @@
        status = "okay";
        gpios = <&gpiomm 1 GPIO_ACTIVE_HIGH>;
 };
-
-&boardconfig {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_boardconfig_16: macaddr@16 {
-               reg = <0x16 0x6>;
-       };
-};

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
index 8897c9703cd765fe30adb9d4417d709a4e6b103d..4fb135763d5ba50ce12911cedad15bc7656a9909 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
@@ -207,6 +207,16 @@
                                label = "board_config";
                                reg = <0x7f0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_boardconfig_16: macaddr@16 {
+                                               reg = <0x16 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -285,13 +295,3 @@
        status = "okay";
        gpios = <&gpiomm 1 GPIO_ACTIVE_HIGH>;
 };
-
-&boardconfig {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_boardconfig_16: macaddr@16 {
-               reg = <0x16 0x6>;
-       };
-};

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts
index 83a303b9e821b2e1ec8f8d74b19bd7e1908ceeb7..d6a917057d71e5004f1731ba2e7948c7db678b1e 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts
@@ -107,7 +107,7 @@
 
 &gsw {
        phy-mode = "mii";
-       nvmem-cells = <&macaddr_art_16>;
+       nvmem-cells = <&macaddr_art_16 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -143,6 +143,18 @@
                                label = "art";
                                reg = <0x7f0000 0x10000>;       /* 64 KiB*/
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_16: macaddr@16 {
+                                               compatible = "mac-base";
+                                               reg = <0x16 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
                };
        };
@@ -160,9 +172,8 @@
                compatible = "pci168c,0029";
                reg = <0x7000 0 0 0 0>;
                qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
-               nvmem-cells = <&macaddr_art_16>;
+               nvmem-cells = <&macaddr_art_16 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
        };
 };
 
@@ -179,13 +190,3 @@
        status = "okay";
        gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_16: macaddr@16 {
-               reg = <0x16 0x6>;
-       };
-};

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts
index 343f3533d8be1adc2cc0eec737545f089a2cab53..935aa08cb906056805ce8b2dfeaa30c583027023 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts
@@ -207,6 +207,16 @@
                                label = "boardconfig";
                                reg = <0x1f80000 0x80000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_boardconfig_16: macaddr@16 {
+                                               reg = <0x16 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -234,13 +244,3 @@
        status = "okay";
        vbus-supply = <&usb_vbus>;
 };
-
-&boardconfig {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_boardconfig_16: macaddr@16 {
-               reg = <0x16 0x6>;
-       };
-};

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
index 1f8ad430c00718de103c8e0b939aba47f74ec3c1..69685d801b82189704b38e8b791f4ad0becb1f47 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
@@ -108,7 +108,7 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_boardconfig_16>;
+       nvmem-cells = <&macaddr_boardconfig_16 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -207,6 +207,18 @@
                                label = "board_config";
                                reg = <0xfe0000 0x20000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_boardconfig_16: macaddr@16 {
+                                               compatible = "mac-base";
+                                               reg = <0x16 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
                };
        };
@@ -221,9 +233,8 @@
                reg = <0x7000 0 0 0 0>;
                ralink,mtd-eeprom = <&boardconfig 0x410>;
                ralink,eeprom-swap;
-               nvmem-cells = <&macaddr_boardconfig_16>;
+               nvmem-cells = <&macaddr_boardconfig_16 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
        };
 };
 
@@ -246,13 +257,3 @@
                         &gpio 31 GPIO_ACTIVE_HIGH  //still unknown
                         &gpio 3  GPIO_ACTIVE_HIGH>; //reset_slic?
 };
-
-&boardconfig {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_boardconfig_16: macaddr@16 {
-               reg = <0x16 0x6>;
-       };
-};

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
index 5e6a6f0c64fa7733e68121076ac85055eebcddc4..71046cfd58c68af90aef3e4c7ef6c1b4c27886c7 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
@@ -127,9 +127,8 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_boardconfig_16>;
+       nvmem-cells = <&macaddr_boardconfig_16 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &gphy0 {
@@ -225,6 +224,18 @@
                                label = "board_config";
                                reg = <0x40000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_boardconfig_16: macaddr@16 {
+                                               compatible = "mac-base";
+                                               reg = <0x16 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
                };
        };
@@ -239,9 +250,8 @@
                reg = <0x7000 0 0 0 0>;
                ralink,mtd-eeprom = <&boardconfig 0x410>;
                ralink,eeprom-swap;
-               nvmem-cells = <&macaddr_boardconfig_16>;
+               nvmem-cells = <&macaddr_boardconfig_16 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
        };
 };
 
@@ -280,13 +290,3 @@
                 &gpio 31 GPIO_ACTIVE_HIGH  //still unknown
                 &gpio 3  GPIO_ACTIVE_HIGH>; //reset_slic?
 };
-
-&boardconfig {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_boardconfig_16: macaddr@16 {
-               reg = <0x16 0x6>;
-       };
-};

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts
index a30746cde2b4307ce8d8a4c125dcbce0c489a619..cc15324b56e08b15c402fe6b2845b1fa1f4e00c4 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts
@@ -43,16 +43,20 @@
                                reg = <0x00000 0x20000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               cal_urlader_985: cal@985 {
-                                       reg = <0x985 0x440>;
-                               };
-
-                               macaddr_urlader_a91: macaddr@a91 {
-                                       reg = <0xa91 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_urlader_985: cal@985 {
+                                               reg = <0x985 0x440>;
+                                       };
+
+                                       macaddr_urlader_a91: macaddr@a91 {
+                                               compatible = "mac-base";
+                                               reg = <0xa91 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
                                };
                        };
 
@@ -77,9 +81,8 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_urlader_a91>;
+       nvmem-cells = <&macaddr_urlader_a91 (-2)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-2)>;
 };
 
 &phy0 {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts
index 31523eaae00340cda88304a7c2f7d96dc3f10211..cbe6c14c991fdc2143beb7c8eecdca7c5c9f185a 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts
@@ -43,6 +43,18 @@
                                label = "urlader";
                                reg = <0x00000 0x20000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_urlader_a91: macaddr@a91 {
+                                               compatible = "mac-base";
+                                               reg = <0xa91 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -66,9 +78,8 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_urlader_a91>;
+       nvmem-cells = <&macaddr_urlader_a91 (-2)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-2)>;
 };
 
 &phy0 {
@@ -78,13 +89,3 @@
 &phy1 {
        reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
 };
-
-&urlader {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_urlader_a91: macaddr@a91 {
-               reg = <0xa91 0x6>;
-       };
-};

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts
index 7995b34971abb38aa4910b3932b4b78c18183684..7929bde6cfe68bfccf687ccedcc940988cbbc993 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts
@@ -47,6 +47,18 @@
                                reg = <0x0 0x40000>;
                                label = "urlader";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_urlader_a91: macaddr@a91 {
+                                               compatible = "mac-base";
+                                               reg = <0xa91 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@40000 {
@@ -104,9 +116,8 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_urlader_a91>;
+       nvmem-cells = <&macaddr_urlader_a91 (-2)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-2)>;
 };
 
 &phy0 {
@@ -116,13 +127,3 @@
 &phy1 {
        reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
 };
-
-&urlader {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_urlader_a91: macaddr@a91 {
-               reg = <0xa91 0x6>;
-       };
-};

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi
index 5b7c10bb9dd49b5a3959a8818015bee06ea93da4..39d7b4908cd46e5a8a2244132bd2312d911ca7cd 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi
@@ -110,7 +110,7 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_ath9k_cal_f100>;
+       nvmem-cells = <&macaddr_ath9k_cal_f100 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -204,9 +204,8 @@
                        gpio-controller;
                        qca,no-eeprom;
                        ieee80211-freq-limit = <2402000 2482000>;
-                       nvmem-cells = <&macaddr_ath9k_cal_f100>;
+                       nvmem-cells = <&macaddr_ath9k_cal_f100 2>;
                        nvmem-cell-names = "mac-address";
-                       mac-address-increment = <2>;
                };
        };
 };
@@ -246,6 +245,18 @@
                                reg = <0x7d0000 0x30000>;
                                label = "boardconfig";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_ath9k_cal_f100: macaddr@f100 {
+                                               compatible = "mac-base";
+                                               reg = <0xf100 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
                };
        };
@@ -268,13 +279,3 @@
        status = "okay";
        vbus-supply = <&usb_vbus>;
 };
-
-&ath9k_cal {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_ath9k_cal_f100: macaddr@f100 {
-               reg = <0xf100 0x6>;
-       };
-};

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi
index e37f1ab37c837fcc8b3804f8141d5adeee328891..acb54ee80b317286d596d8920587696383621a4d 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi
@@ -100,7 +100,7 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_romfile_f100>;
+       nvmem-cells = <&macaddr_romfile_f100 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -192,9 +192,8 @@
                        mediatek,mtd-eeprom = <&radio 0x0000>;
                        big-endian;
                        ieee80211-freq-limit = <5000000 6000000>;
-                       nvmem-cells = <&macaddr_romfile_f100>;
+                       nvmem-cells = <&macaddr_romfile_f100 2>;
                        nvmem-cell-names = "mac-address";
-                       mac-address-increment = <2>;
                };
        };
 };
@@ -245,6 +244,18 @@
                                reg = <0xfd0000 0x10000>;
                                label = "romfile";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_romfile_f100: macaddr@f100 {
+                                               compatible = "mac-base";
+                                               reg = <0xf100 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@fe0000 {
@@ -279,13 +290,3 @@
        status = "okay";
        vbus-supply = <&usb_vbus>;
 };
-
-&romfile {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_romfile_f100: macaddr@f100 {
-               reg = <0xf100 0x6>;
-       };
-};