ramips: Derive DTS name from device name in Makefile

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / D240.dts

diff --git a/target/linux/ramips/dts/D240.dts b/target/linux/ramips/dts/D240.dts
index 613a20f99530add0d5d8c9ac46ec1001ea19427c..2110959ee8ae88740ea0cb27d6e4fa77537c18a9 100644 (file)
--- a/target/linux/ramips/dts/D240.dts
+++ b/target/linux/ramips/dts/D240.dts
@@ -43,7 +43,10 @@
        model = "Sanlinking Technologies D240";
 
        aliases {
-               led-status = &led_power;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
        };
 
        chosen {
@@ -67,7 +70,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                led_power: power {
@@ -78,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 {
@@ -86,7 +91,7 @@
                };
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <20>;
 
@@ -142,6 +147,7 @@
                        };
 
                        partition@50000 {
+                               compatible = "denx,uimage";
                                label = "firmware";
                                reg = <0x50000 0xfb0000>;
                        };
@@ -151,6 +157,8 @@
 
 &sdhci {
        status = "okay";
+       /* the pins function is already set during pinmux driver load */
+       /delete-property/ pinctrl-0;
 };
 
 &ehci {
@@ -176,6 +184,20 @@
                        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";
+               };
        };
 };