ENGR00273848-03 MX6 HDMI: Add HDMI setting in dts

Add HDMI core and video driver dts
for MX6Q/DL SabreSD board.

Signed-off-by: Sandor Yu <R01008@freescale.com>

diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
index 5db92d2316ea00010d9d1523fe77d69a7e56b5fe..507cd6c24f0679ce7690eca9fffdd89fd57c3d4c 100644 (file)
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -56,6 +56,31 @@
                        clocks = <&clks 142>;
                };
 
+               hdmi_core: hdmi_core@00120000 {
+                       compatible = "fsl,imx6dl-hdmi-core";
+                       ipu_id = <0>;
+                       disp_id = <0>;
+                       reg = <0x00120000 0x9000>;
+                       reg-names = "hdmi_regs";
+                       clocks = <&clks 124>, <&clks 123>;
+                       clock-names = "hdmi_isfr", "hdmi_iahb";
+                       status = "okay";
+               };
+
+               hdmi_video: hdmi_video@00120000 {
+                       compatible = "fsl,imx6dl-hdmi-video";
+                       reg = <0x020E0000 0x1000>;
+                       reg-names = "hdmi_gpr";
+                       interrupts = <0 115 0x04>;
+                       clocks = <&clks 124>, <&clks 123>;
+                       clock-names = "hdmi_isfr", "hdmi_iahb";
+               };
+
+               hdmi_cec: hdmi_cec@00120000 {
+                       compatible = "fsl,imx6dl-hdmi-cec";
+                       interrupts = <0 116 0x04>;
+               };
+
                aips1: aips-bus@02000000 {
                        iomuxc: iomuxc@020e0000 {
                                compatible = "fsl,imx6dl-iomuxc";

diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index fcc1940b8218a748c9123f3900cc3c6f8a822366..2d18bf3b4123dd97ba5b468987a7fe69ee76e6f3 100644 (file)
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -89,6 +89,31 @@
                        clocks = <&clks 142>;
                };
 
+               hdmi_core: hdmi_core@00120000 {
+                       compatible = "fsl,imx6q-hdmi-core";
+                       ipu_id = <0>;
+                       disp_id = <0>;
+                       reg = <0x00120000 0x9000>;
+                       reg-names = "hdmi_regs";
+                       clocks = <&clks 124>, <&clks 123>;
+                       clock-names = "hdmi_isfr", "hdmi_iahb";
+                       status = "okay";
+               };
+
+               hdmi_video: hdmi_video@00120000 {
+                       compatible = "fsl,imx6q-hdmi-video";
+                       reg = <0x020E0000 0x1000>;
+                       reg-names = "hdmi_gpr";
+                       interrupts = <0 115 0x04>;
+                       clocks = <&clks 124>, <&clks 123>;
+                       clock-names = "hdmi_isfr", "hdmi_iahb";
+               };
+
+               hdmi_cec: hdmi_cec@00120000 {
+                       compatible = "fsl,imx6q-hdmi-cec";
+                       interrupts = <0 116 0x04>;
+               };
+
                aips-bus@02000000 { /* AIPS1 */
                        spba-bus@02000000 {
                                ecspi5: ecspi@02018000 {

diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index 267ebe69e84bde3eb70370e596163ac7a12abdd9..09f9bede8e9096e65cf3a78faab9636bdb28fb27 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -197,6 +197,18 @@
        };
 };
 
+&i2c2 {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c2_2>;
+       status = "okay";
+
+       hdmi: edid@50 {
+               compatible = "fsl,imx6-hdmi-i2c";
+               reg = <0x50>;
+       };
+};
+
 &iomuxc {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_hog>;
@@ -270,3 +282,17 @@
        wp-gpios = <&gpio2 1 0>;
        status = "okay";
 };
+
+&hdmi_video {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_hdmi_hdcp_1>;
+       phy_reg_vlev = <0x0294>;
+       phy_reg_cksymtx = <0x800d>;
+       status = "okay";
+};
+
+&hdmi_cec {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_hdmi_cec_2>;
+       status = "okay";
+};