X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2Fmt7620n_elecom_wrh-300cr.dts;h=afb14b118895e586eb155a3d1cc809fe34f9c3fb;hb=40feb97e56512ed94bd3efab737b6737c2f3264f;hp=b1eceeed8eb15326f18cbbfb313146f37ead6725;hpb=556ff0987539271647535094309605433f2aa96f;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts b/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts
index b1eceeed8e..afb14b1188 100644
--- a/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts
+++ b/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "mt7620n.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -20,17 +18,17 @@
 		compatible = "gpio-leds";
 
 		led_wps: wps {
-			label = "wrh-300cr:green:wps";
+			label = "green:wps";
 			gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
 		};
 
 		ethernet {
-			label = "wrh-300cr:green:ethernet";
+			label = "green:ethernet";
 			gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "wrh-300cr:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -52,10 +50,6 @@
 	};
 };
 
-&gpio1 {
-	status = "okay";
-};
-
 &gpio2 {
 	status = "okay";
 };
@@ -67,7 +61,7 @@
 &spi0 {
 	status = "okay";
 
-	m25p80@0 {
+	flash@0 {
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
@@ -92,6 +86,20 @@
 				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_2e: macaddr@2e {
+						reg = <0x2e 0x6>;
+					};
+				};
 			};
 
 			partition@50000 {
@@ -118,19 +126,20 @@
 };
 
 &ethernet {
-	mtd-mac-address = <&factory 0x2e>;
+	nvmem-cells = <&macaddr_factory_2e>;
+	nvmem-cell-names = "mac-address";
+
 	mediatek,portmap = "llllw";
 };
 
 &wmac {
-	ralink,mtd-eeprom = <&factory 0>;
+	nvmem-cells = <&eeprom_factory_0>;
+	nvmem-cell-names = "eeprom";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "ephy", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		groups = "i2c", "ephy", "wled";
+		function = "gpio";
 	};
 };