ramips: clean up useless dts partition labels

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7621_mediatek_ap-mt7621a-v60.dts

diff --git a/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts b/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts
index 557abcc21af2eac5c3a05ba40087de759a03b951..aaa75b057320dab7440d12f51584f840229527c8 100644 (file)
--- a/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts
+++ b/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts
@@ -93,10 +93,22 @@
                                read-only;
                        };
 
-                       factory: partition@40000 {
+                       partition@40000 {
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_5: macaddr@5 {
+                                               compatible = "mac-base";
+                                               reg = <0x5 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -113,7 +125,7 @@
 };
 
 &gmac0 {
-       nvmem-cells = <&macaddr_factory_5>;
+       nvmem-cells = <&macaddr_factory_5 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -122,9 +134,8 @@
        label = "wan";
        phy-handle = <&ethphy4>;
 
-       nvmem-cells = <&macaddr_factory_5>;
+       nvmem-cells = <&macaddr_factory_5 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &mdio {
@@ -160,13 +171,3 @@
 &pcie {
        status = "okay";
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_5: macaddr@5 {
-               reg = <0x5 0x6>;
-       };
-};