Skip to content

clk: samsung: zumapro: Add CMU_APM - #76

Closed
W4HO-ham wants to merge 8 commits into
derekross:omamobilefrom
W4HO-ham:tegu-apm-clocks
Closed

W4HO-ham wants to merge 8 commits into
derekross:omamobilefrom
W4HO-ham:tegu-apm-clocks

Conversation

@W4HO-ham

@W4HO-ham W4HO-ham commented Oct 27, 2026 •

Copy link
Copy Markdown
Contributor

Stacked on #75 (PERIC1), #74 and #73. Rebased onto omamobile after #40's merge. Only the last two commits are new: dt-bindings: clock: google,zumapro: Add CMU_APM and clk: samsung: zumapro: Add CMU_APM.

CMU_APM clocks the always-on GPIO banks (ALIVE, FAR_ALIVE, CUSTOM_ALIVE), the APM mailbox that ACPM talks through, and the APM's internal memory. It's built in the same shape as the others:

  • Common path: exynos_arm64_register_cmu(). There's no bus input: like gs101's and gs201's, its only DT input is oscclk.
  • Read-only state: the FUNC and FUNCSRC muxes and the NoC and USI1 UART dividers are read-only, and the gates are read-only gates.
  • Rates: the ALV PLL's four dividers are fixed rates, as on gs101. The CAL gives the zuma family nominal figures: 787 MHz for the ALV PLL and 400/200/100/50 MHz for its dividers, against a 26 MHz oscillator. The ALV PLL runs at 32 times the real 24.576 MHz oscillator, 786.432 MHz, so the dividers are exact fractions of that: 393.216, 196.608, 98.304 and 49.152 MHz. The external pad input (pad_clk_apm) isn't described, also as on gs101.
  • Binding: google,zumapro-cmu-apm takes oscclk only, sharing CMU_TOP's rule, and gets its 20 ids in a new block.

I checked every offset, width and parent list against zuma's CAL. That covers all 12 gate offsets, the 2-bit FUNC and FUNCSRC selects with their parent orders, and the 3-bit NoC and 7-bit UART dividers.

Boot: our integration kernel used to register APM through a private probe with 26 MHz nominal fixed inputs. I replaced that with exactly this commit's tables on the common path, added oscclk to its DT node, and booted the palmtop. zumapro_mout_apm_func and zumapro_dout_apm_noc read 393.216 MHz, from ALV/2. The three always-on pin controllers (154d0000, 154e0000, 15060000) and the APM mailbox (15110000.mailbox) take their clocks from it. ACPM-backed cpufreq, thermal and the GPU's DVFS came up as before, and nothing was left deferred.

checkpatch --strict is clean on both commits, clk-zumapro.o builds with W=1, and dt_binding_check passes for the binding.

@derekross

Copy link
Copy Markdown
Owner

APM matches the CAL: FUNC and FUNCSRC on bits [1:0] with the parent orders as listed, the 3-bit NoC and 7-bit UART dividers, and all twelve gates and their parents. The fixed rates are gs101's exact values and leaving pad_clk_apm undescribed follows gs101 too; with no clk_regs, nothing is ever written to the firmware's block, which is how I want APM treated. Nothing to change; it lands after #75. A uname -r and blob id for the boot would complete the message.

CMU_G3D clocks the Tensor G4's Mali GPU: two PLLs (the stacks' and the
L2's), user muxes for CMU_TOP's G3D NoC, global and switch clocks, and
the GPU's core, coregroup and stacks clocks. Describe it in the common
Tensor G4 clock binding with its four inputs, and add CMU_TOP's three
G3D branches (mux, gate and divider each) and the SHARED0 and SHARED1
halves and thirds those branches select at the end of the TOP block
and the 19 CMU_G3D identifiers in a new block, leaving the existing ones
unchanged.

