aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-10-16 05:19:00 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-02-24 07:03:55 -0500
commit04cec1a2bc5c70e719c1da8eaca2842da4cd77fb (patch)
treee8a7b99ad3d8bab80cd6059c540cb821b2b88349
parent0721feeee09bdb1ea97b75948f2ab2861d9ee38e (diff)
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>
-rw-r--r--arch/arm/boot/dts/imx6dl.dtsi4
-rw-r--r--arch/arm/boot/dts/imx6q.dtsi4
-rw-r--r--arch/arm/boot/dts/imx6qdl.dtsi10
3 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
index 9e8ae118fdd4..65e54b4529c5 100644
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -88,3 +88,7 @@
88 crtcs = <&ipu1 0>, <&ipu1 1>; 88 crtcs = <&ipu1 0>, <&ipu1 1>;
89 }; 89 };
90}; 90};
91
92&hdmi {
93 crtcs = <&ipu1 0>, <&ipu1 1>;
94}
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index f024ef28b34b..d2467f532de6 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -159,3 +159,7 @@
159 crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>; 159 crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>;
160 }; 160 };
161}; 161};
162
163&hdmi {
164 crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>;
165};
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index fb28b2ecb1db..400bbc624f25 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -1368,6 +1368,16 @@
1368 }; 1368 };
1369 }; 1369 };
1370 1370
1371 hdmi: hdmi@0120000 {
1372 compatible = "fsl,imx6q-hdmi";
1373 reg = <0x00120000 0x9000>;
1374 interrupts = <0 115 0x04>;
1375 gpr = <&gpr>;
1376 clocks = <&clks 123>, <&clks 124>;
1377 clock-names = "iahb", "isfr";
1378 status = "disabled";
1379 };
1380
1371 dcic1: dcic@020e4000 { 1381 dcic1: dcic@020e4000 {
1372 reg = <0x020e4000 0x4000>; 1382 reg = <0x020e4000 0x4000>;
1373 interrupts = <0 124 0x04>; 1383 interrupts = <0 124 0x04>;