ramips: clean up useless dts partition labels

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7621_zyxel_nwa-ax.dtsi

diff --git a/target/linux/ramips/dts/mt7621_zyxel_nwa-ax.dtsi b/target/linux/ramips/dts/mt7621_zyxel_nwa-ax.dtsi
index fa7e23dd47133cf64dfe2234551c37b236975fb5..499d166890af6794cd2c2a722207e77cd5681ce1 100644 (file)
--- a/target/linux/ramips/dts/mt7621_zyxel_nwa-ax.dtsi
+++ b/target/linux/ramips/dts/mt7621_zyxel_nwa-ax.dtsi
@@ -36,10 +36,24 @@
                        read-only;
                };
 
-               factory: partition@100000 {
+               partition@100000 {
                        label = "factory";
                        reg = <0x100000 0x80000>;
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0xe00>;
+                               };
+
+                               precal_factory_e10: precal@e10 {
+                                       reg = <0xe10 0x19c10>;
+                               };
+                       };
                };
 
                partition@180000 {
@@ -92,10 +106,20 @@
                        reg = <0x7700000 0x80000>;
                };
 
-               mrd: partition@7780000 {
+               partition@7780000 {
                        label = "mrd";
                        reg = <0x7780000 0x80000>;
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_mrd_1fff8: macaddr@1fff8 {
+                                       reg = <0x1fff8 0x6>;
+                               };
+                       };
                };
        };
 };
@@ -108,9 +132,8 @@
        wlan_5g: wifi@0,0 {
                reg = <0x0 0 0 0 0>;
                compatible = "mediatek,mt76";
-
-               mediatek,mtd-eeprom = <&factory 0x0>;
-
+               nvmem-cells = <&eeprom_factory_0>, <&precal_factory_e10>;
+               nvmem-cell-names = "eeprom", "precal";
                /* MAC-Address set in userspace */
        };
 };
@@ -129,16 +152,6 @@
        };
 };
 
-&mrd {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_mrd_1fff8: macaddr@1fff8 {
-               reg = <0x1fff8 0x6>;
-       };
-};
-
 &state_default {
        gpio {
                groups = "uart3";