Link: https://android.googlesource.com/kernel/google-modules/soc/gs/+/204078758737776959ecc85c527a00fd2cabb62f/drivers/soc/google/cal-if/zuma/cmucal-node.c
Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
Register CMU_G3D, the Mali GPU's clock unit, on the common
exynos_arm64_register_cmu() path with its bus input, and CMU_TOP's three
G3D branches it takes its inputs from. Firmware sets G3D up and keeps
its domain on: the two PLLs (PLL0822x, no rate table), the muxes and the
dividers are read-only, and the GPU's core, coregroup and stacks gates
and the CMU's own gate are read-only gates, as are CMU_TOP's three G3D
gates. The STACKS and L2_GLB dividers have no ratio field in the CAL
(only busy and auto-gating bits), so they are 1:1 factors. The GPU's
rate changes go through the ACPM firmware, not this CMU.

Every offset, width and parent list was checked against zuma's cmucal-
sfr.c and cmucal-node.c. On the Pixel 9a the integration kernel
7.3.0-rc6-omamobile-tegu-s2mpg15-m1-g991042e2eff3-dirty, whose clk-
zumapro.c (blob ae4948e0dd60) has these G3D and CMU_TOP G3D tables,
registers the 30 G3D clocks and runs Panthor on the core, coregroup and
stacks gates (fout_g3d at 149.9 MHz, gout_g3d_core at 159.7 MHz).

CMU_TOP's G3D GLB and SWITCH muxes also select SHARED0 and SHARED1
divided by 2 and 3, which the driver didn't register, so a mux left
on one of them would be an orphan reading 0 Hz. Add the four fixed
factors (the CAL's PLL_SHARED0_D2 and _D3, PLL_SHARED1_D2 and _D3).
On the Pixel 9a the bootloader leaves the GLB mux on SHARED0_D2:
mout/gout_g3d_glb read 1065.984 MHz and dout_g3d_glb 532.992 MHz;
NOCD and SWITCH are on SHARED2 (798.72 MHz), dout_g3d_nocd 133.12
and dout_g3d_switch 266.24 MHz.

Link: https://android.googlesource.com/kernel/google-modules/soc/gs/+/204078758737776959ecc85c527a00fd2cabb62f/drivers/soc/google/cal-if/zuma/cmucal-sfr.c
Link: https://android.googlesource.com/kernel/google-modules/soc/gs/+/204078758737776959ecc85c527a00fd2cabb62f/drivers/soc/google/cal-if/zuma/cmucal-node.c
Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
CMU_HSI1 clocks the HSI1 block's GPIO bank (the modem's control lines,
the haptics reset). Describe it in the common Tensor G4 clock binding
with its three inputs: the oscillator, CMU_TOP's HSI1 NoC clock and the
board's 400 MHz ALT fixed clock. Allow a power domain for it as for
HSI0, which firmware keeps on today. Add CMU_TOP's HSI1 branch at the
end of the TOP block and the 7 CMU_HSI1 identifiers in a new block,
leaving the existing ones unchanged.

Link: https://android.googlesource.com/kernel/google-modules/soc/gs/+/204078758737776959ecc85c527a00fd2cabb62f/drivers/soc/google/cal-if/zuma/cmucal-node.c
Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
Register CMU_HSI1 on the common exynos_arm64_register_cmu() path with
its bus input, and CMU_TOP's HSI1 NoC branch. Firmware keeps the domain
powered and owns its setup: the NoC and ALT user muxes, the local NoC mux
and the ALT divider are read-only, and the ALT, GPIO and CMU gates are
read-only gates. Only the GPIO bank's clock path is described; the PCIe
channel 0 clocks are not. The ALT gate's parent is the board's 400 MHz
hsi1-alt fixed clock, found by name as HSI0's ALT and TCXO inputs are.

Every offset, width and parent list was checked against zuma's
cmucal-sfr.c and cmucal-node.c.

Booted on the Pixel 9a:
7.3.0-rc6-omamobile-tegu-s2mpg15-m1-g991042e2eff3-dirty, whose
clk-zumapro.c (blob c1db3a4a7736) carries these clocks under that
tree's own clock ids.

