Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / rk3288-evb-rk808.dts

diff --git a/arch/arm/boot/dts/rk3288-evb-rk808.dts b/arch/arm/boot/dts/rk3288-evb-rk808.dts
index 18eb6cb495f45449577a872c156ccbfc14f61174..79838d81ee17836278f2c83d92a245c00379d518 100644 (file)
--- a/arch/arm/boot/dts/rk3288-evb-rk808.dts
+++ b/arch/arm/boot/dts/rk3288-evb-rk808.dts
@@ -50,6 +50,22 @@
                clock-output-names = "ext_gmac";
                #clock-cells = <0>;
        };
+
+       sdio_pwrseq: sdio-pwrseq {
+               compatible = "mmc-pwrseq-simple";
+               clocks = <&rk808 1>;
+               clock-names = "ext_clock";
+               pinctrl-names = "default";
+               pinctrl-0 = <&wifi_enable_h>;
+
+               /*
+                * On the module itself this is one of these (depending
+                * on the actual card populated):
+                * - SDIO_RESET_L_WL_REG_ON
+                * - PDN (power down when low)
+                */
+               reset-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>;
+       };
 };
 
 &cpu0 {
@@ -102,6 +118,7 @@
                                regulator-min-microvolt = <850000>;
                                regulator-max-microvolt = <1250000>;
                                regulator-name = "vdd_gpu";
+                               regulator-ramp-delay = <6000>;
                                regulator-state-mem {
                                        regulator-on-in-suspend;
                                        regulator-suspend-microvolt = <1000000>;
@@ -260,3 +277,11 @@
        rx_delay = <0x10>;
        status = "ok";
 };
+
+&lvds_panel {
+       power-supply = <&vcc_lcd>;
+};
+
+&panel {
+       power-supply = <&vcc_lcd>;
+};