aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-10-30 16:10:31 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-02-24 07:03:58 -0500
commitcf83eb24d22f3a9580fb86ee64e2830c65df062a (patch)
tree337b8f270a033f171fb9c0c54df2b53e544c35c0 /arch/arm/boot
parent04cec1a2bc5c70e719c1da8eaca2842da4cd77fb (diff)
imx-drm: update and fix imx6 DT descriptions for v3 HDMI driver
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>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/imx6dl.dtsi3
-rw-r--r--arch/arm/boot/dts/imx6q.dtsi1
-rw-r--r--arch/arm/boot/dts/imx6qdl.dtsi1
3 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
index 65e54b4529c5..6dc397022214 100644
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -90,5 +90,6 @@
90}; 90};
91 91
92&hdmi { 92&hdmi {
93 compatible = "fsl,imx6dl-hdmi";
93 crtcs = <&ipu1 0>, <&ipu1 1>; 94 crtcs = <&ipu1 0>, <&ipu1 1>;
94} 95};
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index d2467f532de6..187fe33ba515 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -161,5 +161,6 @@
161}; 161};
162 162
163&hdmi { 163&hdmi {
164 compatible = "fsl,imx6q-hdmi";
164 crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>; 165 crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>;
165}; 166};
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 400bbc624f25..930ebe0c2937 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -1369,7 +1369,6 @@
1369 }; 1369 };
1370 1370
1371 hdmi: hdmi@0120000 { 1371 hdmi: hdmi@0120000 {
1372 compatible = "fsl,imx6q-hdmi";
1373 reg = <0x00120000 0x9000>; 1372 reg = <0x00120000 0x9000>;
1374 interrupts = <0 115 0x04>; 1373 interrupts = <0 115 0x04>;
1375 gpr = <&gpr>; 1374 gpr = <&gpr>;