MLK-17804-5: dts: rename dts file for qxp ov5640 mipi

Rename fsl-imx8qxp-mek-mipi-csi2 -> fsl-imx8qxp-mek-mipi-ov5640.dts
,in order to avoid confusion.

Reviewed-by: robby.cai <robby.cai@nxp.com>
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit 5bf58c289a045808a1dd575c588f8a0bf13d832e)

diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile
index e823fe9..265a09c 100644 (file)
--- a/arch/arm64/boot/dts/freescale/Makefile
+++ b/arch/arm64/boot/dts/freescale/Makefile
@@ -32,7 +32,7 @@ dtb-$(CONFIG_ARCH_FSL_IMX8QXP) += fsl-imx8qxp-lpddr4-arm2.dtb \
                                  fsl-imx8qxp-mek.dtb \
                                  fsl-imx8qxp-mek-dom0.dtb \
                                  fsl-imx8qxp-mek-csi.dtb \
-                                 fsl-imx8qxp-mek-mipi-csi2.dtb \
+                                 fsl-imx8qxp-mek-mipi-ov5640.dtb \
                                  fsl-imx8qxp-mek-enet2.dtb \
                                  fsl-imx8qxp-mek-enet2-tja1100.dtb \
                                  fsl-imx8qxp-mek-dsi-rm67191.dtb \

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek-mipi-csi2.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek-mipi-csi2.dts
deleted file mode 100644 (file)
index e8460dc..0000000
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek-mipi-csi2.dts
+++ /dev/null
@@ -1,86 +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-imx8qxp-mek-lvds0-it6263.dts"
-
-&iomuxc {
-       imx8qxp-mek {
-               pinctrl_mipi_csi0: mipicsi0grp{
-                       fsl,pins = <
-                               SC_P_MIPI_CSI0_MCLK_OUT_MIPI_CSI0_ACM_MCLK_OUT  0xC0000041
-                               SC_P_MIPI_CSI0_GPIO0_01_LSIO_GPIO3_IO07         0xC0000041
-                               SC_P_MIPI_CSI0_GPIO0_00_LSIO_GPIO3_IO08         0xC0000041
-                       >;
-               };
-       };
-};
-
-&isi_0 {
-       status = "okay";
-};
-
-&isi_1 {
-       status = "disabled";
-};
-
-&isi_2 {
-       status = "disabled";
-};
-
-&isi_3 {
-       status = "disabled";
-};
-
-&i2c0_csi0 {
-       clock-frequency = <100000>;
-       status = "okay";
-
-       ov5640_mipi: ov5640_mipi@3c {
-               compatible = "ovti,ov5640_v3";
-               reg = <0x3c>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_mipi_csi0>;
-               clocks = <&clk IMX8QXP_CLK_DUMMY>;
-               clock-names = "csi_mclk";
-               csi_id = <0>;
-               pwn-gpios = <&gpio3 7 GPIO_ACTIVE_LOW>;
-               rst-gpios = <&gpio3 8 GPIO_ACTIVE_HIGH>;
-               mclk = <24000000>;
-               mclk_source = <0>;
-               mipi_csi;
-               status = "okay";
-               port {
-                       ov5640_mipi_ep: endpoint {
-                               remote-endpoint = <&mipi_csi0_ep>;
-                       };
-               };
-       };
-
-       max9286_mipi@6A {
-               status = "disabled";
-       };
-};
-
-&mipi_csi_0 {
-       /delete-property/virtual-channel;
-       status = "okay";
-
-       port@0 {
-               reg = <0>;
-               mipi_csi0_ep: endpoint {
-                       remote-endpoint = <&ov5640_mipi_ep>;
-                       data-lanes = <1 2>;
-               };
-       };
-};

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek-mipi-ov5640.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek-mipi-ov5640.dts
new file mode 100644 (file)
index 0000000..e8460dc
--- /dev/null
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek-mipi-ov5640.dts
@@ -0,0 +1,86 @@
+/*
+ * 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-imx8qxp-mek-lvds0-it6263.dts"
+
+&iomuxc {
+       imx8qxp-mek {
+               pinctrl_mipi_csi0: mipicsi0grp{
+                       fsl,pins = <
+                               SC_P_MIPI_CSI0_MCLK_OUT_MIPI_CSI0_ACM_MCLK_OUT  0xC0000041
+                               SC_P_MIPI_CSI0_GPIO0_01_LSIO_GPIO3_IO07         0xC0000041
+                               SC_P_MIPI_CSI0_GPIO0_00_LSIO_GPIO3_IO08         0xC0000041
+                       >;
+               };
+       };
+};
+
+&isi_0 {
+       status = "okay";
+};
+
+&isi_1 {
+       status = "disabled";
+};
+
+&isi_2 {
+       status = "disabled";
+};
+
+&isi_3 {
+       status = "disabled";
+};
+
+&i2c0_csi0 {
+       clock-frequency = <100000>;
+       status = "okay";
+
+       ov5640_mipi: ov5640_mipi@3c {
+               compatible = "ovti,ov5640_v3";
+               reg = <0x3c>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_mipi_csi0>;
+               clocks = <&clk IMX8QXP_CLK_DUMMY>;
+               clock-names = "csi_mclk";
+               csi_id = <0>;
+               pwn-gpios = <&gpio3 7 GPIO_ACTIVE_LOW>;
+               rst-gpios = <&gpio3 8 GPIO_ACTIVE_HIGH>;
+               mclk = <24000000>;
+               mclk_source = <0>;
+               mipi_csi;
+               status = "okay";
+               port {
+                       ov5640_mipi_ep: endpoint {
+                               remote-endpoint = <&mipi_csi0_ep>;
+                       };
+               };
+       };
+
+       max9286_mipi@6A {
+               status = "disabled";
+       };
+};
+
+&mipi_csi_0 {
+       /delete-property/virtual-channel;
+       status = "okay";
+
+       port@0 {
+               reg = <0>;
+               mipi_csi0_ep: endpoint {
+                       remote-endpoint = <&ov5640_mipi_ep>;
+                       data-lanes = <1 2>;
+               };
+       };
+};