X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2FD240.dts;h=2110959ee8ae88740ea0cb27d6e4fa77537c18a9;hb=402138d12dca1a24d2837145c8d31c9d35769b9d;hp=392e92d466a08c7c6a7026e42054716d60125b4f;hpb=133815ad8f5641d2728fe3925a6bab1663fd7399;p=openwrt%2Fstaging%2Fwigyori.git

diff --git a/target/linux/ramips/dts/D240.dts b/target/linux/ramips/dts/D240.dts
index 392e92d466..2110959ee8 100644
--- a/target/linux/ramips/dts/D240.dts
+++ b/target/linux/ramips/dts/D240.dts
@@ -42,6 +42,13 @@
 	compatible = "sanlinking,d240", "ralink,mt7620a-soc";
 	model = "Sanlinking Technologies D240";
 
+	aliases {
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
+	};
+
 	chosen {
 		bootargs = "console=ttyS0,115200";
 	};
@@ -61,13 +68,12 @@
 			gpio-export,output = <1>;
 			gpios = <&gpio2 6 GPIO_ACTIVE_HIGH>;
 		};
-
 	};
 
-	gpio-leds {
+	leds {
 		compatible = "gpio-leds";
 
-		power {
+		led_power: power {
 			label = "d240:blue:power";
 			gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
 		};
@@ -75,6 +81,8 @@
 		usb {
 			label = "d240:blue:usb";
 			gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		air {
@@ -83,10 +91,8 @@
 		};
 	};
 
-	gpio-keys-polled {
+	keys {
 		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
@@ -113,39 +119,46 @@
 	status = "okay";
 
 	en25q128@0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition@0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition@30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition@40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition@50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition@30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition@40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition@50000 {
+				compatible = "denx,uimage";
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
 
 &sdhci {
 	status = "okay";
+	/* the pins function is already set during pinmux driver load */
+	/delete-property/ pinctrl-0;
 };
 
 &ehci {
@@ -168,9 +181,23 @@
 &pinctrl {
 	state_default: pinctrl0 {
 		default {
-			ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa", "nd_sd";
+			ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa";
 			ralink,function = "gpio";
 		};
+
+		/*
+		 * The sd function of the nd_sd group configures two of the
+		 * groups pins as gpios. The pins are used as PCIe reset/power.
+		 * Due to the driver load order, the pins are configured way to
+		 * late if triggered by the sd-card driver.
+		 * To not introduce another kind of driver load order
+		 * dependency and configure the pins as early as possible,
+		 * means during pinmux driver load.
+		 */
+		gpio_sd {
+			ralink,group = "nd_sd";
+			ralink,function = "sd";
+		};
 	};
 };