ramips: specify "firmware" partition format

[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 4f3da8d316e4ba6ffd9079efc87d5a4ebf207a76..ade2dd16fc444aaf59099b9f0363ae718095d09a 100644 (file)
--- 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";
        };
@@ -52,15 +59,21 @@
 
                power_mpcie2 {
                        gpio-export,name = "power_mpcie2";
-                       gpio-export,output = <GPIO_ACTIVE_LOW>;
-                       gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;
+                       gpio-export,output = <1>;
+                       gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>;
+               };
+
+               power_mpcie1 {
+                       gpio-export,name = "power_mpcie1";
+                       gpio-export,output = <1>;
+                       gpios = <&gpio2 6 GPIO_ACTIVE_HIGH>;
                };
        };
 
        gpio-leds {
                compatible = "gpio-leds";
 
-               power {
+               led_power: power {
                        label = "d240:blue:power";
                        gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
                };
@@ -68,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 {
@@ -78,8 +93,6 @@
 
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
 
                reset {
@@ -94,6 +107,10 @@
        status = "okay";
 };
 
+&gpio2 {
+       status = "okay";
+};
+
 &gpio3 {
        status = "okay";
 };
@@ -102,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 {
@@ -160,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";
+               };
        };
 };