Merge tag 'drm-for-v4.15-part2-fixes' of git://people.freedesktop.org/~airlied/linux

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx6qdl-sabresd.dtsi

diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index b72b6fa475801df93fc1e0413eb4b6ea3179fb07..0a50705b9c1897101a1732cc4bc703ff907b5443 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -67,7 +67,6 @@
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
                        gpio = <&gpio3 19 0>;
-                       regulator-always-on;
                        enable-active-high;
                };
        };
@@ -214,6 +213,8 @@
 };
 
 &hdmi {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_hdmi_cec>;
        ddc-i2c-bus = <&i2c2>;
        status = "okay";
 };
@@ -304,7 +305,7 @@
                };
        };
 
-       pmic: pfuze100@08 {
+       pmic: pfuze100@8 {
                compatible = "fsl,pfuze100";
                reg = <0x08>;
 
@@ -411,7 +412,7 @@
        pinctrl-0 = <&pinctrl_i2c3>;
        status = "okay";
 
-       egalax_ts@04 {
+       egalax_ts@4 {
                compatible = "eeti,egalax_ts";
                reg = <0x04>;
                interrupt-parent = <&gpio6>;
@@ -486,6 +487,12 @@
                        >;
                };
 
+               pinctrl_hdmi_cec: hdmicecgrp {
+                       fsl,pins = <
+                               MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE   0x1f8b0
+                       >;
+               };
+
                pinctrl_i2c1: i2c1grp {
                        fsl,pins = <
                                MX6QDL_PAD_CSI0_DAT8__I2C1_SDA          0x4001b8b1
@@ -651,6 +658,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_pcie>;
        reset-gpio = <&gpio7 12 GPIO_ACTIVE_LOW>;
+       vpcie-supply = <&reg_pcie>;
        status = "okay";
 };