Merge tag 'ceph-for-4.16-rc1' of git://github.com/ceph/ceph-client

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

diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
index 4fa2fac3877b5a5685d85654d44476a933c0e72b..82d6ccb46982db483b8fd522a8cd42af75c52475 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
@@ -235,6 +235,9 @@
 };
 
 &hdmi {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_hdmi_cec>;
+       ddc-i2c-bus = <&i2c2>;
        status = "okay";
 };
 
@@ -453,6 +456,12 @@
                        >;
                };
 
+               pinctrl_hdmi_cec: hdmicecgrp {
+                       fsl,pins = <
+                               MX6QDL_PAD_EIM_A25__HDMI_TX_CEC_LINE    0x1f8b0
+                       >;
+               };
+
                pinctrl_i2c2: i2c2grp {
                        fsl,pins = <
                                MX6QDL_PAD_EIM_EB2__I2C2_SCL    0x4001b8b1