X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2Fmt7620a_asus_rp-n53.dts;h=f7d8d96d4e8bc74b2b7552a1df8c41358617c6d8;hb=01996b785dcef61e6dadb50f61a13f905f3e497d;hp=2d2820ed791a91c02492dea0619b960425d3da0c;hpb=48047b3a5c6aa9fff89a7a9c7ec76d8335b1a8e7;p=openwrt%2Fstaging%2Fjow.git

diff --git a/target/linux/ramips/dts/mt7620a_asus_rp-n53.dts b/target/linux/ramips/dts/mt7620a_asus_rp-n53.dts
index 2d2820ed79..f7d8d96d4e 100644
--- a/target/linux/ramips/dts/mt7620a_asus_rp-n53.dts
+++ b/target/linux/ramips/dts/mt7620a_asus_rp-n53.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "mt7620a.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -10,8 +8,7 @@
 	model = "Asus RP-N53";
 
 	keys {
-		compatible = "gpio-keys-polled";
-		poll-interval = <20>;
+		compatible = "gpio-keys";
 
 		touch {
 			label = "touch";
@@ -42,42 +39,42 @@
 		compatible = "gpio-leds";
 
 		backlight {
-			label = "rp-n53:white:back";
+			label = "white:back";
 			gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi0 {
-			label = "rp-n53:blue:5g3";
+			label = "blue:5g3";
 			gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi1 {
-			label = "rp-n53:blue:5g2";
+			label = "blue:5g2";
 			gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi2 {
-			label = "rp-n53:blue:5g1";
+			label = "blue:5g1";
 			gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi3 {
-			label = "rp-n53:blue:wifi";
+			label = "blue:wifi";
 			gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi4 {
-			label = "rp-n53:blue:2g1";
+			label = "blue:2g1";
 			gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi5 {
-			label = "rp-n53:blue:2g2";
+			label = "blue:2g2";
 			gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi6 {
-			label = "rp-n53:blue:2g3";
+			label = "blue:2g3";
 			gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -100,7 +97,7 @@
 &spi0 {
 	status = "okay";
 
-	m25p80@0 {
+	flash@0 {
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
@@ -122,10 +119,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>;
+					};
+
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
+				};
 			};
 
 			partition@50000 {
@@ -146,20 +157,18 @@
 };
 
 &wmac {
-	ralink,mtd-eeprom = <&factory 0>;
+	nvmem-cells = <&eeprom_factory_0>;
+	nvmem-cell-names = "eeprom";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "mdio", "rgmii1";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		groups = "mdio", "rgmii1";
+		function = "gpio";
 	};
 };
 
-&gsw {
-	mediatek,port4 = "ephy";
+&ethernet {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ephy_pins>;
 };
@@ -173,6 +182,7 @@
 		compatible = "pci1814,5592";
 		reg = <0x0000 0 0 0 0>;
 		ralink,2ghz = <0>;
-		ralink,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 	};
 };