X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2Frt3352_dlink_dir-620-d1.dts;h=de020706dfd64d515faec9a2994d88284636311d;hb=5f479a4f343019bc9511ba841042d42d045f3fbf;hp=4f3847fed23b0aa98bcf7a80d0b0c01350264452;hpb=22a21b0c18ebce7b7040ce693621f5c77983f3e5;p=openwrt%2Fstaging%2Fhauke.git

diff --git a/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts b/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts
index 4f3847fed2..de020706df 100644
--- a/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts
+++ b/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "rt3352.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -20,12 +18,12 @@
 		compatible = "gpio-leds";
 
 		led_status: status {
-			label = "dir-620-d1:green:status";
+			label = "green:status";
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi {
-			label = "dir-620-d1:green:wifi";
+			label = "green:wifi";
 			gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -45,7 +43,7 @@
 &spi0 {
 	status = "okay";
 
-	m25p80@0 {
+	flash@0 {
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
@@ -71,6 +69,20 @@
 				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_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
+				};
 			};
 
 			partition@50000 {
@@ -90,7 +102,8 @@
 };
 
 &ethernet {
-	mtd-mac-address = <&factory 0x4>;
+	nvmem-cells = <&macaddr_factory_4>;
+	nvmem-cell-names = "mac-address";
 	pinctrl-names = "default";
 	pinctrl-0 = <&rgmii_pins &mdio_pins>;
 };
@@ -100,7 +113,8 @@
 };
 
 &wmac {
-	ralink,mtd-eeprom = <&factory 0x0>;
+	nvmem-cells = <&eeprom_factory_0>;
+	nvmem-cell-names = "eeprom";
 };
 
 &ehci {