bmips: remove mac-address-increment

[openwrt/openwrt.git] / target / linux / bmips / dts / bcm6369-comtrend-wap-5813n.dts

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>;
-       };
-};