Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / iwg20d-q7-common.dtsi

diff --git a/arch/arm/boot/dts/iwg20d-q7-common.dtsi b/arch/arm/boot/dts/iwg20d-q7-common.dtsi
index ebbe1518ef8a6adb401ddc239c861a36ada4790d..63cafd220dba1d04ccdaa92042ea82ede5dad0c6 100644 (file)
--- a/arch/arm/boot/dts/iwg20d-q7-common.dtsi
+++ b/arch/arm/boot/dts/iwg20d-q7-common.dtsi
@@ -57,7 +57,7 @@
 
        lvds-receiver {
                compatible = "ti,ds90cf384a", "lvds-decoder";
-               powerdown-gpios = <&gpio7 25 GPIO_ACTIVE_LOW>;
+               power-supply = <&vcc_3v3_tft1>;
 
                ports {
                        #address-cells = <1>;
@@ -81,6 +81,7 @@
        panel {
                compatible = "edt,etm0700g0dh6";
                backlight = <&lcd_backlight>;
+               power-supply = <&vcc_3v3_tft1>;
 
                port {
                        panel_in: endpoint {
@@ -113,6 +114,17 @@
                };
        };
 
+       vcc_3v3_tft1: regulator-panel {
+               compatible = "regulator-fixed";
+
+               regulator-name = "vcc-3v3-tft1";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               enable-active-high;
+               startup-delay-us = <500>;
+               gpio = <&gpio7 25 GPIO_ACTIVE_HIGH>;
+       };
+
        vcc_sdhi1: regulator-vcc-sdhi1 {
                compatible = "regulator-fixed";
 
@@ -207,6 +219,7 @@
                reg = <0x38>;
                interrupt-parent = <&gpio2>;
                interrupts = <12 IRQ_TYPE_EDGE_FALLING>;
+               vcc-supply = <&vcc_3v3_tft1>;
        };
 };