diff options
| author | Jacky Liu <qsliu@google.com> | 2024-02-02 14:17:37 +0800 |
|---|---|---|
| committer | Jacky Liu <qsliu@google.com> | 2024-02-07 02:26:17 +0000 |
| commit | 8f8c606d5af32c52234ac22cb08b187397bf26e4 (patch) | |
| tree | f34d070a82660a51c00373e6f5fb3417aac84199 | |
| parent | 6be2be08e472710717dd6dc08e828f72090a8e1c (diff) | |
| download | gs-8f8c606d5af32c52234ac22cb08b187397bf26e4.tar.gz | |
arm64/dts: gs101/gs201: Statically assign i2c bus numbers
Statically assign i2c bus numbers for gs201, and update i2c bus number
for gs101 to be aligned with gs201.
Bug: 323447554
Change-Id: I8a1abe22b471800c32304b4366b9c3711c8b1880
Signed-off-by: Jacky Liu <qsliu@google.com>
| -rw-r--r-- | arch/arm64/boot/dts/google/gs101-usi.dtsi | 26 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/google/gs101.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/google/gs201-usi.dtsi | 37 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/google/gs201.dtsi | 2 |
4 files changed, 41 insertions, 28 deletions
diff --git a/arch/arm64/boot/dts/google/gs101-usi.dtsi b/arch/arm64/boot/dts/google/gs101-usi.dtsi index 895c4c79e498..b820f3b3a31f 100644 --- a/arch/arm64/boot/dts/google/gs101-usi.dtsi +++ b/arch/arm64/boot/dts/google/gs101-usi.dtsi @@ -8,15 +8,23 @@ / { aliases { - /* i2c0 and i2c1 are assigned to the acpm_mfd_busses. */ - i2c2 = &hsi2c_1; - i2c3 = &hsi2c_2; - i2c4 = &hsi2c_3; - i2c5 = &hsi2c_4; - i2c6 = &hsi2c_7; - i2c7 = &hsi2c_8; - i2c8 = &hsi2c_12; - i2c9 = &hsi2c_0; /* i2c9 is used for slider's WC_BUS hack */ + i2c0 = &hsi2c_0; + i2c1 = &hsi2c_1; + i2c2 = &hsi2c_2; + i2c3 = &hsi2c_3; + i2c4 = &hsi2c_4; + i2c5 = &hsi2c_5; + i2c6 = &hsi2c_6; + i2c7 = &hsi2c_7; + i2c8 = &hsi2c_8; + i2c9 = &hsi2c_9; + i2c10 = &hsi2c_10; + i2c11 = &hsi2c_11; + i2c12 = &hsi2c_12; + i2c13 = &hsi2c_13; + i2c14 = &hsi2c_14; + // i2c20 is assigned to acpm_mfd_bus0 + // i2c21 is assigned to acpm_mfd_bus1 spi0 = &spi_0; spi1 = &spi_1; diff --git a/arch/arm64/boot/dts/google/gs101.dtsi b/arch/arm64/boot/dts/google/gs101.dtsi index 90b40436aba2..0cbea9189217 100644 --- a/arch/arm64/boot/dts/google/gs101.dtsi +++ b/arch/arm64/boot/dts/google/gs101.dtsi @@ -49,8 +49,8 @@ #size-cells = <1>; aliases { - i2c0 = &acpm_mfd_bus0; - i2c1 = &acpm_mfd_bus1; + i2c20 = &acpm_mfd_bus0; + i2c21 = &acpm_mfd_bus1; pinctrl0 = &pinctrl_0; pinctrl1 = &pinctrl_1; pinctrl2 = &pinctrl_2; diff --git a/arch/arm64/boot/dts/google/gs201-usi.dtsi b/arch/arm64/boot/dts/google/gs201-usi.dtsi index 992e041d50e3..1c96a5ea1700 100644 --- a/arch/arm64/boot/dts/google/gs201-usi.dtsi +++ b/arch/arm64/boot/dts/google/gs201-usi.dtsi @@ -6,23 +6,26 @@ / { aliases { - hsi2c0 = &hsi2c_0; - hsi2c1 = &hsi2c_1; - hsi2c2 = &hsi2c_2; - hsi2c3 = &hsi2c_3; - hsi2c4 = &hsi2c_4; - hsi2c5 = &hsi2c_5; - hsi2c6 = &hsi2c_6; - hsi2c7 = &hsi2c_7; - hsi2c8 = &hsi2c_8; - hsi2c9 = &hsi2c_9; - hsi2c10 = &hsi2c_10; - hsi2c11 = &hsi2c_11; - hsi2c12 = &hsi2c_12; - hsi2c13 = &hsi2c_13; - hsi2c14 = &hsi2c_14; - hsi2c15 = &hsi2c_15; - hsi2c16 = &hsi2c_16; + i2c0 = &hsi2c_0; + i2c1 = &hsi2c_1; + i2c2 = &hsi2c_2; + i2c3 = &hsi2c_3; + i2c4 = &hsi2c_4; + i2c5 = &hsi2c_5; + i2c6 = &hsi2c_6; + i2c7 = &hsi2c_7; + i2c8 = &hsi2c_8; + i2c9 = &hsi2c_9; + i2c10 = &hsi2c_10; + i2c11 = &hsi2c_11; + i2c12 = &hsi2c_12; + i2c13 = &hsi2c_13; + i2c14 = &hsi2c_14; + i2c15 = &hsi2c_15; + i2c16 = &hsi2c_16; + // i2c20 is assigned to acpm_mfd_bus0 + // i2c21 is assigned to acpm_mfd_bus1 + spi0 = &spi_0; spi1 = &spi_1; spi2 = &spi_2; diff --git a/arch/arm64/boot/dts/google/gs201.dtsi b/arch/arm64/boot/dts/google/gs201.dtsi index 794d96b62409..be268234bd7a 100644 --- a/arch/arm64/boot/dts/google/gs201.dtsi +++ b/arch/arm64/boot/dts/google/gs201.dtsi @@ -47,6 +47,8 @@ #size-cells = <1>; aliases { + i2c20 = &acpm_mfd_bus0; + i2c21 = &acpm_mfd_bus1; pinctrl0 = &pinctrl_0; pinctrl1 = &pinctrl_1; pinctrl2 = &pinctrl_2; |