imx-drm: add imx6 DT configuration for HDMI

Extracted from another patch by Fabio Estevam, this adds the DT
configuration for HDMI output on the IMX6 SoCs

Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
index 9e8ae118fdd4e6c6c1df48a0b4a66c20e0504ae6..65e54b4529c5c6923af23249bebfcee58cdceb1e 100644 (file)
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -88,3 +88,7 @@
                crtcs = <&ipu1 0>, <&ipu1 1>;
        };
 };
+
+&hdmi {
+       crtcs = <&ipu1 0>, <&ipu1 1>;
+}

diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index f024ef28b34b9373895dbbb913c475eebb33298a..d2467f532de6e3cdb216b0ad45c03ef0fb37a539 100644 (file)
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -159,3 +159,7 @@
                crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>;
        };
 };
+
+&hdmi {
+       crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>;
+};

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index fb28b2ecb1db37a28a9effbd7bea591ace78554a..400bbc624f25e52a588b751992b2dffacb277344 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -1368,6 +1368,16 @@
                                };
                        };
 
+                       hdmi: hdmi@0120000 {
+                               compatible = "fsl,imx6q-hdmi";
+                               reg = <0x00120000 0x9000>;
+                               interrupts = <0 115 0x04>;
+                               gpr = <&gpr>;
+                               clocks = <&clks 123>, <&clks 124>;
+                               clock-names = "iahb", "isfr";
+                               status = "disabled";
+                       };
+
                        dcic1: dcic@020e4000 {
                                reg = <0x020e4000 0x4000>;
                                interrupts = <0 124 0x04>;