X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2Frt3662_edimax_br-6475nd.dts;h=fc3a5549f207225434257c833315d72b83ef39a0;hb=03b328480559a0183752f668dece2ff00d3bee28;hp=86f724e871569bf711b707e1320b4f97cc8df133;hpb=74ff0773b50470ea75fbceefbb4783875e619c25;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts b/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts
index 86f724e871..fc3a5549f2 100644
--- a/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts
+++ b/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts
@@ -1,9 +1,8 @@
-/dts-v1/;
-
 #include "rt3883.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/mtd/partitions/uimage.h>
 
 / {
 	compatible = "edimax,br-6475nd", "ralink,rt3662-soc", "ralink,rt3883-soc";
@@ -38,17 +37,17 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "br-6475nd:green:power";
+			label = "green:power";
 			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "br-6475nd:amber:wlan";
+			label = "amber:wlan";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan_5ghz {
-			label = "br-6475nd:amber:wlan_5ghz";
+			label = "amber:wlan_5ghz";
 			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -88,7 +87,9 @@
 			};
 
 			partition@70000 {
-				compatible = "edimax,uimage";
+				compatible = "openwrt,uimage", "denx,uimage";
+				openwrt,offset = <FW_EDIMAX_OFFSET>;
+				openwrt,partition-magic = <FW_MAGIC_EDIMAX>;
 				reg = <0x00070000 0x00790000>;
 				label = "firmware";
 			};
@@ -132,17 +133,14 @@
 	status = "okay";
 };
 
-&gpio1 {
-	status = "okay";
-};
-
 &uartlite {
 	status = "okay";
 };
 
 &ethernet {
 	status = "okay";
-	mtd-mac-address = <&devdata 0xd>;
+	nvmem-cells = <&macaddr_devdata_d>;
+	nvmem-cell-names = "mac-address";
 
 	port@0 {
 		mediatek,fixed-link = <1000 1 1 1>;
@@ -176,3 +174,13 @@
 &ohci {
 	status = "okay";
 };
+
+&devdata {
+	compatible = "nvmem-cells";
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	macaddr_devdata_d: macaddr@d {
+		reg = <0xd 0x6>;
+	};
+};