X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2Frt2880_belkin_f5d8235-v1.dts;h=86e4964a99dd95ba0065f3e4308a3a082122e6c3;hb=01996b785dcef61e6dadb50f61a13f905f3e497d;hp=04728c582ee394f9d1a7cd497679ae6d6beeccc7;hpb=6a104ac77206158c593cc7572c46eca6d3f4717f;p=openwrt%2Fstaging%2Fjow.git

diff --git a/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts b/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts
index 04728c582e..86e4964a99 100644
--- a/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts
+++ b/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "rt2880.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -16,7 +14,7 @@
 		led-failsafe = &led_wired_blue;
 	};
 
-	cfi@1f000000 {
+	flash@1f000000 {
 		compatible = "cfi-flash";
 		reg = <0xbc400000 0x800000>;
 		bank-width = <2>;
@@ -39,10 +37,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 {
@@ -121,90 +133,85 @@
 		compatible = "gpio-leds";
 
 		internet {
-			label = "f5d8235-v1:blue:internet";
+			label = "blue:internet";
 			gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
 		};
 
 		internet2 {
-			label = "f5d8235-v1:amber:internet";
+			label = "amber:internet";
 			gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
 		};
 
 		modem {
-			label = "f5d8235-v1:blue:modem";
+			label = "blue:modem";
 			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
 		};
 
 		modem2 {
-			label = "f5d8235-v1:amber:modem";
+			label = "amber:modem";
 			gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
 		};
 
 		router {
-			label = "f5d8235-v1:blue:router";
+			label = "blue:router";
 			gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
 		};
 
 		storage {
-			label = "f5d8235-v1:blue:storage";
+			label = "blue:storage";
 			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&ohci_port1>, <&ehci_port1>;
 			linux,default-trigger = "usbport";
 		};
 
 		storage2 {
-			label = "f5d8235-v1:amber:storage";
+			label = "amber:storage";
 			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
 		};
 
 		security {
-			label = "f5d8235-v1:blue:security";
+			label = "blue:security";
 			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
 		};
 
 		security2 {
-			label = "f5d8235-v1:amber:security";
+			label = "amber:security";
 			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
 		};
 
 		led_wired_blue: wired {
-			label = "f5d8235-v1:blue:wired";
+			label = "blue:wired";
 			gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
 		};
 
 		wired2 {
-			label = "f5d8235-v1:amber:wired";
+			label = "amber:wired";
 			gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
 		};
 
 		wireless {
-			label = "f5d8235-v1:blue:wireless";
+			label = "blue:wireless";
 			gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
 		};
 
 		wireless2 {
-			label = "f5d8235-v1:amber:wireless";
+			label = "amber:wireless";
 			gpios = <&gpio0 19 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
 
-&gpio0 {
-	status = "okay";
-};
-
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi", "i2c", "jtag", "mdio", "uartlite";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		groups = "spi", "i2c", "jtag", "mdio", "uartlite";
+		function = "gpio";
 	};
 };
 
 &ethernet {
 	status = "okay";
-	mtd-mac-address = <&factory 0x4>;
+	nvmem-cells = <&macaddr_factory_4>;
+	nvmem-cell-names = "mac-address";
 
 	port@0 {
 		mediatek,fixed-link = <1000 1 1 1>;
@@ -240,6 +247,6 @@
 };
 
 &wmac {
-	status = "okay";
-	ralink,mtd-eeprom = <&factory 0x0>;
+	nvmem-cells = <&eeprom_factory_0>;
+	nvmem-cell-names = "eeprom";
 };