Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-microblaze.git] / arch / arm / boot / dts / imx6q-gk802.dts

diff --git a/arch/arm/boot/dts/imx6q-gk802.dts b/arch/arm/boot/dts/imx6q-gk802.dts
index 4a9b4dc..703539c 100644 (file)
--- a/arch/arm/boot/dts/imx6q-gk802.dts
+++ b/arch/arm/boot/dts/imx6q-gk802.dts
@@ -14,7 +14,7 @@
        compatible = "zealz,imx6q-gk802", "fsl,imx6q";
 
        chosen {
-               linux,stdout-path = &uart4;
+               stdout-path = &uart4;
        };
 
        memory {
@@ -48,6 +48,11 @@
        };
 };
 
+&hdmi {
+       ddc-i2c-bus = <&i2c3>;
+       status = "okay";
+};
+
 /* Internal I2C */
 &i2c2 {
        pinctrl-names = "default";