ramips: mt7620a: use mac-base

[openwrt/staging/hauke.git] / target / linux / ramips / dts / mt7620a_cameo_810.dtsi

diff --git a/target/linux/ramips/dts/mt7620a_cameo_810.dtsi b/target/linux/ramips/dts/mt7620a_cameo_810.dtsi
index c25db1d9d8313d698b1f37a80babd21e392e65cf..d09f4d292ebdf0b3781c7dc416e48fb3554059af 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_cameo_810.dtsi
+++ b/target/linux/ramips/dts/mt7620a_cameo_810.dtsi
@@ -81,19 +81,28 @@
                        };
 
                        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>;
-                               };
+                               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_28: macaddr@28 {
-                                       reg = <0x28 0x6>;
+                                       macaddr_factory_28: macaddr@28 {
+                                               compatible = "mac-base";
+                                               reg = <0x28 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
                                };
                        };
 
@@ -138,7 +147,7 @@
 };
 
 &ethernet {
-       nvmem-cells = <&macaddr_factory_28>;
+       nvmem-cells = <&macaddr_factory_28 0>;
        nvmem-cell-names = "mac-address";
 
        mediatek,portmap = "llllw";
@@ -152,7 +161,7 @@
        pinctrl-names = "default", "pa_gpio";
        pinctrl-0 = <&pa_pins>;
        pinctrl-1 = <&pa_gpio_pins>;
-       nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_28>;
+       nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_28 0>;
        nvmem-cell-names = "eeprom", "mac-address";
 };
 
@@ -163,10 +172,8 @@
 &pcie0 {
        wifi@0,0 {
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x8000>;
                ieee80211-freq-limit = <5000000 6000000>;
-               nvmem-cells = <&macaddr_factory_28>;
-               nvmem-cell-names = "mac-address";
-               mac-address-increment = <2>;
+               nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_28 2>;
+               nvmem-cell-names = "eeprom", "mac-address";
        };
 };