Revert "Revert "arm64/dts: shusky: Unifying tof module power with RCAM""

This reverts commit eb5eb272f4ff64189ee1030492cdf02f8f67e3e5.

Reason for revert: Remove reset pin for unifying sequence

Bug: 291654282
Test: CTS/GCA smoked test

Change-Id: Ifa0105059c817f8ec5bd8072917ff726d04c9f5c
Signed-off-by: Bill Chang <billdir@google.com>

1 files changed, 32 insertions, 60 deletions

diff --git a/dts/google/zuma-husky-camera.dtsi b/dts/google/zuma-husky-camera.dtsi
index 9c3fec2..69c1fe9 100644
--- a/dts/google/zuma-husky-camera.dtsi
+++ b/dts/google/zuma-husky-camera.dtsi
@@ -245,6 +245,7 @@
 					"ldo4",
 					"reset",
 					"mclk_on",
+					"tof-reset",
 					"ldo5",
 					"gpio4";
 				power-up-seq-types =
@@ -256,6 +257,7 @@
 					"regulator",
 					"gpio",
 					"pinctrl",
+					"gpio",
 					"regulator",
 					"regulator";
 				power-up-seq-delays-us =
@@ -267,6 +269,7 @@
 					 2000
 					 1000
 					 7000
+					 0
 					 1000
 					 1000>;
 
@@ -274,6 +277,7 @@
 				power-down-seqs =
 					"gpio4",
 					"ldo5",
+					"tof-reset",
 					"mclk_off",
 					"reset",
 					"ldo4",
@@ -285,6 +289,7 @@
 				power-down-seq-types =
 					"regulator",
 					"regulator",
+					"gpio",
 					"pinctrl",
 					"gpio",
 					"regulator",
@@ -296,6 +301,7 @@
 				power-down-seq-delays-us =
 					<1000
 					 1000
+					 0
 					 1000
 					 1000
 					 0
@@ -325,6 +331,8 @@
 				/* GPIOs */
 				/* RCAM_RST_L GPP2[2] */
 				reset-gpios = <&gpp2 2 GPIO_ACTIVE_HIGH>;
+				/* XAPC_MCLK8: GPP15[0] */
+				tof-reset-gpios = <&gpp15 0 GPIO_ACTIVE_HIGH>;
 
 				/* Power supplies */
 				s2mpg15_ldo26-supply = <&s_ldo26_reg>;
@@ -347,8 +355,8 @@
 
 				/* MCLK Control */
 				pinctrl-names = "mclk_on", "mclk_off";
-				pinctrl-0 = <&sensor_mclk4_fn>;
-				pinctrl-1 = <&sensor_mclk4_out>;
+				pinctrl-0 = <&sensor_mclk4_fn &sensor_mclk8_out &ldaf_irq>;
+				pinctrl-1 = <&sensor_mclk4_out &sensor_mclk8_out &ldaf_irq>;
 
 				/* Power sequence */
 				power-seq = <&rear_camera_power_seq>;
@@ -716,6 +724,7 @@
 				/* GPIOs */
 				enable-gpios = <&s2mpg15_gpio 2 GPIO_ACTIVE_HIGH>;
 				reset-gpios = <&gpp2 2 GPIO_ACTIVE_HIGH>;
+				tof-reset-gpios = <&gpp15 0 GPIO_ACTIVE_HIGH>;
 				/* Power supplies */
 				s2mpg15_ldo26-supply = <&s_ldo26_reg>;
 				s2mpg15_ldo12-supply = <&s_ldo12_reg>;
@@ -726,8 +735,8 @@
 				gpio4-supply = <&slg51002_gpio4>;
 				/* MCLK Control */
 				pinctrl-names = "mclk_on", "mclk_off";
-				pinctrl-0 = <&sensor_mclk4_fn>;
-				pinctrl-1 = <&sensor_mclk4_out>;
+				pinctrl-0 = <&sensor_mclk4_fn &sensor_mclk8_out &ldaf_irq>;
+				pinctrl-1 = <&sensor_mclk4_out &sensor_mclk8_out &ldaf_irq>;
 				/* Power sequence */
 				power-seq = <&rear_camera_power_seq>;
 			};
@@ -880,6 +889,7 @@
 				/* GPIOs */
 				enable-gpios = <&s2mpg15_gpio 2 GPIO_ACTIVE_HIGH>;
 				reset-gpios = <&gpp2 2 GPIO_ACTIVE_HIGH>;
+				tof-reset-gpios = <&gpp15 0 GPIO_ACTIVE_HIGH>;
 				/* Power supplies */
 				s2mpg15_ldo26-supply = <&s_ldo26_reg>;
 				s2mpg15_ldo12-supply = <&s_ldo12_reg>;
@@ -890,8 +900,8 @@
 				gpio4-supply = <&slg51002_gpio4>;
 				/* MCLK Control */
 				pinctrl-names = "mclk_on", "mclk_off";
-				pinctrl-0 = <&sensor_mclk4_fn>;
-				pinctrl-1 = <&sensor_mclk4_out>;
+				pinctrl-0 = <&sensor_mclk4_fn &sensor_mclk8_out &ldaf_irq>;
+				pinctrl-1 = <&sensor_mclk4_out &sensor_mclk8_out &ldaf_irq>;
 				/* Power sequence */
 				power-seq = <&rear_camera_power_seq>;
 
@@ -1050,6 +1060,7 @@
 				/* GPIOs */
 				enable-gpios = <&s2mpg15_gpio 2 GPIO_ACTIVE_HIGH>;
 				reset-gpios = <&gpp2 2 GPIO_ACTIVE_HIGH>;
+				tof-reset-gpios = <&gpp15 0 GPIO_ACTIVE_HIGH>;
 				/* Power supplies */
 				s2mpg15_ldo26-supply = <&s_ldo26_reg>;
 				s2mpg15_ldo12-supply = <&s_ldo12_reg>;
@@ -1060,8 +1071,8 @@
 				gpio4-supply = <&slg51002_gpio4>;
 				/* MCLK Control */
 				pinctrl-names = "mclk_on", "mclk_off";
-				pinctrl-0 = <&sensor_mclk4_fn>;
-				pinctrl-1 = <&sensor_mclk4_out>;
+				pinctrl-0 = <&sensor_mclk4_fn &sensor_mclk8_out &ldaf_irq>;
+				pinctrl-1 = <&sensor_mclk4_out &sensor_mclk8_out &ldaf_irq>;
 				/* Power sequence */
 				power-seq = <&rear_camera_power_seq>;
 
@@ -1186,22 +1197,23 @@
 				reg-addr-bitwidth = <16>;
 				reg-value-bitwidth = <8>;
 
+				/* GPIOs */
+				enable-gpios = <&s2mpg15_gpio 2 GPIO_ACTIVE_HIGH>;
+				reset-gpios = <&gpp2 2 GPIO_ACTIVE_HIGH>;
+				tof-reset-gpios = <&gpp15 0 GPIO_ACTIVE_HIGH>;
 				/* Power supplies */
-				/* VIO 1.8V */
-				s2mpg15_ldo12-supply = <&s_ldo12_reg>;
-				/* VADD 3.3V */
 				s2mpg15_ldo26-supply = <&s_ldo26_reg>;
+				s2mpg15_ldo12-supply = <&s_ldo12_reg>;
 				ldo1-supply = <&slg51002_ldo1>;
 				ldo8-supply = <&slg51002_ldo8>;
-
-				/* XAPC_MCLK8: GPP15[0] */
-				reset-gpios = <&gpp15 0 GPIO_ACTIVE_HIGH>;
+				ldo4-supply = <&slg51002_ldo4>;
+				ldo5-supply = <&slg51002_ldo5>;
+				gpio4-supply = <&slg51002_gpio4>;
 
 				/* MCLK and TOF IRQ Control*/
-				pinctrl-names = "mclk_on", "mclk_off", "default";
-				pinctrl-0 = <&sensor_mclk8_fn>;
-				pinctrl-1 = <&sensor_mclk8_out>;
-				pinctrl-2 = <&ldaf_irq>;
+				pinctrl-names = "mclk_on", "mclk_off";
+				pinctrl-0 = <&sensor_mclk4_fn &sensor_mclk8_out &ldaf_irq>;
+				pinctrl-1 = <&sensor_mclk4_out &sensor_mclk8_out &ldaf_irq>;
 
 				/* XEINT_4: GPA5[4] */
 				irq-gpios = <&gpa5 4 GPIO_ACTIVE_LOW>;
@@ -1210,48 +1222,8 @@
 				/* IRQF_ONESHOT | IRQF_TRIGGER_FALLING */
 				irq-gpios-types = <0x2002>;
 
-				/* Power up sequence */
-				power-up-seqs =
-					"ldo1",
-					"ldo8",
-					"mclk_off",
-					"s2mpg15_ldo12",
-					"s2mpg15_ldo26",
-					"reset";
-				power-up-seq-types =
-					"regulator",
-					"regulator",
-					"pinctrl",
-					"regulator",
-					"regulator",
-					"gpio";
-				power-up-seq-delays-us =
-					<500
-					 750
-					 0
-					 0
-					 0
-					 1000>;
-
-				/* Power down sequence */
-				power-down-seqs =
-					"reset",
-					"s2mpg15_ldo26",
-					"s2mpg15_ldo12",
-					"ldo8",
-					"ldo1";
-				power-down-seq-types =
-					"gpio",
-					"regulator",
-					"regulator",
-					"regulator",
-					"regulator";
-				power-down-seq-delays-us =
-					<1000
-					 0
-					 500
-					 500
-					 0>;
+				/* Power sequence */
+				power-seq = <&rear_camera_power_seq>;
 
 				i2c-lock-group-id = <0>;
 				transaction-process-limit = <1>;