Link: https://android.googlesource.com/kernel/google-modules/soc/gs/+/204078758737776959ecc85c527a00fd2cabb62f/drivers/soc/google/cal-if/zuma/cmucal-sfr.c
Link: https://android.googlesource.com/kernel/google-modules/soc/gs/+/204078758737776959ecc85c527a00fd2cabb62f/drivers/soc/google/cal-if/zuma/cmucal-node.c
Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
CMU_PERIC1 clocks the PERIC1 GPIO bank and USI9, the I2C bus of the
Pixel 9a's NFC controller and haptics driver. Describe it in the common
Tensor G4 clock binding with its three inputs: the oscillator and
CMU_TOP's PERIC1 NoC and IP clocks. Add CMU_TOP's two PERIC1 branches at
the end of the TOP block and the 8 CMU_PERIC1 identifiers in a new
block, leaving the existing ones unchanged.

Link: https://android.googlesource.com/kernel/google-modules/soc/gs/+/204078758737776959ecc85c527a00fd2cabb62f/drivers/soc/google/cal-if/zuma/cmucal-node.c
Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
Register CMU_PERIC1 on the common exynos_arm64_register_cmu() path with
its bus input, and CMU_TOP's PERIC1 NoC and IP branches. Firmware sets
the block up: the NoC and USI9 user muxes and the USI9 divider are
read-only, and the GPIO, sysreg and USI9 gates are read-only gates. USI9
is the I2C bus of the Pixel 9a's NFC controller and haptics driver.

Every offset, width and parent list was checked against zuma's
cmucal-sfr.c and cmucal-node.c.

Booted on the Pixel 9a:
7.3.0-rc6-omamobile-tegu-s2mpg15-m1-g991042e2eff3-dirty, whose
clk-zumapro.c (blob c1db3a4a7736) carries these clocks under that
tree's own clock ids.

Link: https://android.googlesource.com/kernel/google-modules/soc/gs/+/204078758737776959ecc85c527a00fd2cabb62f/drivers/soc/google/cal-if/zuma/cmucal-sfr.c
Link: https://android.googlesource.com/kernel/google-modules/soc/gs/+/204078758737776959ecc85c527a00fd2cabb62f/drivers/soc/google/cal-if/zuma/cmucal-node.c
Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
CMU_APM clocks the always-on GPIO banks, the APM mailbox and its
internal memory. Describe it in the common Tensor G4 clock binding with
the oscillator as its only input, as on gs101 and gs201, and add its 20
identifiers in a new block, leaving the existing ones unchanged.

Link: https://android.googlesource.com/kernel/google-modules/soc/gs/+/204078758737776959ecc85c527a00fd2cabb62f/drivers/soc/google/cal-if/zuma/cmucal-node.c
Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
Register CMU_APM, which clocks the always-on GPIO banks, the APM mailbox
and its internal memory, on the common exynos_arm64_register_cmu() path.
Firmware sets it up and keeps it on: the FUNC and FUNCSRC muxes and the
NoC and USI1 UART dividers are read-only, and its gates are read-only
gates.

Its sources are the oscillator, from the DT, and the always-on ALV PLL's
four dividers, as fixed rates like gs101's. The CAL gives nominal figures
for the zuma family (787 MHz for the ALV PLL, 400, 200, 100 and 50 MHz
for its dividers, against a 26 MHz oscillator); the ALV PLL runs at 32
times the real 24.576 MHz oscillator, 786.432 MHz, so the dividers are
given as exact fractions of that. The external pad input is not
described, as on gs101.

Every offset, width and parent list was checked against zuma's
cmucal-sfr.c and cmucal-node.c.

Booted on the Pixel 9a:
7.3.0-rc6-omamobile-tegu-s2mpg15-m1-g991042e2eff3-dirty, whose
clk-zumapro.c (blob c1db3a4a7736) carries these clocks under that
tree's own clock ids.

Link: https://android.googlesource.com/kernel/google-modules/soc/gs/+/204078758737776959ecc85c527a00fd2cabb62f/drivers/soc/google/cal-if/zuma/cmucal-sfr.c
Link: https://android.googlesource.com/kernel/google-modules/soc/gs/+/204078758737776959ecc85c527a00fd2cabb62f/drivers/soc/google/cal-if/zuma/cmucal-node.c
Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
@derekross

Copy link
Copy Markdown
Owner

Landed through #79, which carried this commit with the rest of the stack. Thanks!

@derekross derekross closed this Oct 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants