diff --git a/arch/arm64/boot/dts/google/gs101-oriole-camera.dtsi b/arch/arm64/boot/dts/google/gs101-oriole-camera.dtsi
index 7c19938ce5cdee625504dae3d24339836ad4b5d8..1ecc1de4aba8f4d01ec4cd2ca72fba3f7cf36a7b 100644
--- a/arch/arm64/boot/dts/google/gs101-oriole-camera.dtsi
+++ b/arch/arm64/boot/dts/google/gs101-oriole-camera.dtsi
@@ -99,10 +99,11 @@
 	status = "okay";
 	clock-frequency = <370000>;
 
-	pinctrl-names = "default","on_i2c","off_i2c";
+	pinctrl-names = "default","on_i2c","off_i2c","recovery";
 	pinctrl-0 = <&hsi2c7_bus &spi14_cs2>;
 	pinctrl-1 = <&hsi2c7_bus>;
 	pinctrl-2 = <&hsi2c7_bus>;
+	pinctrl-3 = <>;
 };
 
 &sensor_mclk2_fn {
diff --git a/arch/arm64/boot/dts/google/gs101-raven-camera.dtsi b/arch/arm64/boot/dts/google/gs101-raven-camera.dtsi
index 898234cdd90db27faae51f93a495bf7ba2bbb980..04560c4dabe8856a596dc7df454382b792f96101 100644
--- a/arch/arm64/boot/dts/google/gs101-raven-camera.dtsi
+++ b/arch/arm64/boot/dts/google/gs101-raven-camera.dtsi
@@ -124,10 +124,11 @@
 	status = "okay";
 	clock-frequency = <370000>;
 
-	pinctrl-names = "default","on_i2c","off_i2c";
+	pinctrl-names = "default","on_i2c","off_i2c","recovery";
 	pinctrl-0 = <&hsi2c7_bus &spi14_cs2>;
 	pinctrl-1 = <&hsi2c7_bus>;
 	pinctrl-2 = <&hsi2c7_bus>;
+	pinctrl-3 = <>;
 };
 
 / {
diff --git a/arch/arm64/boot/dts/google/gs101-usi.dtsi b/arch/arm64/boot/dts/google/gs101-usi.dtsi
index b820f3b3a31fc9b951dc5dabb128b26e9a593b75..9c4cf6e71c6a5edf5098e61307ef28ce78b0ca83 100644
--- a/arch/arm64/boot/dts/google/gs101-usi.dtsi
+++ b/arch/arm64/boot/dts/google/gs101-usi.dtsi
@@ -206,8 +206,9 @@
 		samsung,scl-clk-stretching;
 		samsung,usi-i2c-v2;
 		interrupts = <GIC_SPI IRQ_USI7_USI_PERIC0 ITLH>;
-		pinctrl-names = "default";
+		pinctrl-names = "default", "recovery";
 		pinctrl-0 = <&hsi2c7_bus>;
+		pinctrl-1 = <>;
 		clocks = <&clock VDOUT_CLK_PERIC0_USI7_USI>, <&clock GATE_PERIC0_TOP0_USI7_USI>;
 		clock-names = "ipclk_hsi2c", "gate_hsi2c_clk";
 		gpio_scl= <&gpp14 0 0x1>;
diff --git a/arch/arm64/boot/dts/google/gs201-cs40l26a-config.dtsi b/arch/arm64/boot/dts/google/gs201-cs40l26a-config.dtsi
index 110391c6630e14ee97d0a3ebf4d59529224b63e7..eb771743662542e157f6a81db3ae6475513cdfd9 100644
--- a/arch/arm64/boot/dts/google/gs201-cs40l26a-config.dtsi
+++ b/arch/arm64/boot/dts/google/gs201-cs40l26a-config.dtsi
@@ -68,9 +68,6 @@
 	#size-cells = <0>;
 	status = "okay";
 
-	pinctrl-names = "default";
-	pinctrl-0 = <&hsi2c8_bus>;
-
 	clock-frequency = <400000>;
 
 	cs40l26a_haptics: cs40l26a@43 {
diff --git a/arch/arm64/boot/dts/google/gs201-usi.dtsi b/arch/arm64/boot/dts/google/gs201-usi.dtsi
index 1c96a5ea1700c486c199d61af2ce7142c89e6884..933def870fea73eaff98e8e3a4b9c3d4d250470b 100644
--- a/arch/arm64/boot/dts/google/gs201-usi.dtsi
+++ b/arch/arm64/boot/dts/google/gs201-usi.dtsi
@@ -234,8 +234,9 @@
 		samsung,no_lose_arbitration;
 		samsung,usi-i2c-v2;
 		interrupts = <GIC_SPI IRQ_USI8_USI_PERIC0 ITLH>;
-		pinctrl-names = "default";
+		pinctrl-names = "default", "recovery";
 		pinctrl-0 = <&hsi2c8_bus>;
+		pinctrl-1 = <>;
 		clocks = <&clock VDOUT_CLK_PERIC0_USI8_USI>, <&clock GATE_PERIC0_TOP0_USI8_USI>;
 		clock-names = "ipclk_hsi2c", "gate_hsi2c_clk";
 		gpio_scl= <&gpp16 0 0x1>;