X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Flantiq%2Fdts%2FEASY80920.dtsi;h=56efe7150f932be91daa209c6084b653eca17990;hb=fb97998e80afd1357854db24d784f521a451a204;hp=4aec4aabd332ac4005fadf41a7fda1598e891cc6;hpb=d5a2bd8e6188361086fbfa68756ff99e7d1721d1;p=openwrt.git

diff --git a/target/linux/lantiq/dts/EASY80920.dtsi b/target/linux/lantiq/dts/EASY80920.dtsi
index 4aec4aabd3..56efe7150f 100644
--- a/target/linux/lantiq/dts/EASY80920.dtsi
+++ b/target/linux/lantiq/dts/EASY80920.dtsi
@@ -3,6 +3,15 @@
 / {
 	chosen {
 		bootargs = "console=ttyLTQ0,115200 init=/etc/preinit";
+
+		leds {
+			boot = &power;
+			failsafe = &power;
+			running = &power;
+
+			usb = &usb1;
+			usb2 = &usb2;
+		};
 	};
 
 	memory@0 {
@@ -23,53 +32,6 @@
 
 		};
 
-		spi@E100800 {
-			compatible = "lantiq,spi-xway-broken";
-			reg = <0xE100800 0x100>;
-			interrupt-parent = <&icu0>;
-			interrupts = <22 23 24>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			m25p80@0 {
-				#address-cells = <1>;
-				#size-cells = <1>;
-				compatible = "s25fl129p0";
-				reg = <0 0>;
-				linux,modalias = "m25p80", "mx25l3205d";
-				spi-max-frequency = <1000000>;
-
-				partition@0 {
-					reg = <0x0 0x20000>;
-					label = "SPI (RO) U-Boot Image";
-					read-only;
-				};
-
-				partition@20000 {
-					reg = <0x20000 0x10000>;
-					label = "ENV_MAC";
-					read-only;
-				};
-
-				partition@30000 {
-					reg = <0x30000 0x10000>;
-					label = "DPF";
-					read-only;
-				};
-
-				partition@40000 {
-					reg = <0x40000 0x10000>;
-					label = "NVRAM";
-					read-only;
-				};
-
-				partition@500000 {
-					reg = <0x50000 0x003a0000>;
-					label = "kernel";
-				};
-			};
-		};
-
 		gpio: pinmux@E100B10 {
 			compatible = "lantiq,pinctrl-xr9";
 			pinctrl-names = "default";
@@ -205,27 +167,22 @@
 				phy0: ethernet-phy@0 {
 					reg = <0x0>;
 					compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
-					lantiq,c45-reg-init = <1 0 0 0>;
 				};
 				phy1: ethernet-phy@1 {
 					reg = <0x1>;
 					compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
-					lantiq,c45-reg-init = <1 0 0 0>;
 				};
 				phy5: ethernet-phy@5 {
 					reg = <0x5>;
 					compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
-					lantiq,c45-reg-init = <1 0 0 0>;
 				};
 				phy11: ethernet-phy@11 {
 					reg = <0x11>;
 					compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
-					lantiq,c45-reg-init = <1 0 0 0>;
 				};
 				phy13: ethernet-phy@13 {
 					reg = <0x13>;
 					compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
-					lantiq,c45-reg-init = <1 0 0 0>;
 				};
 			};
 		};
@@ -299,42 +256,83 @@
 	gpio-leds {
 		compatible = "gpio-leds";
 
-		power {
-			label = "power";
+		power: power {
+			label = "easy80920:green:power";
 			gpios = <&stp 9 0>;
-			default-state = "on";
+			default-state = "keep";
 		};
 		warning {
-			label = "warning";
+			label = "easy80920:green:warning";
 			gpios = <&stp 22 0>;
 		};
 		fxs1 {
-			label = "fxs1";
+			label = "easy80920:green:fxs1";
 			gpios = <&stp 21 0>;
 		};
 		fxs2 {
-			label = "fxs2";
+			label = "easy80920:green:fxs2";
 			gpios = <&stp 20 0>;
 		};
 		fxo {
-			label = "fxo";
+			label = "easy80920:green:fxo";
 			gpios = <&stp 19 0>;
 		};
-		usb1 {
-			label = "usb1";
+		usb1: usb1 {
+			label = "easy80920:green:usb1";
 			gpios = <&stp 18 0>;
 		};
-		usb2 {
-			label = "usb2";
+		usb2: usb2 {
+			label = "easy80920:green:usb2";
 			gpios = <&stp 15 0>;
 		};
 		sd {
-			label = "sd";
+			label = "easy80920:green:sd";
 			gpios = <&stp 14 0>;
 		};
 		wps {
-			label = "wps";
+			label = "easy80920:green:wps";
 			gpios = <&stp 12 0>;
 		};
 	};
 };
+
+&spi {
+	status = "ok";
+
+	m25p80@3 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		reg = <3 0>;
+		spi-max-frequency = <1000000>;
+
+		partition@0 {
+			reg = <0x0 0x20000>;
+			label = "SPI (RO) U-Boot Image";
+			read-only;
+		};
+
+		partition@20000 {
+			reg = <0x20000 0x10000>;
+			label = "ENV_MAC";
+			read-only;
+		};
+
+		partition@30000 {
+			reg = <0x30000 0x10000>;
+			label = "DPF";
+			read-only;
+		};
+
+		partition@40000 {
+			reg = <0x40000 0x10000>;
+			label = "NVRAM";
+			read-only;
+		};
+
+		partition@500000 {
+			reg = <0x50000 0x003a0000>;
+			label = "kernel";
+		};
+	};
+};