MLK-20529-3: dts: delete two dts file for imx8qm cameras

delete "fsl-imx8qm-mek-8cam.dts" and "fsl-imx8qm-mek-mipi-two-ov5640.dts"
file because they are for eight and four cameras. The default dts support
connect four or eight sensors, so the two dts are redundant.

The default "fsl-imx8qm-mek.dts" support one max9286 with four ov10635 or
two max9286 with eight ov10635, user can connect one or both of them

The "fsl-imx8qm-mek-ov5640.dts" is only for ov5640 sensor, support
one or two mipi interface

Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit e0cf682b551a2fd8813298d27399837577b352c4)

5 files changed, 86 insertions, 125 deletions

diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile
index 6b0303997a81..a55b00b99605 100644
--- a/arch/arm64/boot/dts/freescale/Makefile
+++ b/arch/arm64/boot/dts/freescale/Makefile
@@ -22,9 +22,7 @@ dtb-$(CONFIG_ARCH_FSL_IMX8QM) += fsl-imx8qm-lpddr4-arm2.dtb \
 				 fsl-imx8qm-lpddr4-arm2_ca53.dtb \
 				 fsl-imx8qm-lpddr4-arm2_ca72.dtb \
 				 fsl-imx8qm-mek.dtb \
-				 fsl-imx8qm-mek-mipi-ov5640.dtb \
-				 fsl-imx8qm-mek-mipi-two-ov5640.dtb \
-				 fsl-imx8qm-mek-8cam.dtb \
+				 fsl-imx8qm-mek-ov5640.dtb \
 				 fsl-imx8qm-mek_ca53.dtb \
 				 fsl-imx8qm-mek_ca72.dtb \
 				 fsl-imx8qm-mek-hdmi.dtb \
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-8cam.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-8cam.dts
deleted file mode 100644
index 3ae1956a3b28..000000000000
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-8cam.dts
+++ /dev/null
@@ -1,45 +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
- * 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.
- */
-/*
- * MIPI CSI-2 eight cameras dts,
- * One MIPI CSI-2 controller connected four cameras
- * The first four cameras have enabled in mipi_csi_0.
- * Enable the last four cameras in mipi_csi_1 here.
- */
-
-#include "fsl-imx8qm-mek.dts"
-
-&mipi_csi_1 {
-	status = "okay";
-};
-
-&i2c0_mipi_csi1 {
-	status = "okay";
-};
-
-&isi_4 {
-	status = "okay";
-};
-
-&isi_5 {
-	status = "okay";
-};
-
-&isi_6 {
-	status = "okay";
-};
-
-&isi_7 {
-	status = "okay";
-};
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-mipi-two-ov5640.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-mipi-two-ov5640.dts
deleted file mode 100644
index 6f079681152a..000000000000
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-mipi-two-ov5640.dts
+++ /dev/null
@@ -1,75 +0,0 @@
-
-/*
- * Copyright 2018 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-imx8qm-mek-mipi-ov5640.dts"
-
-&iomuxc {
-	imx8qm-mek {
-		pinctrl_mipi_csi1: mipicsi1grp{
-			fsl,pins = <
-				SC_P_MIPI_CSI1_MCLK_OUT_MIPI_CSI1_ACM_MCLK_OUT	0xC0000041
-				SC_P_MIPI_CSI1_GPIO0_00_LSIO_GPIO1_IO30         0x00000021
-				SC_P_MIPI_CSI1_GPIO0_01_LSIO_GPIO1_IO31         0x00000021
-			>;
-		};
-	};
-};
-
-&isi_4 {
-	status = "okay";
-};
-
-&i2c0_mipi_csi1 {
-	clock-frequency = <100000>;
-	status = "okay";
-
-	ov5640_mipi@3c {
-		compatible = "ovti,ov5640_mipi_v3";
-		reg = <0x3c>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_mipi_csi1>;
-		clocks = <&clk IMX8QM_CLK_DUMMY>;
-		clock-names = "csi_mclk";
-		csi_id = <1>;
-		pwn-gpios = <&gpio1 31 GPIO_ACTIVE_LOW>;
-		rst-gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
-		mclk = <24000000>;
-		mclk_source = <0>;
-		mipi_csi;
-		status = "okay";
-		port {
-			ov5640_mipi_ep_1: endpoint {
-				remote-endpoint = <&mipi_csi1_ep>;
-			};
-		};
-	};
-
-	max9286_mipi@6A {
-		status = "disabled";
-	};
-};
-
-&mipi_csi_1 {
-	/delete-property/virtual-channel;
-	status = "okay";
-
-	port@1 {
-		reg = <1>;
-		mipi_csi1_ep: endpoint {
-			remote-endpoint = <&ov5640_mipi_ep_1>;
-			data-lanes = <1 2>;
-		};
-	};
-};
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-mipi-ov5640.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-ov5640.dts
index df8bf72b05bc..2b2f25e45ae5 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-mipi-ov5640.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-ov5640.dts
@@ -23,6 +23,14 @@
 				SC_P_MIPI_CSI0_GPIO0_01_LSIO_GPIO1_IO28			0x00000021
 			>;
 		};
+
+		pinctrl_mipi_csi1: mipicsi1grp{
+			fsl,pins = <
+				SC_P_MIPI_CSI1_MCLK_OUT_MIPI_CSI1_ACM_MCLK_OUT	0xC0000041
+				SC_P_MIPI_CSI1_GPIO0_00_LSIO_GPIO1_IO30         0x00000021
+				SC_P_MIPI_CSI1_GPIO0_01_LSIO_GPIO1_IO31         0x00000021
+			>;
+		};
 	};
 };
 
@@ -30,6 +38,10 @@
 	status = "okay";
 };
 
+&isi_4 {
+	status = "okay";
+};
+
 &isi_1 {
 	status = "disabled";
 };
@@ -42,6 +54,18 @@
 	status = "disabled";
 };
 
+&isi_5 {
+	status = "disabled";
+};
+
+&isi_6 {
+	status = "disabled";
+};
+
+&isi_7 {
+	status = "disabled";
+};
+
 &i2c0_mipi_csi0 {
 	clock-frequency = <100000>;
 	status = "okay";
@@ -72,6 +96,36 @@
 	};
 };
 
+&i2c0_mipi_csi1 {
+	clock-frequency = <100000>;
+	status = "okay";
+
+	ov5640_mipi@3c {
+		compatible = "ovti,ov5640_mipi_v3";
+		reg = <0x3c>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_mipi_csi1>;
+		clocks = <&clk IMX8QM_CLK_DUMMY>;
+		clock-names = "csi_mclk";
+		csi_id = <1>;
+		pwn-gpios = <&gpio1 31 GPIO_ACTIVE_LOW>;
+		rst-gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
+		mclk = <24000000>;
+		mclk_source = <0>;
+		mipi_csi;
+		status = "okay";
+		port {
+			ov5640_mipi_ep_1: endpoint {
+				remote-endpoint = <&mipi_csi1_ep>;
+			};
+		};
+	};
+
+	max9286_mipi@6A {
+		status = "disabled";
+	};
+};
+
 &mipi_csi_0 {
 	/delete-property/virtual-channel;
 	status = "okay";
@@ -84,3 +138,16 @@
 		};
 	};
 };
+
+&mipi_csi_1 {
+	/delete-property/virtual-channel;
+	status = "okay";
+
+	port@1 {
+		reg = <1>;
+		mipi_csi1_ep: endpoint {
+			remote-endpoint = <&ov5640_mipi_ep_1>;
+			data-lanes = <1 2>;
+		};
+	};
+};
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek.dtsi
index 479a5a0a5a5f..583295e63059 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek.dtsi
@@ -1166,7 +1166,7 @@
 	#address-cells = <1>;
 	#size-cells = <0>;
 	virtual-channel;
-	status = "disabled";
+	status = "okay";
 
 	/* Camera 0 MIPI CSI-2 (CSIS1) */
 	port@1 {
@@ -1218,7 +1218,7 @@
 	#address-cells = <1>;
 	#size-cells = <0>;
 	clock-frequency = <100000>;
-	status = "disabled";
+	status = "okay";
 
 	max9286_mipi@6A	 {
 		compatible = "maxim,max9286_mipi";
@@ -1256,6 +1256,22 @@
 	status = "okay";
 };
 
+&isi_4 {
+	status = "okay";
+};
+
+&isi_5 {
+	status = "okay";
+};
+
+&isi_6 {
+	status = "okay";
+};
+
+&isi_7 {
+	status = "okay";
+};
+
 &sata {
 	pinctrl-0 = <&pinctrl_pciea>;
 	clkreq-gpio = <&gpio4 27 GPIO_ACTIVE_LOW>;