X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2Frt3050_dlink_dir-600-b1.dts;h=13badc71391c77767843432f50151d53d550f723;hb=01996b785dcef61e6dadb50f61a13f905f3e497d;hp=a77bfd717fc42c6198762933f4bbf2405a201606;hpb=3b0264eddbc94f43a015a965b9eb3e12cfce0655;p=openwrt%2Fstaging%2Fjow.git

diff --git a/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts b/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts
index a77bfd717f..13badc7139 100644
--- a/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts
+++ b/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.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 = "dlink,dir-600-b1", "ralink,rt3050-soc";
@@ -16,7 +15,7 @@
 		led-upgrade = &led_status_green;
 	};
 
-	cfi@1f000000 {
+	flash@1f000000 {
 		compatible = "cfi-flash";
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
@@ -33,13 +32,27 @@
 				read-only;
 			};
 
-			devdata: partition@30000 {
+			partition@30000 {
 				label = "devdata";
 				reg = <0x30000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_devdata_4000: eeprom@4000 {
+						reg = <0x4000 0x200>;
+					};
+
+					macaddr_devdata_4004: macaddr@4004 {
+						reg = <0x4004 0x6>;
+					};
+				};
 			};
 
-			factory: partition@40000 {
+			partition@40000 {
 				label = "devconf";
 				reg = <0x40000 0x10000>;
 				read-only;
@@ -74,43 +87,47 @@
 		compatible = "gpio-leds";
 
 		status {
-			label = "dir-600-b1:amber:status";
+			function = LED_FUNCTION_STATUS;
+			color = <LED_COLOR_ID_AMBER>;
 			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
 		};
 
 		led_status_green: status2 {
-			label = "dir-600-b1:green:status";
+			function = LED_FUNCTION_STATUS;
+			color = <LED_COLOR_ID_GREEN>;
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
 		};
 
 		wan {
-			label = "dir-600-b1:amber:wan";
+			function = LED_FUNCTION_WAN;
+			color = <LED_COLOR_ID_AMBER>;
 			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
 		};
 
 		wan2 {
-			label = "dir-600-b1:green:wan";
+			function = LED_FUNCTION_WAN;
+			color = <LED_COLOR_ID_GREEN>;
 			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
 		};
 
 		wps {
-			label = "dir-600-b1:blue:wps";
+			function = LED_FUNCTION_WPS;
+			color = <LED_COLOR_ID_BLUE>;
 			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		groups = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
+		function = "gpio";
 	};
 };
 
 &ethernet {
-	mtd-mac-address = <&devdata 0x4004>;
+	nvmem-cells = <&macaddr_devdata_4004>;
+	nvmem-cell-names = "mac-address";
 };
 
 &esw {
@@ -118,5 +135,6 @@
 };
 
 &wmac {
-	ralink,mtd-eeprom = <&devdata 0x4000>;
+	nvmem-cells = <&eeprom_devdata_4000>;
+	nvmem-cell-names = "eeprom";
 };