X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Flantiq%2Fdts%2FBTHOMEHUBV2B.dts;h=961fd9b9299a50680cfe6410cba06b2e0045baab;hb=627a28eb09c0aa3471466850dfde6a063481a4f6;hp=7a0edaeecf0031c197edd1217f83ca5b2ec0039f;hpb=eba84bee4ce518dc509fe51f252c5307dccf3a1c;p=openwrt%2Fstaging%2Fchunkeey.git

diff --git a/target/linux/lantiq/dts/BTHOMEHUBV2B.dts b/target/linux/lantiq/dts/BTHOMEHUBV2B.dts
index 7a0edaeecf..961fd9b929 100644
--- a/target/linux/lantiq/dts/BTHOMEHUBV2B.dts
+++ b/target/linux/lantiq/dts/BTHOMEHUBV2B.dts
@@ -2,11 +2,14 @@
 
 #include "danube.dtsi"
 
+#include <dt-bindings/input/input.h>
+
 / {
-	model = "BTHOMEHUBV2B - BT Home Hub 2B";  /* SoC: Lantiq Danube-S PSB 50712 @ 333MHz V1.3/1.5 */
+	compatible = "bt,homehub-v2b", "lantiq,xway", "lantiq,danube";
+	model = "BT Home Hub 2B";  /* SoC: Lantiq Danube-S PSB 50712 @ 333MHz V1.3/1.5 */
 
 	chosen {
-		bootargs = "console=ttyLTQ0,115200 init=/etc/preinit";
+		bootargs = "console=ttyLTQ0,115200";
 	};
 
 	aliases {
@@ -14,7 +17,7 @@
 		led-failsafe = &power_red;
 		led-running = &power_blue;
 
-		led-internet = &broadband_blue;
+		led-dsl = &broadband_blue;
 		led-wifi = &wireless_blue;
 	};
 
@@ -30,15 +33,7 @@
 	};
 
 	fpi@10000000 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		localbus@0 {
-			#address-cells = <2>;
-			#size-cells = <1>;
-			ranges = <0 0 0x0 0x3ffffff /* addrsel0 */
-				1 0 0x4000000 0x4000010>; /* addsel1 */
-			compatible = "lantiq,localbus", "simple-bus";
-
 			nor-boot@0 {				/* NOR Flash: Spansion S29AL004D 512KB */
 				compatible = "lantiq,nor";	/* "AMD AM29LV400BB" compatible on 3.3.8 */
 				lantiq,cs = <0>;
@@ -80,7 +75,7 @@
 			};
 
 			nand-parts@0 {		  /* NAND Flash: Samsung K9F5608U0D-JIB0 32MB */
-				compatible = "gen_nand", "lantiq,nand-xway";
+				compatible = "lantiq,nand-xway";
 				lantiq,cs = <1>;
 				bank-width = <2>;
 				reg = <1 0x0 0x2000000 >;
@@ -110,34 +105,13 @@
 					};
 				};
 			};
-
-
-			ath9k_eep {
-				compatible = "ath9k,eeprom";
-				ath,eep-flash = <&ath9k_cal 0x0000>;
-				ath,mac-increment = <1>;
-				ath,pci-slot = <14>;
-				ath,eep-endian;
-			};
 		};
 
 		gpio: pinmux@E100B10 {
-			compatible = "lantiq,pinctrl-xway";
 			pinctrl-names = "default";
 			pinctrl-0 = <&state_default>;
 
-			#gpio-cells = <2>;
-			gpio-controller;
-			reg = <0xE100B10 0xA0>;
-
 			state_default: pinmux {
-				stp {
-					lantiq,groups = "stp";
-					lantiq,function = "stp";
-					lantiq,output = <1>;
-					lantiq,open-drain = <0>;
-					lantiq,pull = <0>;
-				};
 				nand_out {
 					lantiq,groups = "nand cle", "nand ale";
 					lantiq,function = "ebu";
@@ -186,38 +160,16 @@
 		};
 
 		etop@E180000 {
-			compatible = "lantiq,etop-xway";
-			reg = <0xE180000 0x40000>;
-			interrupt-parent = <&icu0>;
-			interrupts = <73 78>;
 			phy-mode = "rmii";
-			mac-address = [ 00 11 22 33 44 55 ];
 		};
 
 		ifxhcd@E101000 {
 			status = "okay";
 		};
 
-		stp0: stp@E100BB0 {
-			status = "okay";
-			#gpio-cells = <2>;
-			compatible = "lantiq,gpio-stp-xway";
-			gpio-controller;
-			reg = <0xE100BB0 0x40>;
-
-			lantiq,shadow = <0xfff>;
-			lantiq,groups = <0x3>;
-		};
-
-		pci@E105400 {
+		gpios: stp@E100BB0 {
 			status = "okay";
-			lantiq,bus-clock = <33333333>;
-			interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-			interrupt-map = <0x7000 0 0 1 &icu0 30 1>;
-			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-			req-mask = <0x1>;		 /* GNT1 */
 		};
-
 	};
 
 	gpio-keys-polled {
@@ -234,7 +186,7 @@
 		findhandset {
 			label = "findhandset";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
-			linux,code = <BTN_1>;
+			linux,code = <KEY_PHONE>;
 		};
 		wps {
 			label = "wps";
@@ -248,53 +200,63 @@
 
 		upgrading-orange {
 			label = "bthomehubv2b:orange:upgrading";
-			gpios = <&stp0 5 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpios 5 GPIO_ACTIVE_HIGH>;
 		};
 
 		phone-orange {
 			label = "bthomehubv2b:orange:phone";
-			gpios = <&stp0 6 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpios 6 GPIO_ACTIVE_HIGH>;
 		};
 		phone-blue {
 			label = "bthomehubv2b:blue:phone";
-			gpios = <&stp0 7 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpios 7 GPIO_ACTIVE_HIGH>;
 		};
 
 		wireless-orange {
 			label = "bthomehubv2b:orange:wireless";
-			gpios = <&stp0 8 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpios 8 GPIO_ACTIVE_HIGH>;
 		};
 		wireless_blue: wireless-blue {
 			label = "bthomehubv2b:blue:wireless";
-			gpios = <&stp0 9 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpios 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		broadband-red {
 			label = "bthomehubv2b:red:broadband";
-			gpios = <&stp0 10 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpios 10 GPIO_ACTIVE_HIGH>;
 		};
 		broadband-orange {
 			label = "bthomehubv2b:orange:broadband";
-			gpios = <&stp0 11 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpios 11 GPIO_ACTIVE_HIGH>;
 		};
 		broadband_blue: broadband-blue {
 			label = "bthomehubv2b:blue:broadband";
-			gpios = <&stp0 12 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpios 12 GPIO_ACTIVE_HIGH>;
 		};
 
 		power_red: power-red {
 			label = "bthomehubv2b:red:power";
-			gpios = <&stp0 13 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpios 13 GPIO_ACTIVE_HIGH>;
 		};
 		power_orange: power-orange {
 			label = "bthomehubv2b:orange:power";
-			gpios = <&stp0 14 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpios 14 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		power_blue: power-blue {
 			label = "bthomehubv2b:blue:power";
-			gpios = <&stp0 15 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpios 15 GPIO_ACTIVE_HIGH>;
 		};
 	};
 };
 
+&pci0 {
+	status = "okay";
+	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+
+	wifi@168c,0027 {
+		compatible = "pci168c,0027";
+		reg = <0x7000 0 0 0 0>;
+		qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
+	};
+};