X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fath79%2Fdts%2Fqca9531_glinet_gl-ar300m.dtsi;h=d0b0d88c484bf21a90efb02779a92b93a242c9f3;hb=3a4b751110b32380cf827f14a203190cfbc2e40f;hp=ceb2bfa0ffe2d2ded4b947e9d3cdbf2ee69e4469;hpb=fefa34def84561688e6af2feeec2dbb390ba4486;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
index ceb2bfa0ff..d0b0d88c48 100644
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
@@ -1,37 +1,36 @@
-/dts-v1/;
+#include "qca953x.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#include "qca953x.dtsi"
-
 / {
 	aliases {
 		led-boot = &led_status;
 		led-failsafe = &led_status;
 		led-running = &led_status;
 		led-upgrade = &led_status;
+		label-mac-device = &eth0;
 	};
 
 	keys {
-		compatible = "gpio-keys-polled";
-		poll-interval = <20>;
+		compatible = "gpio-keys";
+
 		pinctrl-names = "default";
 		pinctrl-0 = <&jtag_disable_pins>;
 
-		button0 {
+		reset {
 			label = "reset";
 			linux,code = <KEY_RESTART>;
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
-		button1 {
+		right {
 			label = "button right";
 			linux,code = <BTN_0>;
 			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
 		};
 
-		button3 {
+		left {
 			label = "button left";
 			linux,code = <BTN_1>;
 			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
@@ -41,24 +40,31 @@
 	leds {
 		compatible = "gpio-leds";
 
-		// Colors from non-Lite versions
+		// Colors for non-Lite versions
 
 		led_status: status {
-			label = "gl-ar300m:green:status";
+			label = "green:status";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
-		led_lan: lan {
-			label = "gl-ar300m:green:lan";
+		lan {
+			label = "green:lan";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		led_wlan: wlan {
-			label = "gl-ar300m:red:wlan";
+			label = "red:wlan";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 	};
+
+	i2c: i2c {
+		compatible = "i2c-gpio";
+
+		sda-gpios = <&gpio 17 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
+		scl-gpios = <&gpio 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
+	};
 };
 
 &pcie0 {
@@ -67,10 +73,9 @@
 
 &spi {
 	status = "okay";
-	num-cs = <0>;
 
 	flash@0 {
-		compatible = "winbond,w25q128", "jedec,spi-nor";
+		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <25000000>;
 
@@ -85,27 +90,45 @@
 				read-only;
 			};
 
-			partition@1 {
+			partition@40000 {
 				label = "u-boot-env";
 				reg = <0x040000 0x010000>;
 			};
 
-			partition@2 {
-				compatible = "denx,uimage";
-				label = "firmware";
+			nor_firmware: partition@50000 {
+				label = "nor_firmware";
 				reg = <0x050000 0xfa0000>;
 			};
 
-			art: partition@3 {
+			art: partition@ff0000 {
 				label = "art";
 				reg = <0xff0000 0x010000>;
+				read-only;
 			};
 		};
 	};
-};
 
-&uart {
-	status = "okay";
+	nand_flash: flash@1 {
+		compatible = "spi-nand";
+		reg = <1>;
+		spi-max-frequency = <25000000>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			nand_kernel: partition@0 {
+				label = "nand_kernel";
+				reg = <0x000000 0x400000>;
+			};
+
+			nand_ubi: partition@400000 {
+				label = "nand_ubi";
+				reg = <0x400000 0x7c00000>;
+			};
+		};
+	};
 };
 
 &usb0 {
@@ -120,8 +143,10 @@
 
 &eth0 {
 	status = "okay";
-	mtd-mac-address = <&art 0x0>;
+
 	phy-handle = <&swphy4>;
+
+	mtd-mac-address = <&art 0x0>;
 };
 
 &eth1 {
@@ -132,5 +157,4 @@
 &wmac {
 	status = "okay";
 	mtd-cal-data = <&art 0x1000>;
-	mtd-mac-address = <&art 0x1002>;
 };