X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2Frt3052_upvel_ur-336un.dts;h=4a7dc5511c610229bea8dae9532399ef3b034d0b;hb=01996b785dcef61e6dadb50f61a13f905f3e497d;hp=5ce0765be263313e7dfbade1fe9a5a60c39da468;hpb=1eceab3fc0f9875da0cc6b83be4438593f617287;p=openwrt%2Fstaging%2Fjow.git

diff --git a/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts b/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts
index 5ce0765be2..4a7dc5511c 100644
--- a/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts
+++ b/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts
@@ -1,9 +1,8 @@
-/dts-v1/;
-
 #include "rt3050.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
 	compatible = "upvel,ur-336un", "ralink,rt3052-soc";
@@ -39,10 +38,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_4004: macaddr@4004 {
+						reg = <0x4004 0x6>;
+					};
+				};
 			};
 
 			partition@50000 {
@@ -57,27 +70,28 @@
 		compatible = "gpio-leds";
 
 		3g {
-			label = "ur-336un:green:3g";
+			label = "green:3g";
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
 		};
 
 		gateway {
-			label = "ur-336un:green:gateway";
+			label = "green:gateway";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 		};
 
 		ap {
-			label = "ur-336un:green:ap";
+			label = "green:ap";
 			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
 		};
 
 		led_wps: wps {
-			label = "ur-336un:green:wps";
+			function = LED_FUNCTION_WPS;
+			color = <LED_COLOR_ID_GREEN>;
 			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
 		};
 
 		station {
-			label = "ur-336un:green:station";
+			label = "green:station";
 			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -108,7 +122,8 @@
 };
 
 &ethernet {
-	mtd-mac-address = <&factory 0x4004>;
+	nvmem-cells = <&macaddr_factory_4004>;
+	nvmem-cell-names = "mac-address";
 };
 
 &esw {
@@ -116,7 +131,8 @@
 };
 
 &wmac {
-	ralink,mtd-eeprom = <&factory 0x0>;
+	nvmem-cells = <&eeprom_factory_0>;
+	nvmem-cell-names = "eeprom";
 };
 
 &otg {