X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2Frt2880_buffalo_wli-tx4-ag300n.dts;h=b89e0865841de2074f4a43c062eefb1a222e0d22;hb=01996b785dcef61e6dadb50f61a13f905f3e497d;hp=d8876de06a0e93cd1d1047134617190e94e70855;hpb=22a21b0c18ebce7b7040ce693621f5c77983f3e5;p=openwrt%2Fstaging%2Fjow.git

diff --git a/target/linux/ramips/dts/rt2880_buffalo_wli-tx4-ag300n.dts b/target/linux/ramips/dts/rt2880_buffalo_wli-tx4-ag300n.dts
index d8876de06a..b89e086584 100644
--- a/target/linux/ramips/dts/rt2880_buffalo_wli-tx4-ag300n.dts
+++ b/target/linux/ramips/dts/rt2880_buffalo_wli-tx4-ag300n.dts
@@ -1,9 +1,8 @@
-/dts-v1/;
-
 #include "rt2880.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
 	#address-cells = <1>;
@@ -18,7 +17,7 @@
 		led-upgrade = &led_power;
 	};
 
-	cfi@1f000000 {
+	flash@1f000000 {
 		compatible = "cfi-flash";
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
@@ -41,10 +40,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_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
+				};
 			};
 
 			partition@50000 {
@@ -82,29 +95,27 @@
 		compatible = "gpio-leds";
 
 		diag {
-			label = "wli-tx4-ag300n:red:diag";
+			label = "red:diag";
 			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power: power {
-			label = "wli-tx4-ag300n:blue:power";
+			function = LED_FUNCTION_POWER;
+			color = <LED_COLOR_ID_BLUE>;
 			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
 		};
 
 		security {
-			label = "wli-tx4-ag300n:blue:security";
+			label = "blue:security";
 			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
 
-&gpio0 {
-	status = "okay";
-};
-
 &ethernet {
 	status = "okay";
-	mtd-mac-address = <&factory 0x4>;
+	nvmem-cells = <&macaddr_factory_4>;
+	nvmem-cell-names = "mac-address";
 
 	port@0 {
 		mediatek,fixed-link = <100 1 1 1>;
@@ -121,5 +132,6 @@
 };
 
 &wmac {
-	ralink,mtd-eeprom = <&factory 0x0>;
+	nvmem-cells = <&eeprom_factory_0>;
+	nvmem-cell-names = "eeprom";
 };