X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Flantiq%2Fdts%2FFRITZ3370.dts;h=2580674ba9d43778f6089d894a0aaf235f66b205;hb=18c64f41c7d84824a81bdcd730e1796d316355d1;hp=c6a593bfeda92aeca660457e5066eae61c427df5;hpb=be8f9ad6f47e90894327ac1658095ac5c591b8ef;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/lantiq/dts/FRITZ3370.dts b/target/linux/lantiq/dts/FRITZ3370.dts
index c6a593bfed..2580674ba9 100644
--- a/target/linux/lantiq/dts/FRITZ3370.dts
+++ b/target/linux/lantiq/dts/FRITZ3370.dts
@@ -1,22 +1,24 @@
 /dts-v1/;
 
-/include/ "vr9.dtsi"
+#include "vr9.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
 	model = "FRITZ3370 - Fritz!Box WLAN 3370";
 
 	chosen {
 		bootargs = "console=ttyLTQ0,115200 ubi.mtd=1,512 root=/dev/mtdblock9";
+	};
 
-		leds {
-			boot = &power_green;
-			failsafe = &power_red;
-			running = &power_green;
+	aliases {
+		led-boot = &power_green;
+		led-failsafe = &power_red;
+		led-running = &power_green;
 
-			dsl = &dsl;
-			internet = &info_green;
-			wifi = &wifi;
-		};
+		led-dsl = &dsl;
+		led-internet = &info_green;
+		led-wifi = &wifi;
 	};
 
 	memory@0 {
@@ -32,31 +34,37 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "kernel";
-					reg = <0x0 0x400000>;
-				};
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				partition@400000 {
-					label = "rootfs_ubi";
-					reg = <0x400000 0x3000000>;
-				};
+					partition@0 {
+						label = "kernel";
+						reg = <0x0 0x400000>;
+					};
 
-				partition@3400000 {
-					label = "vr9_firmware";
-					reg = <0x3400000 0x400000>;
-				};
-				partition@3800000 {
-					label = "reserved";
-					reg = <0x3800000 0x3000000>;
-				};
-				partition@6800000 {
-					label = "config";
-					reg = <0x6800000 0x200000>;
-				};
-				partition@6a00000 {
-					label = "nand-filesystem";
-					reg = <0x6a00000 0x1600000>;
+					partition@400000 {
+						label = "rootfs_ubi";
+						reg = <0x400000 0x3000000>;
+					};
+
+					partition@3400000 {
+						label = "vr9_firmware";
+						reg = <0x3400000 0x400000>;
+					};
+					partition@3800000 {
+						label = "reserved";
+						reg = <0x3800000 0x3000000>;
+					};
+					partition@6800000 {
+						label = "config";
+						reg = <0x6800000 0x200000>;
+					};
+					partition@6a00000 {
+						label = "nand-filesystem";
+						reg = <0x6a00000 0x1600000>;
+					};
 				};
 			};
 		};
@@ -66,10 +74,6 @@
 			pinctrl-0 = <&state_default>;
 
 			state_default: pinmux {
-				spi {
-					lantiq,groups = "spi", "spi_cs4";
-					lantiq,function = "spi";
-				};
 				mdio {
 					lantiq,groups = "mdio";
 					lantiq,function = "mdio";
@@ -92,83 +96,24 @@
 					lantiq,output = <1>;
 				};
 			};
