From 2429fa3e8adaff6341208fc3d7775da56d6ea826 Mon Sep 17 00:00:00 2001
From: Zheng Pan <zhengpan@google.com>
Date: Tue, 20 Aug 2024 10:56:50 -0700
Subject: [PATCH] arm64/dts: gs101/gs201: Add recovery state for hsi2c_7
hsi2c_8
Add hsi2c_7 for gs101
Add hsi2c_8 for gs201
Request is from NFC
Bug: 360739836
Test: build pass
Change-Id: I8068ca5a2fe00cf93347080df14c0a66a37399a9
Signed-off-by: Zheng Pan <zhengpan@google.com>
---
arch/arm64/boot/dts/google/gs101-oriole-camera.dtsi | 3 ++-
arch/arm64/boot/dts/google/gs101-raven-camera.dtsi | 3 ++-
arch/arm64/boot/dts/google/gs101-usi.dtsi | 3 ++-
arch/arm64/boot/dts/google/gs201-cs40l26a-config.dtsi | 3 ---
arch/arm64/boot/dts/google/gs201-usi.dtsi | 3 ++-
5 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/arch/arm64/boot/dts/google/gs101-oriole-camera.dtsi b/arch/arm64/boot/dts/google/gs101-oriole-camera.dtsi
index 7c19938ce5cde..1ecc1de4aba8f 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 898234cdd90db..04560c4dabe88 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 b820f3b3a31fc..9c4cf6e71c6a5 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 110391c6630e1..eb77174366254 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 1c96a5ea1700c..933def870fea7 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>;
--
GitLab