ramips: dts: rt3050: reset FE and ESW cores together

[openwrt/openwrt.git] / target / linux / ramips / dts / mt7620a_dlink_dir-806a-b1.dts

diff --git a/target/linux/ramips/dts/mt7620a_dlink_dir-806a-b1.dts b/target/linux/ramips/dts/mt7620a_dlink_dir-806a-b1.dts
old mode 100755 (executable)
new mode 100644 (file)
index ae0b7c1..52739f5
--- a/target/linux/ramips/dts/mt7620a_dlink_dir-806a-b1.dts
+++ b/target/linux/ramips/dts/mt7620a_dlink_dir-806a-b1.dts
@@ -91,27 +91,34 @@
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "Factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x200>;
-                               };
-
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
-
-                               macaddr_factory_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
-                               };
-
-                               macaddr_factory_8004: macaddr@8004 {
-                                       reg = <0x8004 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x200>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_4: macaddr@4 {
+                                               compatible = "mac-base";
+                                               reg = <0x4 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+
+                                       macaddr_factory_8004: macaddr@8004 {
+                                               compatible = "mac-base";
+                                               reg = <0x8004 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
                                };
                        };
 
@@ -133,9 +140,8 @@
 };
 
 &ethernet {
-       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cells = <&macaddr_factory_4 (-2)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-2)>;
 };
 
 &wmac {
@@ -143,9 +149,8 @@
        pinctrl-0 = <&pa_pins>;
        pinctrl-1 = <&pa_gpio_pins>;
 
-       nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_4>;
+       nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_4 (-1)>;
        nvmem-cell-names = "eeprom", "mac-address";
-       mac-address-increment = <(-1)>;
 };
 
 &pcie {
@@ -156,9 +161,8 @@
        wifi@0,0 {
                reg = <0x0000 0 0 0 0>;
                ieee80211-freq-limit = <5000000 6000000>;
-               nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_8004>;
+               nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_8004 (-3)>;
                nvmem-cell-names = "eeprom", "mac-address";
-               mac-address-increment = <(-3)>;
 
                led {
                        led-active-low;