-		};
-
-		eth@E108000 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "lantiq,xrx200-net";
-			reg = <	0xE108000 0x3000 /* switch */
-				0xE10B100 0x70 /* mdio */
-				0xE10B1D8 0x30 /* mii */
-				0xE10B308 0x30 /* pmac */
-			>;
-			interrupt-parent = <&icu0>;
-			interrupts = <73 72>;
-
-			lan: interface@0 {
-				compatible = "lantiq,xrx200-pdi";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0>;
-				mac-address = [ 00 11 22 33 44 55 ];
-				lantiq,switch;
-
-				ethernet@0 {
-					compatible = "lantiq,xrx200-pdi-port";
-					reg = <0>;
-					phy-mode = "rgmii";
-					phy-handle = <&phy0>;
-					gpios = <&gpio 37 0>;
-				};
-				ethernet@1 {
-					compatible = "lantiq,xrx200-pdi-port";
-					reg = <1>;
-					phy-mode = "rgmii";
-					phy-handle = <&phy1>;
-					gpios = <&gpio 44 0>;
-				};
-				ethernet@2 {
-					compatible = "lantiq,xrx200-pdi-port";
-					reg = <2>;
-					phy-mode = "gmii";
-					phy-handle = <&phy11>;
-				};
-				ethernet@3 {
-					compatible = "lantiq,xrx200-pdi-port";
-					reg = <4>;
-					phy-mode = "gmii";
-					phy-handle = <&phy13>;
-				};
-			};
-
-			mdio@0 {
-				#address-cells = <1>;
-				#size-cells = <0>;
-				compatible = "lantiq,xrx200-mdio";
-				phy0: ethernet-phy@0 {
-					reg = <0x0>;
-					compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
-				};
-				phy1: ethernet-phy@1 {
-					reg = <0x1>;
-					compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
-				};
-				phy11: ethernet-phy@11 {
-					reg = <0x11>;
-					compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
+			pins_spi_default: pins_spi_default {
+				spi_in {
+					lantiq,groups = "spi_di";
+					lantiq,function = "spi";
 				};
-				phy13: ethernet-phy@13 {
-					reg = <0x13>;
-					compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
+				spi_out {
+					lantiq,groups = "spi_do", "spi_clk",
+						"spi_cs4";
+					lantiq,function = "spi";
+					lantiq,output = <1>;
 				};
 			};
 		};
 
 		ifxhcd@E101000 {
 			status = "okay";
-			gpios = <&gpio 5 0
-				&gpio 14 0>;
+			gpios = <&gpio 5 GPIO_ACTIVE_HIGH
+				&gpio 14 GPIO_ACTIVE_HIGH>;
 			lantiq,portmask = <0x3>;
 		};
 	};
@@ -193,13 +138,13 @@
 		poll-interval = <100>;
 		power {
 			label = "power";
-			gpios = <&gpio 1 0>;
-			linux,code = <0x100>;
+			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
+			linux,code = <KEY_POWER>;
 		};
 /*		wifi {
 			label = "wifi";
-			gpios = <&gpio 29 0>;
-			linux,code = <0x101>;
+			gpios = <&gpio 29 GPIO_ACTIVE_HIGH>;
+			linux,code = <BTN_1>;
 		};*/
 	};
 
@@ -208,44 +153,47 @@
 
 		power_green: power {
 			label = "fritz3370:green:power";
-			gpios = <&gpio 32 1>;
+			gpios = <&gpio 32 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_red: power2 {
 			label = "fritz3370:red:power";
-			gpios = <&gpio 33 1>;
+			gpios = <&gpio 33 GPIO_ACTIVE_LOW>;
 		};
 		info_red {
 			label = "fritz3370:red:info";
-			gpios = <&gpio 34 1>;
+			gpios = <&gpio 34 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
 			label = "fritz3370:green:wlan";
-			gpios = <&gpio 35 1>;
+			gpios = <&gpio 35 GPIO_ACTIVE_LOW>;
 		};
 		dsl: dsl {
 			label = "fritz3370:green:dsl";
-			gpios = <&gpio 36 1>;
+			gpios = <&gpio 36 GPIO_ACTIVE_LOW>;
 		};
 		lan {
 			label = "fritz3370:green:lan";
-			gpios = <&gpio 38 1>;
+			gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
 		};
 		info_green: info_green {
 			label = "fritz3370:green:info";
-			gpios = <&gpio 47 1>;
+			gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
 
 &spi {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pins_spi_default>;
+
 	status = "ok";
 
-	m25p80@3 {
+	m25p80@4 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <3 0>;
+		reg = <4 0>;
 		spi-max-frequency = <1000000>;
 
 		ath9k_cal: partition@0 {
@@ -267,3 +215,63 @@
 		};
 	};
 };
+
+&eth0 {
+	lan: interface@0 {
+		compatible = "lantiq,xrx200-pdi";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0>;
+		mac-address = [ 00 11 22 33 44 55 ];
+		lantiq,switch;
+
+		ethernet@0 {
+			compatible = "lantiq,xrx200-pdi-port";
+			reg = <0>;
+			phy-mode = "rgmii";
+			phy-handle = <&phy0>;
+			gpios = <&gpio 37 GPIO_ACTIVE_HIGH>;
+		};
+		ethernet@1 {
+			compatible = "lantiq,xrx200-pdi-port";
+			reg = <1>;
+			phy-mode = "rgmii";
+			phy-handle = <&phy1>;
+			gpios = <&gpio 44 GPIO_ACTIVE_HIGH>;
+		};
+		ethernet@2 {
+			compatible = "lantiq,xrx200-pdi-port";
+			reg = <2>;
+			phy-mode = "gmii";
+			phy-handle = <&phy11>;
+		};
+		ethernet@3 {
+			compatible = "lantiq,xrx200-pdi-port";
+			reg = <4>;
+			phy-mode = "gmii";
+			phy-handle = <&phy13>;
+		};
+	};
+
+	mdio@0 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "lantiq,xrx200-mdio";
+		phy0: ethernet-phy@0 {
+			reg = <0x0>;
+			compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
+		};
+		phy1: ethernet-phy@1 {
+			reg = <0x1>;
+			compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
+		};
+		phy11: ethernet-phy@11 {
+			reg = <0x11>;
+			compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
+		};
+		phy13: ethernet-phy@13 {
+			reg = <0x13>;
+			compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
+		};
+	};
+};