ramips: clean up useless dts partition labels

[openwrt/openwrt.git] / target / linux / ramips / dts / mt7620a_glinet_gl-mt300n.dts

diff --git a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts
index 7a83e584f286fa3a3a0d03df3b6a2da4802b21d0..8dc365588333206e7ebc856359fde5d623146790 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts
+++ b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "mt7620a.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -59,14 +57,6 @@
        };
 };
 
-&gpio0 {
-       status = "okay";
-};
-
-&gpio1 {
-       status = "okay";
-};
-
 &gpio2 {
        status = "okay";
 };
@@ -78,7 +68,7 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
@@ -99,10 +89,24 @@
                                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>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x200>;
+                                       };
+
+                                       macaddr_factory_4000: macaddr@4000 {
+                                               reg = <0x4000 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -128,12 +132,15 @@
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0x4000>;
+       nvmem-cells = <&macaddr_factory_4000>;
+       nvmem-cell-names = "mac-address";
+
        mediatek,portmap = "wllll";
 };
 
 &wmac {
-       ralink,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &state_default {