lantiq: remove mac-address-increment

[openwrt/staging/wigyori.git] / target / linux / lantiq / files / arch / mips / boot / dts / lantiq / danube_arcadyan_arv7518pw.dts

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