MLK-17117: arm64: dts: fsl-imx8mq-evk: Add support for dual-display

Add a DTS file which will have both the lcdif and dcss nodes enabled and
configured.
The DCSS will work with HDMI output, while the eLCDIF will work with
ADV7535 DSI-HDMI converter.
Also, remove lcdif-rm67191.dts from Makefile, since lcdif is limited to
720p. This combination is no longer working, until we have the timings
for 720p for the MIPI panel.

Signed-off-by: Robert Chiras <robert.chiras@nxp.com>

diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile
index ed3e465..0786931 100644 (file)
--- a/arch/arm64/boot/dts/freescale/Makefile
+++ b/arch/arm64/boot/dts/freescale/Makefile
@@ -46,11 +46,11 @@ dtb-$(CONFIG_ARCH_FSL_IMX8MQ) += fsl-imx8mq-evk.dtb \
                                 fsl-imx8mq-evk-m4.dtb \
                                 fsl-imx8mq-evk-pcie1-m2.dtb \
                                 fsl-imx8mq-evk-lcdif-adv7535.dtb \
-                                fsl-imx8mq-evk-lcdif-rm67191.dtb \
                                 fsl-imx8mq-evk-mipi-csi2.dtb \
                                 fsl-imx8mq-evk-pdm.dtb \
                                 fsl-imx8mq-evk-dcss-adv7535.dtb \
-                                fsl-imx8mq-evk-dcss-rm67191.dtb
+                                fsl-imx8mq-evk-dcss-rm67191.dtb \
+                                fsl-imx8mq-evk-dual-display.dtb
 
 always         := $(dtb-y)
 subdir-y       := $(dts-dirs)

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk-dual-display.dts b/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk-dual-display.dts
new file mode 100644 (file)
index 0000000..079e9f1
--- /dev/null
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk-dual-display.dts
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2017 NXP
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include "fsl-imx8mq-evk.dts"
+
+&ov5640_mipi {
+       status = "disabled";
+};
+
+&lcdif {
+       status = "okay";
+
+       port@0 {
+               lcdif_mipi_dsi: mipi-dsi-endpoint {
+                       remote-endpoint = <&mipi_dsi_in>;
+               };
+       };
+};
+
+&i2c1 {
+       adv_bridge: adv7535@3d {
+               compatible = "adi,adv7533";
+               reg = <0x3d>;
+               adi,dsi-lanes = <4>;
+               status = "okay";
+
+               port {
+                       adv7535_in: endpoint {
+                               remote-endpoint = <&mipi_dsi_bridge_adv>;
+                       };
+               };
+       };
+};
+
+&mipi_dsi_phy {
+       status = "okay";
+};
+
+&mipi_dsi {
+       status = "okay";
+       as_bridge;
+       sync-pol = <1>;
+       pwr-delay = <10>;
+
+       port@1 {
+               mipi_dsi_in: endpoint {
+                       remote-endpoint = <&lcdif_mipi_dsi>;
+               };
+       };
+};
+
+&mipi_dsi_bridge {
+       status = "okay";
+
+       port@1 {
+               mipi_dsi_bridge_adv: endpoint {
+                       remote-endpoint = <&adv7535_in>;
+               };
+       };
+};