From f54748b02af32a933781c0d18303d29cde166300 Mon Sep 17 00:00:00 2001 From: Lef Date: Sat, 7 Nov 2026 11:42:47 +0200 Subject: [PATCH 1/3] dt-bindings: clock: google,zuma-clock: add CMU_HSI0 USI3 clock IDs The Pixel 8 Pro's GNSS receiver sits on HSI0 USI3 (Google's spi_21). Add the IDs for its mux, divider and the three gates, in the same shape as USI2's, after USI2's IDs. Only the header; the clock driver follows. Signed-off-by: Lef --- include/dt-bindings/clock/google,zuma.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/dt-bindings/clock/google,zuma.h b/include/dt-bindings/clock/google,zuma.h index a226cae5a7..05db2859f4 100644 --- a/include/dt-bindings/clock/google,zuma.h +++ b/include/dt-bindings/clock/google,zuma.h @@ -33,7 +33,7 @@ #define CLK_DOUT_PERIC0_NOC 26 #define CLK_DOUT_PERIC0_IP 27 -/* CMU_HSI0: USI2, the touchscreen's SPI. */ +/* CMU_HSI0: USI2, the touchscreen's SPI, and USI3, the GNSS receiver's SPI. */ #define CLK_GOUT_HSI0_ALT 1 #define CLK_MOUT_HSI0_NOC_USER 2 #define CLK_MOUT_HSI0_ALT_USER 3 @@ -44,6 +44,11 @@ #define CLK_DOUT_HSI0_USI2 8 #define CLK_GOUT_HSI0_USI2_IP 9 #define CLK_GOUT_HSI0_USI2_PCLK 10 +#define CLK_MOUT_HSI0_USI3 11 +#define CLK_GOUT_HSI0_USI3_SOURCE 12 +#define CLK_DOUT_HSI0_USI3 13 +#define CLK_GOUT_HSI0_USI3_IP 14 +#define CLK_GOUT_HSI0_USI3_PCLK 15 /* * CMU_PERIC1: USI11, the I2C bus of the battery, charger and USB-C chips, and From 8a6e7b473f3a0ebe6943a76107fe468bd42c6f16 Mon Sep 17 00:00:00 2001 From: Lef Date: Sat, 7 Nov 2026 11:42:48 +0200 Subject: [PATCH 2/3] clk: samsung: clk-zuma: add CMU_HSI0 USI3 clocks Add the USI3 mux, divider and gates next to USI2's, with the same shape, parents and flags, so a spi21 node can take its clocks. The registers are Google's, from the zuma CMU_HSI0 tables: the mux CLK_CON_MUX_MUX_CLK_HSI0_USI3 at 0x1020, the divider CLK_CON_DIV_DIV_CLK_HSI0_USI3 at 0x1820, the source gate CLK_CON_GAT_GATE_CLK_HSI0_USI3 at 0x2124, the IP clock gate at 0x2104 and the PCLK gate at 0x2108, bit 21 as for USI2. CLK_IGNORE_UNUSED keeps the gates as the bootloader left them until a spi21 node is enabled; nothing consumes them in the default device tree. The three gate registers join hsi0_regs, as USI2's did. As for USI2, the divider is not in that list and the RSTNSYNC gate is not described. Built, not booted. Signed-off-by: Lef --- drivers/clk/samsung/clk-zuma.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/clk/samsung/clk-zuma.c b/drivers/clk/samsung/clk-zuma.c index 833d676e8b..03648acdb1 100644 --- a/drivers/clk/samsung/clk-zuma.c +++ b/drivers/clk/samsung/clk-zuma.c @@ -220,11 +220,15 @@ static const struct samsung_mux_clock hsi0_muxes[] __initconst = { mout_hsi0_peri_user_parents, 0x680, 4, 1, 0, CLK_MUX_READ_ONLY), MUX_F(CLK_MOUT_HSI0_USI2, "zuma_mout_hsi0_usi2", mout_hsi0_usi2_parents, 0x101c, 0, 1, 0, CLK_MUX_READ_ONLY), + MUX_F(CLK_MOUT_HSI0_USI3, "zuma_mout_hsi0_usi3", mout_hsi0_usi2_parents, + 0x1020, 0, 1, 0, CLK_MUX_READ_ONLY), }; static const struct samsung_div_clock hsi0_dividers[] __initconst = { DIV(CLK_DOUT_HSI0_USI2, "zuma_dout_hsi0_usi2", "zuma_gout_hsi0_usi2_source", 0x181c, 0, 4), + DIV(CLK_DOUT_HSI0_USI3, "zuma_dout_hsi0_usi3", + "zuma_gout_hsi0_usi3_source", 0x1820, 0, 4), }; static const struct samsung_gate_clock hsi0_gates[] __initconst = { @@ -235,6 +239,13 @@ static const struct samsung_gate_clock hsi0_gates[] __initconst = { CLK_IGNORE_UNUSED | CLK_SET_RATE_PARENT, 0), GATE(CLK_GOUT_HSI0_USI2_PCLK, "zuma_gout_hsi0_usi2_pclk", "zuma_mout_hsi0_noc_local", 0x2100, 21, CLK_IGNORE_UNUSED, 0), + GATE(CLK_GOUT_HSI0_USI3_SOURCE, "zuma_gout_hsi0_usi3_source", + "zuma_mout_hsi0_usi3", 0x2124, 21, CLK_IGNORE_UNUSED, 0), + GATE(CLK_GOUT_HSI0_USI3_IP, "zuma_gout_hsi0_usi3_ip", + "zuma_dout_hsi0_usi3", 0x2104, 21, + CLK_IGNORE_UNUSED | CLK_SET_RATE_PARENT, 0), + GATE(CLK_GOUT_HSI0_USI3_PCLK, "zuma_gout_hsi0_usi3_pclk", + "zuma_mout_hsi0_noc_local", 0x2108, 21, CLK_IGNORE_UNUSED, 0), }; /* Firmware-owned gates are observed, never switched. */ @@ -243,9 +254,9 @@ static const struct samsung_gate_clock hsi0_ro_gates[] __initconst = { 0x204c, 21, CLK_IGNORE_UNUSED, 0), }; -/* USI2's gates run in manual mode; the rest of HSI0 is left alone. */ +/* The USI2 and USI3 gates run in manual mode; the rest of HSI0 is left alone. */ static const unsigned long hsi0_regs[] __initconst = { - 0x2120, 0x20fc, 0x2100, + 0x2120, 0x20fc, 0x2100, 0x2124, 0x2104, 0x2108, }; static const struct samsung_cmu_info hsi0_cmu __initconst = { @@ -257,7 +268,7 @@ static const struct samsung_cmu_info hsi0_cmu __initconst = { .nr_gate_clks = ARRAY_SIZE(hsi0_gates), .ro_gate_clks = hsi0_ro_gates, .nr_ro_gate_clks = ARRAY_SIZE(hsi0_ro_gates), - .nr_clk_ids = CLK_GOUT_HSI0_USI2_PCLK + 1, + .nr_clk_ids = CLK_GOUT_HSI0_USI3_PCLK + 1, .clk_regs = hsi0_regs, .nr_clk_regs = ARRAY_SIZE(hsi0_regs), .clk_name = "bus", From dd79ff09fab496ad8ff2e464f410739b5bf0a4de Mon Sep 17 00:00:00 2001 From: Lef Date: Sat, 7 Nov 2026 11:42:56 +0200 Subject: [PATCH 3/3] arm64: dts: exynos: google: zuma: add HSI0 USI3 and spi21, disabled A USI wrapper and the SPI controller under it for HSI0 USI3 (Google's spi_21, the Pixel 8 Pro's GNSS receiver bus), laid out like USI2 and its spi20. Both are status = "disabled", so nothing changes for any board that includes zuma.dtsi until one enables them. Values are from Google's zuma USI tables and the stock device tree (one node at 0x111e0000, split here at 0xc0 like spi20): USI registers 0x111e00c0 and SPI registers 0x111e0000, interrupt GIC SPI 409, USI sysreg offset 0x1020. No DMA, no power domain and no pin group, as for spi20: stock's spi_21 has no pin group either. Built, not booted. Signed-off-by: Lef --- arch/arm64/boot/dts/exynos/google/zuma.dtsi | 31 +++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/arch/arm64/boot/dts/exynos/google/zuma.dtsi b/arch/arm64/boot/dts/exynos/google/zuma.dtsi index 21c184ae87..4c4b5f511a 100644 --- a/arch/arm64/boot/dts/exynos/google/zuma.dtsi +++ b/arch/arm64/boot/dts/exynos/google/zuma.dtsi @@ -595,6 +595,37 @@ }; }; + /* + * USI3 on HSI0: the SPI of the Pixel 8 Pro's GNSS receiver (Google's + * spi_21). Same layout as USI2 above. + */ + usi3_hsi0: usi@111e00c0 { + compatible = "google,zuma-usi", "samsung,exynos850-usi"; + reg = <0x111e00c0 0x20>; + clocks = <&cmu_hsi0 CLK_GOUT_HSI0_USI3_PCLK>, + <&cmu_hsi0 CLK_GOUT_HSI0_USI3_IP>; + clock-names = "pclk", "ipclk"; + samsung,sysreg = <&sysreg_hsi0 0x1020>; + samsung,mode = ; + #address-cells = <1>; + #size-cells = <1>; + ranges; + status = "disabled"; + + spi21: spi@111e0000 { + compatible = "google,zuma-spi", "google,gs101-spi"; + /* USI control starts at 0xc0; do not claim it twice. */ + reg = <0x111e0000 0xc0>; + interrupts = ; + clocks = <&cmu_hsi0 CLK_GOUT_HSI0_USI3_PCLK>, + <&cmu_hsi0 CLK_GOUT_HSI0_USI3_IP>; + clock-names = "spi", "spi_busclk0"; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + }; + /* * The DWC3 controller, in peripheral mode as on stock (which * wraps it in Google's exynos9-dwusb glue). On a normal boot