X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2FAIR3GII.dts;h=2b08895b496bc098738be0e715e37f69d11cbf6b;hb=51bca43f39f0d53ef4b5facd5484347655255b12;hp=05717b4aac8fdb2aa572554f09a6386124128686;hpb=770b28f146f7bf9495013a57504258d7f92263c4;p=oweals%2Fopenwrt.git

diff --git a/target/linux/ramips/dts/AIR3GII.dts b/target/linux/ramips/dts/AIR3GII.dts
index 05717b4aac..2b08895b49 100644
--- a/target/linux/ramips/dts/AIR3GII.dts
+++ b/target/linux/ramips/dts/AIR3GII.dts
@@ -1,62 +1,21 @@
 /dts-v1/;
 
-/include/ "rt5350.dtsi"
+#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,pinmmux = "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>;
-				compatible = "en25q32b";
-				reg = <0 0>;
-				linux,modalias = "m25p80", "en25q32b";
-				spi-max-frequency = <10000000>;
-			};
-		};
-	};
-
-	ethernet@10100000 {
-		status = "okay";
-	};
-
-	esw@10110000 {
-		status = "okay";
-		ralink,portmap = <0x2f>;
-	};
-
 	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 +25,72 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
+
 		wps {
 			label = "wps";
 			gpios = <&gpio0 7 1>;
 			linux,code = <0x211>;
 		};
 	};
+};
+
+&gpio0 {
+	status = "okay";
+};
 
-	wmac@10180000 {
-		status = "okay";
+&spi0 {
+	status = "okay";
+
+	m25p80@0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		reg = <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 {
+	mtd-mac-address = <&factory 0x4>;
+};
+
+&esw {
+	mediatek,portmap = <0x2f>;
+};
+
+&wmac {
+	ralink,mtd-eeprom = <&factory 0>;
+};