bmips: remove mac-address-increment

[openwrt/openwrt.git] / target / linux / bmips / dts / bcm63168-sercomm-shg2500.dts

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