X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fath79%2Fdts%2Far7241_ubnt_unifi.dts;h=5f12fd581b767b67841e04dfa3669044c70a7155;hb=e10dd48360721a13d9196f9c2c7d2b901dfcc455;hp=923b3df77053a29ad07da954fd4340b80cb30f93;hpb=14cb05909a8dc6e42008697b4fe47b8fa00789d8;p=openwrt%2Fstaging%2Fdedeckeh.git

diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
index 923b3df770..5f12fd581b 100644
--- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
@@ -11,12 +11,11 @@
 	model = "Ubiquiti UniFi AP";
 
 	aliases {
-		led-status = &dome_green;
-	};
-
-	memory@0 {
-		device_type = "memory";
-		reg = <0x0 0x4000000>;
+		led-boot = &led_dome_green;
+		led-failsafe = &led_dome_green;
+		led-running = &led_dome_green;
+		led-upgrade = &led_dome_green;
+		label-mac-device = &wifi;
 	};
 
 	extosc: ref {
@@ -26,11 +25,8 @@
 	};
 
 	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
+		compatible = "gpio-keys";
 
-		poll-interval = <20>;
 		reset {
 			linux,code = <KEY_RESTART>;
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
@@ -40,12 +36,13 @@
 
 	leds {
 		compatible = "gpio-leds";
-		dome_green: dome-green {
+
+		led_dome_green: dome_green {
 			label = "ubnt:green:dome";
 			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
 		};
 
-		dome-orange {
+		dome_orange {
 			label = "ubnt:orange:dome";
 			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
 		};
@@ -62,12 +59,11 @@
 
 &spi {
 	status = "okay";
+
 	num-cs = <1>;
 
 	flash@0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "mx25l6405d";
+		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <25000000>;
 
@@ -82,29 +78,30 @@
 				read-only;
 			};
 
-			partition@1 {
+			partition@40000 {
 				label = "u-boot-env";
 				reg = <0x040000 0x010000>;
 			};
 
-			partition@2 {
+			partition@50000 {
+				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x050000 0x750000>;
 			};
 
-			partition@3 {
+			partition@7a0000 {
 				label = "board_config";
 				reg = <0x7a0000 0x010000>;
 				read-only;
 			};
 
-			partition@4 {
+			partition@7b0000 {
 				label = "cfg";
 				reg = <0x7b0000 0x040000>;
 				read-only;
 			};
 
-			art: partition@5 {
+			art: partition@7f0000 {
 				label = "art";
 				reg = <0x7f0000 0x010000>;
 				read-only;
@@ -116,30 +113,20 @@
 &pcie {
 	status = "okay";
 
-	ath9k@0 {
+	wifi: wifi@0,0 {
 		reg = <0x0000 0 0 0 0>;
 		qca,no-eeprom;
 	};
 };
 
-&mdio0 {
-	status = "okay";
-
-	phy4: ethernet-phy@4 {
-		reg = <4>;
-		phy-mode = "mii";
-	};
-};
-
 &eth0 {
 	status = "okay";
 
 	mtd-mac-address = <&art 0x0>;
-	phy-handle = <&phy4>;
 };
 
 &eth1 {
 	status = "okay";
 
-	compatible = "syscon";
+	compatible = "syscon", "simple-mfd";
 };