MLK-13182-1: ARM: dts: imx: enable hdmi support for imx6q pop arm2

Enable hdmi display support for imx6q pop arm2 validation
target board.

Signed-off-by: Adrian Alonso <adrian.alonso@nxp.com>

diff --git a/arch/arm/boot/dts/imx6q-pop-arm2.dts b/arch/arm/boot/dts/imx6q-pop-arm2.dts
index 3be9076..a18d52b 100644 (file)
--- a/arch/arm/boot/dts/imx6q-pop-arm2.dts
+++ b/arch/arm/boot/dts/imx6q-pop-arm2.dts
@@ -16,11 +16,32 @@
        model = "Freescale i.MX6 Quad Armadillo2 Board";
        compatible = "fsl,imx6q-pop-arm2", "fsl,imx6q";
 
+       aliases {
+               mxcfb0 = &mxcfb1;
+       };
+
        memory {
                linux,usable-memory = <0x10000000 0x20000000>,
                        <0x80000000 0x20000000>;
        };
 
+       mxcfb1: fb@0 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "hdmi";
+               interface_pix_fmt = "RGB24";
+               mode_str = "1920x1080M@60";
+               default_bpp = <24>;
+               int_clk = <0>;
+               late_init = <0>;
+               status = "okay";
+       };
+
+       sound-hdmi {
+               compatible = "fsl,imx6q-audio-hdmi", "fsl,imx-audio-hdmi";
+               model = "imx-audio-hdmi";
+               hdmi-controller = <&hdmi_audio>;
+       };
+
        regulators {
                compatible = "simple-bus";
                #address-cells = <1>;
@@ -51,6 +72,12 @@
        fsl,max_ddr_freq = <400000000>;
 };
 
+&dcic1 {
+       dcic_id = <0>;
+       dcic_mux = "dcic-hdmi";
+       status = "okay";
+};
+
 &fec {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_enet>;
@@ -58,6 +85,40 @@
        status = "okay";
 };
 
+&hdmi_audio {
+       status = "okay";
+};
+
+&hdmi_cec {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_hdmi_cec>;
+       status = "okay";
+};
+
+&hdmi_core {
+       ipu_id = <0>;
+       disp_id = <1>;
+       status = "okay";
+};
+
+&hdmi_video {
+       fsl,phy_reg_vlev = <0x0294>;
+       fsl,phy_reg_cksymtx = <0x800d>;
+       status = "okay";
+};
+
+&i2c2 {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c2>;
+       status = "okay";
+
+       hdmi_edid: edid@50 {
+               compatible = "fsl,imx6-hdmi-i2c";
+               reg = <0x50>;
+       };
+};
+
 &iomuxc {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_hog>;
@@ -89,6 +150,26 @@
                        >;
                };
 
+               pinctrl_hdmi_cec: hdmicecgrp {
+                       fsl,pins = <
+                               MX6QDL_PAD_EIM_A25__HDMI_TX_CEC_LINE 0x108b0
+                       >;
+               };
+
+               pinctrl_hdmi_hdcp: hdmihdcpgrp {
+                       fsl,pins = <
+                               MX6QDL_PAD_KEY_COL3__HDMI_TX_DDC_SCL 0x4001b8b1
+                               MX6QDL_PAD_KEY_ROW3__HDMI_TX_DDC_SDA 0x4001b8b1
+                       >;
+               };
+
+               pinctrl_i2c2: i2c2grp {
+                       fsl,pins = <
+                               MX6QDL_PAD_KEY_COL3__I2C2_SCL           0x4001b8b1
+                               MX6QDL_PAD_KEY_ROW3__I2C2_SDA           0x4001b8b1
+                       >;
+               };
+
                pinctrl_uart2: uart2grp {
                        fsl,pins = <
                                MX6QDL_PAD_EIM_D26__UART2_RX_DATA       0x1b0b1