ramips: clean up useless dts partition labels

[openwrt/staging/jow.git] / target / linux / ramips / dts / rt3050_asus_rt-g32-b1.dts

diff --git a/target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts b/target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts
index 3603f163b88d17fd9582050e6977fd2dd84d4bab..5d980ebf8a58b12263b5568ffb05e36988e09302 100644 (file)
--- a/target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts
+++ b/target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "rt3050.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -30,7 +28,7 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
@@ -52,10 +50,24 @@
                                read-only;
                        };
 
-                       devconf: partition@40000 {
+                       partition@40000 {
                                label = "devconf";
                                reg = <0x40000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_devconf_0: eeprom@0 {
+                                               reg = <0x0 0x200>;
+                                       };
+
+                                       macaddr_devconf_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -75,7 +87,8 @@
 };
 
 &ethernet {
-       mtd-mac-address = <&devconf 0x4>;
+       nvmem-cells = <&macaddr_devconf_4>;
+       nvmem-cell-names = "mac-address";
 };
 
 &esw {
@@ -83,5 +96,6 @@
 };
 
 &wmac {
-       ralink,mtd-eeprom = <&devconf 0>;
+       nvmem-cells = <&eeprom_devconf_0>;
+       nvmem-cell-names = "eeprom";
 };