mpc85xx: remove mac-address-increment

It's deprecated

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

diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/br200-wp.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/br200-wp.dts
index d5b283658f37b61c71e22ea7f1dcbd2f69c530c8..f7d7b4cf08c12150ae700d63b4db2ba4167f8247 100644 (file)
--- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/br200-wp.dts
+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/br200-wp.dts
@@ -87,12 +87,16 @@
                                        label = "hw-info";
                                        read-only;
 
-                                       compatible = "nvmem-cells";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       macaddr_hwinfo_0: macaddr@0 {
-                                               reg = <0x0 0x6>;
+                                       nvmem-layout {
+                                               compatible = "fixed-layout";
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+
+                                               macaddr_hwinfo_0: macaddr@0 {
+                                                       compatible = "mac-base";
+                                                       reg = <0x0 0x6>;
+                                                       #nvmem-cell-cells = <1>;
+                                               };
                                        };
                                };
 
@@ -167,43 +171,39 @@
                                                reg = <1>;
                                                label = "lan1";
                                                phy-handle = <&phy_port1>;
-                                               nvmem-cells = <&macaddr_hwinfo_0>;
+                                               nvmem-cells = <&macaddr_hwinfo_0 2>;
                                                nvmem-cell-names = "mac-address";
-                                               mac-address-increment = <2>;
                                        };
 
                                        port@2 {
                                                reg = <2>;
                                                label = "lan2";
                                                phy-handle = <&phy_port2>;
-                                               nvmem-cells = <&macaddr_hwinfo_0>;
+                                               nvmem-cells = <&macaddr_hwinfo_0 3>;
                                                nvmem-cell-names = "mac-address";
-                                               mac-address-increment = <3>;
                                        };
 
                                        port@3 {
                                                reg = <3>;
                                                label = "lan3";
                                                phy-handle = <&phy_port3>;
-                                               nvmem-cells = <&macaddr_hwinfo_0>;
+                                               nvmem-cells = <&macaddr_hwinfo_0 4>;
                                                nvmem-cell-names = "mac-address";
-                                               mac-address-increment = <4>;
                                        };
 
                                        port@4 {
                                                reg = <4>;
                                                label = "lan4";
                                                phy-handle = <&phy_port4>;
-                                               nvmem-cells = <&macaddr_hwinfo_0>;
+                                               nvmem-cells = <&macaddr_hwinfo_0 5>;
                                                nvmem-cell-names = "mac-address";
-                                               mac-address-increment = <5>;
                                        };
 
                                        port@5 {
                                                reg = <5>;
                                                label = "wan";
                                                phy-handle = <&phy_port5>;
-                                               nvmem-cells = <&macaddr_hwinfo_0>;
+                                               nvmem-cells = <&macaddr_hwinfo_0 0>;
                                                nvmem-cell-names = "mac-address";
                                        };
 
@@ -232,7 +232,7 @@
                enet0: ethernet@b0000 {
                        status = "okay";
                        phy-connection-type = "rgmii-id";
-                       nvmem-cells = <&macaddr_hwinfo_0>;
+                       nvmem-cells = <&macaddr_hwinfo_0 0>;
                        nvmem-cell-names = "mac-address";
 
                        fixed-link {
@@ -286,9 +286,8 @@
                                reg = <0x0000 0 0 0 0>;
                                #gpio-cells = <2>;
                                gpio-controller;
-                               nvmem-cells = <&macaddr_hwinfo_0>;
+                               nvmem-cells = <&macaddr_hwinfo_0 16>;
                                nvmem-cell-names = "mac-address";
-                               mac-address-increment = <16>;
                        };
                };
        };

diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts
index a807403a07a43f5f26b2b47b886788d137680303..f74aca58c0d17fbba5d846dfb8eb7a3a9bbeee66 100644 (file)
--- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts
+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts
@@ -76,12 +76,16 @@
                                        label = "hw-info";
                                        read-only;
 
-                                       compatible = "nvmem-cells";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       macaddr_hwinfo_0: macaddr@0 {
-                                               reg = <0x0 0x6>;
+                                       nvmem-layout {
+                                               compatible = "fixed-layout";
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+
+                                               macaddr_hwinfo_0: macaddr@0 {
+                                                       compatible = "mac-base";
+                                                       reg = <0x0 0x6>;
+                                                       #nvmem-cell-cells = <1>;
+                                               };
                                        };
                                };
 
@@ -229,7 +233,7 @@
                        status = "okay";
                        phy-handle = <&phy0>;
                        phy-connection-type = "rgmii-id";
-                       nvmem-cells = <&macaddr_hwinfo_0>;
+                       nvmem-cells = <&macaddr_hwinfo_0 0>;
                        nvmem-cell-names = "mac-address";
                };
 
@@ -241,9 +245,8 @@
                        status = "okay";
                        phy-handle = <&phy1>;
                        phy-connection-type = "rgmii-id";
-                       nvmem-cells = <&macaddr_hwinfo_0>;
+                       nvmem-cells = <&macaddr_hwinfo_0 1>;
                        nvmem-cell-names = "mac-address";
-                       mac-address-increment = <1>;
                };
 
                gpio0: gpio-controller@fc00 {

diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
index c54cb53f9452ea2c03a3c251e6b6e303ee7effb9..ef46d8f14affee81688cddbf703c1fe9a4f4606b 100644 (file)
--- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
@@ -57,12 +57,14 @@
                                                label = "u-boot";
                                                read-only;
 
-                                               compatible = "nvmem-cells";
-                                               #address-cells = <1>;
-                                               #size-cells = <1>;
-
-                                               macaddr_uboot_4fc00: macaddr@4fc00 {
-                                                       reg = <0x4fc00 0x6>;
+                                               nvmem-layout {
+                                                       compatible = "fixed-layout";
+                                                       #address-cells = <1>;
+                                                       #size-cells = <1>;
+
+                                                       macaddr_uboot_4fc00: macaddr@4fc00 {
+                                                               reg = <0x4fc00 0x6>;
+                                                       };
                                                };
                                        };