Skip to content

arm64: dts: exynos: google: zumapro: Add USI10 and its I2C controller - #136

Merged
derekross merged 1 commit into
derekross:omamobilefrom
W4HO-ham:tegu-dt-usi10
Nov 1, 2026
Merged

derekross merged 1 commit into
derekross:omamobilefrom
W4HO-ham:tegu-dt-usi10

Conversation

@W4HO-ham

Copy link
Copy Markdown
Contributor

The first piece of #127 on its own, as asked there: USI10 on PERIC1 and its HSI2C controller, disabled, on top of #119 (zumapro.dtsi comes from that stack; only the last commit is new). The board will enable it with its pins in a later commit, with the RT9470 node once its binding question is settled.

The node follows Google's zumapro-usi.dtsi (hsi2c_10 at 0x10CA0000, IRQ_USI10_USI_PERIC1, SCL/SDA on gpp20-0/1) and the interrupt number from the zumapro.h header in google-modules/soc/gs, both cited by commit in the message. The clocks are the merged PERIC1 USI10 ones (#102).

checkpatch --strict is clean. On the palmtop this node, enabled by the board overlay, bound hsi2c10 and talked to the RT9470 on 10-28 (USB-HOST-PLAN H3 on derekross/omarchy-mobile#136); nothing changes for the Pixel 7 Pro.

@derekross

Copy link
Copy Markdown
Owner

Thank you, @W4HO-ham. This is exactly the piece I asked for, and it came quickly.

What I checked:

  • The tree is identical to the USI10 commit I reviewed on Bring-up, not for merge: USB-C host mode on the Pixel 9a #127 (6310ca68780f): git diff 6310ca68780f ddd3bab6f4b2 is empty, so only the message changed.
  • Both links resolve to the lines you cite. In zumapro-usi.dtsi at 8831630eee2a, hsi2c_10 sits at 0x10CA0000 with samsung,usi-offset = <0x00000008> on sysreg_peric1 and gpio_scl/gpio_sda on gpp20 0 and 1. In zumapro.h at 204078758737, IRQ_USI10_USI_PERIC1 is 658, next to USI9's 657, which matches the hsi2c9 node already in the file.
  • The clocks are the merged CLK_GOUT_PERIC1_USI10_PCLK/_IPCLK. The node follows the usi9/hsi2c9 pattern line for line, and both nodes are disabled.
  • zumapro.dtsi is included only by zumapro-tegu.dts, so nothing changes for the Pixel 7 Pro.
  • The message has a human sign-off, the Link: trailers parse, and the subject prefix matches the file's history.

CI is green on this head: checkpatch, W=1, dtbs_check and dt_binding_check all ran over the whole stack. My own gate run, merged onto today's omamobile, agrees.

It sits on #119 (its parent is #119's head 57270956a73b), so it merges right after #119 and lands as its own commit. When the board commit comes, it needs to enable both usi10 and hsi2c10, as #127's does. Nothing more needed here.

@W4HO-ham

Copy link
Copy Markdown
Contributor Author

Thanks for checking it line by line. Nothing more from my side; the board commit will enable both usi10 and hsi2c10 with its pins, as #127's does.

@derekross

Copy link
Copy Markdown
Owner

Unchanged and still merge-ready in content; it waits on the stack below it. The status is in my note on #105.

@W4HO-ham

Copy link
Copy Markdown
Contributor Author

Rebased onto #119's new head (one commit, unchanged). Compiles; checkpatch clean.

@derekross

Copy link
Copy Markdown
Owner

Same patch as the one I checked. It follows #119 wherever that lands.

@W4HO-ham

Copy link
Copy Markdown
Contributor Author

Re-stacked onto the new #119 (and so onto #96, not #105): one commit of its own, unchanged. Device tree compiles, checkpatch clean.

@derekross

Copy link
Copy Markdown
Owner

Thanks, @W4HO-ham. It's the same patch as the one I checked on the 29th (its added and removed lines are identical), now on #119's new head. The gate passes merged onto today's omamobile, the 9a's DTB validates with no messages, the other Google DTBs are byte-identical to the base, and CI is green.

Nothing more is needed. It merges right after #119. When #96 and #119 are in, a git rebase omamobile leaves this one commit.

@W4HO-ham

W4HO-ham commented Nov 1, 2026

Copy link
Copy Markdown
Contributor Author

Rebased onto today's omamobile (with #96); details on #119.

@derekross

Copy link
Copy Markdown
Owner

Thanks, @W4HO-ham. The rebase changed only the base: both commits are the same patches as before, so my last review stands, and the gate passes merged onto today's omamobile with CI green.

One step left: #161 has now landed #119's commit. This branch has its own copy of that commit, so please git rebase omamobile once more. Git sees the patch is already there and drops it, leaving just "Add USI10 and its I2C controller", which applies cleanly on top of #161. Then I'll merge it.

@W4HO-ham

W4HO-ham commented Nov 1, 2026 •

Copy link
Copy Markdown
Contributor Author

Rebased onto omamobile (8b8235e). Git dropped the gauge commit as already applied through #161, so the branch is now just "Add USI10 and its I2C controller" (28eb4eb), the same patch as 9712003.

USI10 on PERIC1 carries the Pixel 9a's RT9470 (the USB OTG boost) at
0x5b. Add the USI and its HSI2C controller, disabled, with the clocks
from CMU_PERIC1 (merged as "clk: samsung: zumapro: Add the PERIC1 USI10
clocks"), PERIC1 sysreg offset 0x8 and GIC SPI 658. The board enables
it with its pins.

Google's zumapro-usi.dtsi describes hsi2c_10 at 0x10CA0000 with
IRQ_USI10_USI_PERIC1, SCL and SDA on gpp20-0 and gpp20-1, and the USI
at sysreg_peric1 offset 0x8; the header defines IRQ_USI10_USI_PERIC1 as
SPI 658. On the Pixel 9a the node, enabled by the board, bound hsi2c10
and talked to the RT9470.

Link: https://android.googlesource.com/kernel/devices/google/zumapro/+/8831630eee2ad095b85ed452944e6353940966a5/dts/zumapro-usi.dtsi
Link: https://android.googlesource.com/kernel/google-modules/soc/gs/+/204078758737776959ecc85c527a00fd2cabb62f/include/dt-bindings/interrupt-controller/zumapro.h
Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
@derekross
derekross merged commit 8698185 into derekross:omamobile Nov 1, 2026
1 check passed
@derekross

Copy link
Copy Markdown
Owner

Thank you, @W4HO-ham. The branch is now the one commit, "Add USI10 and its I2C controller", and it's the same patch as before (28eb4eb75c19 has the same patch id as 9712003e4c1b), so my earlier review stands. The gate passes merged onto today's omamobile: signed off, checkpatch --strict with nothing to read, and the eight device trees build with W=1 and no new warnings. CI is green on this head too.

Merged with "Rebase and merge".

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