ramips: fix D240 mini-PCIe power control GPIOs

In commit b11c51916cb9 ("ramips: Improve Sanlinking D240 config") I made
a mistake with regards GPIO numbering. And in addition to specifying the
wrong GPIO for controling the power of one of the mini-PCIe, I recently
discovered that the power of both slots can be controlled.

This patch specifies the correct GPIO for the left-most mini-PCIe slot
of the D240 (labeled power_mpcie2 since the slot is attached to SIM2),
and adds a GPIO that can be used to control the power of the other
mini-PCIe slot (labeled power_mpcie1).

Signed-off-by: Kristian Evensen <kristian.evensen@gmail.com>
[do not use the gpio active macros for the gpio-export value]
Signed-off-by: Mathias Kresin <dev@kresin.me>

diff --git a/target/linux/ramips/dts/D240.dts b/target/linux/ramips/dts/D240.dts
index 4f3da8d316e4ba6ffd9079efc87d5a4ebf207a76..392e92d466a08c7c6a7026e42054716d60125b4f 100644 (file)
--- a/target/linux/ramips/dts/D240.dts
+++ b/target/linux/ramips/dts/D240.dts
@@ -52,9 +52,16 @@
 
                power_mpcie2 {
                        gpio-export,name = "power_mpcie2";
 
                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 {
        };
 
        gpio-leds {


@@ -94,6 +101,10 @@
        status = "okay";
 };
 
        status = "okay";
 };
 

+&gpio2 {
+       status = "okay";
+};
+

 &gpio3 {
        status = "okay";
 };
 &gpio3 {
        status = "okay";
 };


@@ -157,7 +168,7 @@
 &pinctrl {
        state_default: pinctrl0 {
                default {
 &pinctrl {
        state_default: pinctrl0 {
                default {

-                       ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa";
+                       ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa", "nd_sd";

                        ralink,function = "gpio";
                };
        };
                        ralink,function = "gpio";
                };
        };