From 8e9bcefa82c06dc9a657f61f150e8a007c9cff1b Mon Sep 17 00:00:00 2001
From: Sandor Yu <R01008@freescale.com>
Date: Wed, 14 Jan 2015 15:41:43 +0800
Subject: [PATCH] MLK-10092-2 dts: Rename compatible string from ov564x to
 ov5640

There are two version ov5640 driver,
one is written with v4l2 int-device architecture,
and the other is written with v4l2 subdev architecture.
Rename subdev ov5640 compatible string from ov5640x
to ov5640 to distinguish with ov5640 int-device driver.
so ov564x is used for int-device architecture and
ov5640 is used for subdev architecture.

Signed-off-by: Sandor Yu <R01008@freescale.com>
---
 arch/arm/boot/dts/imx6sl-evk.dts               | 8 ++++----
 arch/arm/boot/dts/imx6sx-19x19-arm2-csi.dts    | 2 +-
 arch/arm/boot/dts/imx6sx-19x19-arm2-lcdif1.dts | 2 +-
 arch/arm/boot/dts/imx6sx-19x19-arm2.dts        | 8 ++++----
 arch/arm/boot/dts/imx6sx-sdb.dts               | 8 ++++----
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts
index 1aba3a42968f..cbd6ac71587c 100644
--- a/arch/arm/boot/dts/imx6sl-evk.dts
+++ b/arch/arm/boot/dts/imx6sl-evk.dts
@@ -145,7 +145,7 @@
 &csi {
 	port {
 		csi_ep: endpoint {
-			remote-endpoint = <&ov564x_ep>;
+			remote-endpoint = <&ov5640_ep>;
 		};
 	};
 };
@@ -404,8 +404,8 @@
 	pinctrl-0 = <&pinctrl_i2c3>;
 	status = "disabled";
 
-	ov564x: ov564x@3c {
-		compatible = "ovti,ov564x";
+	ov5640: ov5640@3c {
+		compatible = "ovti,ov5640";
 		reg = <0x3c>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_csi_0>;
@@ -419,7 +419,7 @@
 		mclk = <24000000>;
 		mclk_source = <0>;
 		port {
-			ov564x_ep: endpoint {
+			ov5640_ep: endpoint {
 				remote-endpoint = <&csi_ep>;
 			};
 		};
diff --git a/arch/arm/boot/dts/imx6sx-19x19-arm2-csi.dts b/arch/arm/boot/dts/imx6sx-19x19-arm2-csi.dts
index e1b2c2d1b27b..411939594217 100644
--- a/arch/arm/boot/dts/imx6sx-19x19-arm2-csi.dts
+++ b/arch/arm/boot/dts/imx6sx-19x19-arm2-csi.dts
@@ -18,7 +18,7 @@
 };
 
 &i2c2 {
-	ov564x: ov564x@3c {
+	ov5640: ov5640@3c {
 		status = "okay";
 	};
 };
diff --git a/arch/arm/boot/dts/imx6sx-19x19-arm2-lcdif1.dts b/arch/arm/boot/dts/imx6sx-19x19-arm2-lcdif1.dts
index cf8cb57589f3..b804b025798b 100644
--- a/arch/arm/boot/dts/imx6sx-19x19-arm2-lcdif1.dts
+++ b/arch/arm/boot/dts/imx6sx-19x19-arm2-lcdif1.dts
@@ -9,7 +9,7 @@
 #include "imx6sx-19x19-arm2.dts"
 
 &i2c2 {
-	ov564x: ov564x@3c {
+	ov5640: ov5640@3c {
 		status = "disabled";
 	};
 };
diff --git a/arch/arm/boot/dts/imx6sx-19x19-arm2.dts b/arch/arm/boot/dts/imx6sx-19x19-arm2.dts
index 45fe70979ca1..da63a60cfa52 100644
--- a/arch/arm/boot/dts/imx6sx-19x19-arm2.dts
+++ b/arch/arm/boot/dts/imx6sx-19x19-arm2.dts
@@ -95,7 +95,7 @@
 
 	port {
 		csi1_ep: endpoint {
-			remote-endpoint = <&ov564x_ep>;
+			remote-endpoint = <&ov5640_ep>;
 		};
 	};
 };
@@ -291,8 +291,8 @@
 		resets = <&max7322_reset>;
 	};
 
-	ov564x: ov564x@3c {
-		compatible = "ovti,ov564x";
+	ov5640: ov5640@3c {
+		compatible = "ovti,ov5640";
 		reg = <0x3c>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_csi_1>;
@@ -307,7 +307,7 @@
 		mclk_source = <0>;
 		status = "disabled";
 		port {
-			ov564x_ep: endpoint {
+			ov5640_ep: endpoint {
 				remote-endpoint = <&csi1_ep>;
 			};
 		};
diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dts
index 3a7f95c8893b..a41d831aaa28 100644
--- a/arch/arm/boot/dts/imx6sx-sdb.dts
+++ b/arch/arm/boot/dts/imx6sx-sdb.dts
@@ -197,7 +197,7 @@
 
 	port {
 		csi1_ep: endpoint {
-			remote-endpoint = <&ov564x_ep>;
+			remote-endpoint = <&ov5640_ep>;
 		};
 	};
 };
@@ -569,8 +569,8 @@
 		};
 	};
 
-	ov564x: ov564x@3c {
-		compatible = "ovti,ov564x";
+	ov5640: ov5640@3c {
+		compatible = "ovti,ov5640";
 		reg = <0x3c>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_csi_0>;
@@ -584,7 +584,7 @@
 		mclk = <24000000>;
 		mclk_source = <0>;
 		port {
-			ov564x_ep: endpoint {
+			ov5640_ep: endpoint {
 				remote-endpoint = <&csi1_ep>;
 			};
 		};
-- 
2.39.5