X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2FAIR3GII.dts;h=40d3228615d7cd8aae3ab0b7c1cf090338f24fa4;hb=ccf89e71f28e68b9791b8442725d70e8e03614cf;hp=342e215d8c72a54d07463ca12bcce7d271967946;hpb=d16de0b69f70d395d4097e00613047ecf05d3d39;p=oweals%2Fopenwrt.git

diff --git a/target/linux/ramips/dts/AIR3GII.dts b/target/linux/ramips/dts/AIR3GII.dts
index 342e215d8c..40d3228615 100644
--- a/target/linux/ramips/dts/AIR3GII.dts
+++ b/target/linux/ramips/dts/AIR3GII.dts
@@ -3,32 +3,17 @@
 /include/ "rt5350.dtsi"
 
 / {
-	#address-cells = <1>;
-	#size-cells = <1>;
 	compatible = "AIR3GII", "ralink,rt5350-soc";
 	model = "AirLive Air3GII";
 
-	memorydetect {
-		ralink,memory = <0x0 0x200000 0x4000000>;
-	};
-
-	chosen {
-		bootargs = "console=ttyS0,57600 mtdparts=spi0.0:192k(u-boot)ro,64k(u-boot-env)ro,64k(factory)ro,3776k@0x50000(firmware)";
-	};
-
 	palmbus@10000000 {
-		sysc@0 {
-			ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii";
-			ralink,uartmux = "gpio";
-			ralink,wdtmux = <1>;
-		};
-
 		gpio0: gpio@600 {
 			status = "okay";
 		};
 
 		spi@b00 {
 			status = "okay";
+
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
@@ -36,27 +21,64 @@
 				reg = <0 0>;
 				linux,modalias = "m25p80", "en25q32b";
 				spi-max-frequency = <10000000>;
+
+				partition@0 {
+					label = "u-boot";
+					reg = <0x0 0x30000>;
+					read-only;
+				};
+
+				partition@30000 {
+					label = "u-boot-env";
+					reg = <0x30000 0x10000>;
+					read-only;
+				};
+
+				factory: partition@40000 {
+					label = "factory";
+					reg = <0x40000 0x10000>;
+					read-only;
+				};
+
+				partition@50000 {
+					label = "firmware";
+					reg = <0x50000 0x3b0000>;
+				};
+			};
+		};
+	};
+
+	pinctrl {
+		state_default: pinctrl0 {
+			gpio {
+				ralink,group = "i2c", "jtag", "uartf";
+				ralink,function = "gpio";
 			};
 		};
 	};
 
 	ethernet@10100000 {
-		status = "okay";
+		mtd-mac-address = <&factory 0x4>;
 	};
 
 	esw@10110000 {
-		status = "okay";
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
+
 		wlan {
-			label = "airlive:green:wlan";
+			label = "air3gii:green:wlan";
 			gpios = <&gpio0 8 0>;
 		};
+
 		mobile {
-			label = "airlive:green:mobile";
+			label = "air3gii:green:mobile";
 			gpios = <&gpio0 9 1>;
 		};
 	};
@@ -66,14 +88,11 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
+
 		wps {
 			label = "wps";
 			gpios = <&gpio0 7 1>;
 			linux,code = <0x211>;
 		};
 	};
-
-	wmac@10180000 {
-		status = "okay";
-	};
 };