From 1952f61c8e8d81c18887828f3be9f03ef60aadce Mon Sep 17 00:00:00 2001
From: Karthik Jayakumar <kjayakum@quicinc.com>
Date: Fri, 31 Jan 2020 23:11:27 -0800
Subject: [PATCH] ARM: dts: msm: Add bringup fixes for Lahaina

Fix RDI write path on ife2.
Fix EEPROM setting for Lahaina sensor.
Update sensor cell id's to match user space.

CRs-Fixed: 2584631
Change-Id: I7693a4cef98383cc5539c25f18799bf70f5f0970
---
 lahaina-camera-sensor-cdp.dtsi | 18 +++++++++---------
 lahaina-camera-sensor-mtp.dtsi | 18 +++++++++---------
 lahaina-camera.dtsi            |  2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lahaina-camera-sensor-cdp.dtsi b/lahaina-camera-sensor-cdp.dtsi
index b97ddeb63b34..9f9d62f576ce 100644
--- a/lahaina-camera-sensor-cdp.dtsi
+++ b/lahaina-camera-sensor-cdp.dtsi
@@ -132,7 +132,7 @@
 	};
 
 	qcom,cam-sensor0 {
-		cell-index = <0>;
+		cell-index = <5>;
 		compatible = "qcom,cam-sensor";
 		csiphy-sd-index = <0>;
 		sensor-position-roll = <90>;
@@ -174,7 +174,7 @@
 	};
 
 	qcom,cam-sensor1 {
-		cell-index = <1>;
+		cell-index = <4>;
 		compatible = "qcom,cam-sensor";
 		csiphy-sd-index = <1>;
 		sensor-position-roll = <90>;
@@ -201,8 +201,8 @@
 				&cam_sensor_active_rst1>;
 		pinctrl-1 = <&cam_sensor_mclk1_suspend
 				&cam_sensor_suspend_rst1>;
-		gpios = <&tlmm 100 0>,
-			<&tlmm 17 0>;
+		gpios = <&tlmm 101 0>,
+			<&tlmm 16 0>;
 		gpio-reset = <1>;
 		gpio-req-tbl-num = <0 1>;
 		gpio-req-tbl-flags = <1 0>;
@@ -217,7 +217,7 @@
 	};
 
 	qcom,cam-sensor3 {
-		cell-index = <3>;
+		cell-index = <0>;
 		compatible = "qcom,cam-sensor";
 		csiphy-sd-index = <3>;
 		eeprom-src = <&eeprom_tof2>;
@@ -270,7 +270,7 @@
 		rgltr-load-current = <103000>;
 	};
 
-	eeprom_triple_uw: qcom,eeprom3 {
+	eeprom_triple_uw: qcom,eeprom2 {
 		cell-index = <2>;
 		compatible = "qcom,eeprom";
 		cam_vio-supply = <&pm8008j_l3>;
@@ -371,7 +371,7 @@
 	};
 
 	qcom,cam-sensor2 {
-		cell-index = <2>;
+		cell-index = <6>;
 		compatible = "qcom,cam-sensor";
 		csiphy-sd-index = <2>;
 		sensor-position-roll = <90>;
@@ -413,7 +413,7 @@
 	};
 
 	qcom,cam-sensor4 {
-		cell-index = <4>;
+		cell-index = <3>;
 		compatible = "qcom,cam-sensor";
 		csiphy-sd-index = <4>;
 		eeprom-src = <&eeprom_tof1>;
@@ -449,7 +449,7 @@
 	};
 
 	qcom,cam-sensor5 {
-		cell-index = <5>;
+		cell-index = <2>;
 		compatible = "qcom,cam-sensor";
 		csiphy-sd-index = <5>;
 		sensor-position-roll = <270>;
diff --git a/lahaina-camera-sensor-mtp.dtsi b/lahaina-camera-sensor-mtp.dtsi
index b97ddeb63b34..9f9d62f576ce 100644
--- a/lahaina-camera-sensor-mtp.dtsi
+++ b/lahaina-camera-sensor-mtp.dtsi
@@ -132,7 +132,7 @@
 	};
 
 	qcom,cam-sensor0 {
-		cell-index = <0>;
+		cell-index = <5>;
 		compatible = "qcom,cam-sensor";
 		csiphy-sd-index = <0>;
 		sensor-position-roll = <90>;
@@ -174,7 +174,7 @@
 	};
 
 	qcom,cam-sensor1 {
-		cell-index = <1>;
+		cell-index = <4>;
 		compatible = "qcom,cam-sensor";
 		csiphy-sd-index = <1>;
 		sensor-position-roll = <90>;
@@ -201,8 +201,8 @@
 				&cam_sensor_active_rst1>;
 		pinctrl-1 = <&cam_sensor_mclk1_suspend
 				&cam_sensor_suspend_rst1>;
-		gpios = <&tlmm 100 0>,
-			<&tlmm 17 0>;
+		gpios = <&tlmm 101 0>,
+			<&tlmm 16 0>;
 		gpio-reset = <1>;
 		gpio-req-tbl-num = <0 1>;
 		gpio-req-tbl-flags = <1 0>;
@@ -217,7 +217,7 @@
 	};
 
 	qcom,cam-sensor3 {
-		cell-index = <3>;
+		cell-index = <0>;
 		compatible = "qcom,cam-sensor";
 		csiphy-sd-index = <3>;
 		eeprom-src = <&eeprom_tof2>;
@@ -270,7 +270,7 @@
 		rgltr-load-current = <103000>;
 	};
 
-	eeprom_triple_uw: qcom,eeprom3 {
+	eeprom_triple_uw: qcom,eeprom2 {
 		cell-index = <2>;
 		compatible = "qcom,eeprom";
 		cam_vio-supply = <&pm8008j_l3>;
@@ -371,7 +371,7 @@
 	};
 
 	qcom,cam-sensor2 {
-		cell-index = <2>;
+		cell-index = <6>;
 		compatible = "qcom,cam-sensor";
 		csiphy-sd-index = <2>;
 		sensor-position-roll = <90>;
@@ -413,7 +413,7 @@
 	};
 
 	qcom,cam-sensor4 {
-		cell-index = <4>;
+		cell-index = <3>;
 		compatible = "qcom,cam-sensor";
 		csiphy-sd-index = <4>;
 		eeprom-src = <&eeprom_tof1>;
@@ -449,7 +449,7 @@
 	};
 
 	qcom,cam-sensor5 {
-		cell-index = <5>;
+		cell-index = <2>;
 		compatible = "qcom,cam-sensor";
 		csiphy-sd-index = <5>;
 		sensor-position-roll = <270>;
diff --git a/lahaina-camera.dtsi b/lahaina-camera.dtsi
index 72347f658252..685f4331d7a2 100644
--- a/lahaina-camera.dtsi
+++ b/lahaina-camera.dtsi
@@ -935,7 +935,7 @@
 					traffic-data =
 					<CAM_CPAS_PATH_DATA_IFE_RDI_ALL>;
 					traffic-transaction-type =
-					<CAM_CPAS_TRANSACTION_READ>;
+					<CAM_CPAS_TRANSACTION_WRITE>;
 					constituent-paths =
 					<CAM_CPAS_PATH_DATA_IFE_RDI0
 					CAM_CPAS_PATH_DATA_IFE_RDI1