ramips: clean up useless dts partition labels

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7628an_tplink_re305-v1.dts

diff --git a/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts b/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts
index 6b52583273420bb7fd94d6f99a44579d2b4f03be..784ef6c4de82ad557ca6ddbbdb97dbad05b7a443 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts
@@ -32,16 +32,21 @@
                                reg = <0x20000 0x5e0000>;
                        };
 
-                       config: partition@600000 {
-                               compatible = "nvmem-cells";
+                       partition@600000 {
                                label = "config";
                                reg = <0x600000 0x50000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               macaddr_config_10008: macaddr@10008 {
-                                       reg = <0x10008 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_10008: macaddr@10008 {
+                                               compatible = "mac-base";
+                                               reg = <0x10008 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
                                };
                        };
 
@@ -50,16 +55,23 @@
                                stock firmware so it is left out as well.
                        */
 
-                       radio: partition@7f0000 {
-                               compatible = "nvmem-cells";
+                       partition@7f0000 {
                                label = "radio";
                                reg = <0x7f0000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_radio_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_radio_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
+
+                                       eeprom_radio_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
                                };
                        };
                };
@@ -67,20 +79,16 @@
 };
 
 &wlan5g {
-       mediatek,mtd-eeprom = <&radio 0x8000>;
-
-       nvmem-cells = <&macaddr_config_10008>;
-       nvmem-cell-names = "mac-address";
-       mac-address-increment = <2>;
+       nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_10008 2>;
+       nvmem-cell-names = "eeprom", "mac-address";
 };
 
 &wmac {
-       nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_10008>;
+       nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_10008 1>;
        nvmem-cell-names = "eeprom", "mac-address";
-       mac-address-increment = <1>;
 };
 
 &ethernet {
-       nvmem-cells = <&macaddr_config_10008>;
+       nvmem-cells = <&macaddr_config_10008 0>;
        nvmem-cell-names = "mac-address";
 };