From 82a521bbb0c9704bf2c0ff08a8c0f69efa85a55f Mon Sep 17 00:00:00 2001
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Wed, 12 Jun 2019 16:11:31 +0200
Subject: colibri-imx8qxp: support dsi to hdmi adapter v1.1a

Support DSI to HDMI Adapter V1.1A which uses a NXP PCA9540 I2C switch to
avoid interference between Lontium LT8912 and display I2C addresses.

Note: The prototype V1.0A ones may still be supported using the
DSI_TO_HDMI_V10 define.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
 .../fsl-imx8qxp-colibri-dsihdmi-eval-v3.dts        | 75 +++++++++++++++++++++-
 1 file changed, 74 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-dsihdmi-eval-v3.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-dsihdmi-eval-v3.dts
index 140d20743907..6a91caaaaeac 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-dsihdmi-eval-v3.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-dsihdmi-eval-v3.dts
@@ -5,6 +5,7 @@
 
 /dts-v1/;
 //#define IS_A0_SILICON
+//#define DSI_TO_HDMI_V10
 
 #include "fsl-imx8qxp-colibri-eval-v3.dtsi"
 
@@ -23,6 +24,78 @@
 	clock-frequency = <100000>;
 	status = "okay";
 
+#ifndef DSI_TO_HDMI_V10
+	/* DSI to HDMI Adapter V1.1A */
+	i2c-switch@70 {
+		compatible = "nxp,pca9540";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0x70>;
+		i2c-mux-idle-disconnect;
+
+		i2c@0 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0>;
+
+			/* DDC/EDID */
+		};
+
+		i2c@1 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <1>;
+
+			lt8912@48 {
+				compatible = "lontium,lt8912";
+				reg = <0x48>;
+
+				port {
+					lt8912_1_in: endpoint {
+						remote-endpoint = <&mipi_dsi_bridge1_out>;
+					};
+				};
+
+				display-timings {
+					native-mode = <&timing1>;
+
+					timing0: timing0 {
+						clock-frequency = <74250000>;
+						hactive = <1280>;
+						vactive = <720>;
+						hfront-porch = <110>;
+						hsync-len = <40>;
+						hback-porch = <220>;
+						vfront-porch = <5>;
+						vsync-len = <5>;
+						vback-porch = <20>;
+						hsync-active = <0>;
+						vsync-active = <0>;
+						de-active = <0>;
+						pixelclk-active = <0>;
+					};
+
+					timing1: timing1 {
+						clock-frequency = <148500000>;
+						hactive = <1920>;
+						vactive = <1080>;
+						hfront-porch = <88>;
+						hsync-len = <44>;
+						hback-porch = <148>;
+						vfront-porch = <36>;
+						vsync-len = <5>;
+						vback-porch = <4>;
+						hsync-active = <0>;
+						vsync-active = <0>;
+						de-active = <0>;
+						pixelclk-active = <0>;
+					};
+				};
+			};
+		};
+	};
+#else /* DSI_TO_HDMI_V10 */
+	/* DSI to HDMI Adapter V1.0A */
 	lt8912@48 {
 		compatible = "lontium,lt8912";
 		reg = <0x48>;
@@ -69,7 +142,7 @@
 			};
 		};
 	};
-
+#endif /* DSI_TO_HDMI_V10 */
 };
 
 &ldb1_phy {
-- 
cgit v1.2.3