From: Shenwei Wang <shenwei.wang@nxp.com>
Date: Wed, 11 Apr 2018 03:38:13 +0000 (-0500)
Subject: MLK-17993: arm: dts: rename the dts to match i.MX7ULP board design
X-Git-Tag: C0P2-H0.0--20200415~71
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=1911ee645685c455a144352746a3d757b9b1e02d;p=linux.git

MLK-17993: arm: dts: rename the dts to match i.MX7ULP board design

The default display interface on i.MX7ULP EVK board is the HDMI
interface, and a hardware rework is required to support the MIPI
panel. To match the current board design, added the HDMI node in
the imx7ulp-evk.dts and created a  new file named imx7ulp-evk-mipi.dts.

Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com>
Reviewed-by: Andy Duan <fugang.duan@nxp.com>
---

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 35ca227b8d61..76a2740de5ad 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -600,7 +600,7 @@ dtb-$(CONFIG_SOC_IMX7ULP) += \
 	imx7ulp-evk-lpuart.dtb \
 	imx7ulp-evk-qspi.dtb \
 	imx7ulp-evk-wm8960.dtb \
-	imx7ulp-evk-hdmi.dtb \
+	imx7ulp-evk-mipi.dtb \
 	imx7ulp-evk-sensors-to-i2c5.dtb
 dtb-$(CONFIG_SOC_LS1021A) += \
 	ls1021a-qds.dtb \
diff --git a/arch/arm/boot/dts/imx7ulp-evk-hdmi.dts b/arch/arm/boot/dts/imx7ulp-evk-hdmi.dts
deleted file mode 100644
index d56c8e147a2b..000000000000
--- a/arch/arm/boot/dts/imx7ulp-evk-hdmi.dts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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 version 2 as
- * published by the Free Software Foundation.
- */
-
-#include "imx7ulp-evk.dts"
-
-&adv7535 {
-	status = "okay";
-	port {
-		dsi_to_hdmi: endpoint {
-			remote-endpoint = <&mipi_dsi_ep>;
-		};
-	};
-};
-
-&mipi_dsi {
-	port {
-		mipi_dsi_ep: endpoint {
-			remote-endpoint = <&dsi_to_hdmi>;
-		};
-	};
-};
diff --git a/arch/arm/boot/dts/imx7ulp-evk-mipi.dts b/arch/arm/boot/dts/imx7ulp-evk-mipi.dts
new file mode 100644
index 000000000000..2c10cba9a85a
--- /dev/null
+++ b/arch/arm/boot/dts/imx7ulp-evk-mipi.dts
@@ -0,0 +1,27 @@
+/*
+ * 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 version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "imx7ulp-evk.dts"
+
+&adv7535 {
+	status = "disabled";
+
+	/delete-node/ port;
+};
+
+&mipi_dsi {
+	pinctrl-names = "default", "sleep";
+	pinctrl-0 = <&pinctrl_mipi_dsi_reset>;
+	pinctrl-1 = <&pinctrl_mipi_dsi_reset>;
+	lcd_panel = "TRULY-WVGA-TFT3P5581E";
+	resets = <&mipi_dsi_reset>;
+
+	/delete-node/ port;
+};
+
+
diff --git a/arch/arm/boot/dts/imx7ulp-evk.dts b/arch/arm/boot/dts/imx7ulp-evk.dts
index 112ed456c7ea..028d2974080b 100644
--- a/arch/arm/boot/dts/imx7ulp-evk.dts
+++ b/arch/arm/boot/dts/imx7ulp-evk.dts
@@ -443,9 +443,9 @@
 		interrupt-parent = <&gpio_ptc>;
 		interrupts = <18 IRQ_TYPE_EDGE_FALLING>;
 		video-mode = <1>; /*
-			           * Only support CEA modes.
-			           * Reference mxc_edid.c
-			           */
+						   * Only support CEA modes.
+						   * Reference mxc_edid.c
+						   */
 		dsi-traffic-mode = <0>;
 		bpp = <24>;
 		status = "disabled";
@@ -467,13 +467,25 @@
 	};
 };
 
+
+&adv7535 {
+	status = "okay";
+
+	port {
+		dsi_to_hdmi: endpoint {
+			remote-endpoint = <&mipi_dsi_ep>;
+		};
+	};
+};
+
 &mipi_dsi {
-	pinctrl-names = "default", "sleep";
-	pinctrl-0 = <&pinctrl_mipi_dsi_reset>;
-	pinctrl-1 = <&pinctrl_mipi_dsi_reset>;
-	lcd_panel = "TRULY-WVGA-TFT3P5581E";
-	resets = <&mipi_dsi_reset>;
 	status = "okay";
+
+	port {
+		mipi_dsi_ep: endpoint {
+			remote-endpoint = <&dsi_to_hdmi>;
+		};
+	};
 };
 
 &lpuart4 { /* console */