lantiq: remove mac-address-increment

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

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