Repository navigation
arm64: dts: exynos: google: zuma-husky: haptics and the rear torch - #200
Conversation
9b7f201 to
fbd6bc7
Compare
|
Thank you, @Somnius, for haptics and the torch together, and for following the 7 Pro's nodes so closely. That Before it goes in:
On your question about enabling CMU_PERIC1 and CMU_PERIC0 in the board file: that's fine with me. Their GPIO and Two optional things: stock turns on the CS40L26's brownout protection at 3.008 V This one will need a small rebase after #199 (both add to |
|
@derekross thank you. Reworked on today's What changed: the
The clock IDs: I'm not touching them until you say whether Brett's #157 and #158 or this one goes first; the second one renumbers its TOP IDs after the other's with |
fbd6bc7 to
09d4f92
Compare
|
I booted the combined tree (origin/omamobile + #199 + #200, merge b0fb5bc, tag husky-test-20261106-pr199-200 on my fork) on my 8 Pro. uname -r 7.3.0-rc6-omamobile-push1-gb0fb5bccb3d6, it was up 223 s when I ran tools/phone-smoke and all the required checks passed. Blob ids at that commit:
Haptics/torch side: cs40l26 probes ( |
|
Thank you, @Somnius, for turning every point around so fast. HSI1 is now off in On the clock IDs: let's have this PR go first. #157 and #158 need a rebase anyway, and I'll ask Brett there to start his CMU_TOP IDs at 28. So you don't need to renumber anything. What's left before it goes in:
A tiny wording point, optional: the comment above Thanks again, this is a lovely pair of features. |
|
@derekross here is the same Kernel
I'll rebase onto |
|
Thank you, @Somnius. The report covers it, and your rebase plan is right: both compatibles in |
Add the clock IDs for PERIC1's USI0 (the haptics driver's I2C bus on the Pixel 8 Pro), the PERIC0 NoC and peripheral paths in CMU_TOP, and the new CMU_PERIC0 with USI14 (the rear flash LED's I2C bus), and the google,zuma-cmu-peric0 compatible. Signed-off-by: Lef <me@lefteros.com>
The sysreg of the Tensor G3's PERIC0 block, which holds the USI mode selectors; the Pixel 8 Pro's rear flash LED bus (USI14) needs it. Signed-off-by: Lef <me@lefteros.com>
PERIC1's USI0: user mux 0x620, divider 0x1808, gates 0x2038, 0x203c and 0x208c. CMU_TOP's PERIC0 paths: muxes 0x10f0 and 0x10ec, gates 0x2114 and 0x2110, dividers 0x18e8 and 0x18e4. CMU_PERIC0 at 0x10800000: NoC user mux 0x600, USI14 user mux 0x640, USI14 divider 0x180c, USI14 gates 0x2068, 0x206c and 0x20cc, and the read-only GPIO and sysreg gates 0x20b8 and 0x20f0. All offsets are from Google's GPL zuma cal-if (cmucal-sfr.c) and match the PERIC1 ones that are already here. Tested on a Pixel 8 Pro: haptics (USI0) and the torch (USI14) both probe on these clocks. Signed-off-by: Lef <me@lefteros.com>
Add usi0 and hsi2c_0 (0x10c80000, IRQ 656) and the HSI1 pin controller (pinctrl_hsi1 at 0x12040000, IRQ 413, gph0 to gph2, alias pinctrl8) to zuma.dtsi; the pin controller is disabled there and the board enables it, as HSI1 is the PCIe block and every zuma board would otherwise probe it. The board file gets the CS40L26A at 0x43 with the stock boost, actuator and brownout values from Google's zuma-shusky-haptics.dtsi (2.5 A, 11 V, 145 Hz, 13 ohm, 3.008 V), INTb on gpa6-3 and RESET on gph2-3. USI0 sits on CMU_PERIC1 and SYSREG_PERIC1, which the board file enables since the hsi2c_11 change. Tested on a Pixel 8 Pro with 7.3.0-rc6: the chip answers (ID 0x40a260, revision 0xa1), firmware 7.2.91 runs from cs40l26.wmfw and cs40l26.bin (taken from the owner's own image, not in the repo), and a force-feedback rumble effect vibrates the phone. Signed-off-by: Lef <me@lefteros.com>
Add cmu_peric0, sysreg_peric0, usi14 and hsi2c_14 (0x10980000, IRQ 648) to zuma.dtsi, and the pins hsi2c14_bus (gpp16-0 and gpp16-1, function 2) and flash_en (gpp8-2). The board file gets the LM3644 at 0x63 with HWEN on gpp8-2 and the 7 Pro's bring-up cap of 50 mA per LED (not a stock value), and enables cmu_peric0 and sysreg_peric0, which stay off in zuma.dtsi like PERIC1. Tested on a Pixel 8 Pro with 7.3.0-rc6: the chip is found (LM3644TT, ID 0x04), the LED class white:torch has 17 steps from 2550 to 49110 uA and lights the rear LED. Signed-off-by: Lef <me@lefteros.com>
09d4f92 to
25079bb
Compare
|
@derekross rebased onto today's
|
Haptics and the rear torch on the Pixel 8 Pro. Both work on my phone.
Everything comes from Google's GPL trees (
zuma-shusky-haptics.dtsi,zuma-husky-camera.dtsi,zuma-usi.dtsi,cmucal-sfr.c) and follows what the 7 Pro does, with the same two drivers that are already in the tree (cs40l26-vibraandleds-lm3644).4 commits:
google,zuma-cmu-peric0andgoogle,zuma-peric0-sysreg.hsi2c_0, IRQ 656; the clocks are USI0 mux 0x620, divider 0x1808 and gates 0x2038, 0x203c, 0x208c).zuma.dtsigetsusi0,hsi2c_0and the HSI1 pin controller (pinctrl_hsi1, IRQ 413,gph0togph2, aliaspinctrl8). The board file has the node with the stock boost and actuator values (2.5 A, 11 V, 145 Hz, 13 ohm), INTb gpa6-3, reset gph2-3.hsi2c_14, IRQ 648). This needs a new CMU_PERIC0 (0x10800000) and the PERIC0 paths in CMU_TOP: TOP mux 0x10f0/0x10ec, gates 0x2114/0x2110, dividers 0x18e8/0x18e4; PERIC0 user muxes 0x600/0x640, divider 0x180c, gates 0x2068/0x206c/0x20cc, read-only GPIO and sysreg gates 0x20b8/0x20f0. HWEN is gpp8-2. The torch is capped at 50 mA per LED, same as the 7 Pro's bring-up limit, not a stock number.All offsets are from Google's zuma
cmucal-sfr.c, and they match the PERIC1 ones that are already here.Tested on my 8 Pro, 7.3.0-rc6 (the e1 kernel, so Brett's tag plus my own commits, not plain
omamobile), withcs40l26.wmfwandcs40l26.binfrom my own phone's vendor image in /lib/firmware (not in the repo):CS40L26 ID 0x40a260, revision 0xa1,Firmware 0x1800d4 rev 7.2.91 running,cs40l26_vibrainput device; a 3-pulse FF_RUMBLE test buzzed hard.LM3644TT (ID 0x04), 17 steps (2550 to 49110 uA),white:torchlights the LED at step 4.On current
omamobilethe series applies andclk-zumaandzuma-husky.dtbbuild, but I did not boot that exact tree and I did not rundt_binding_check/dtbs_check.One thing for you to decide, @derekross @greenbrettmichael: the base DTS kept CMU_PERIC1 and its sysreg off and only the battery bring-up overlays turned them on. Haptics needs them, so this enables
cmu_peric1,sysreg_peric1,cmu_peric0andsysreg_peric0inzuma-husky.dtson purpose. If you'd rather keep them off in the board file and use an overlay, say so and I'll move them.Not tested: haptics through feedbackd (it has no udev rule on the 8 Pro yet), anything above the 50 mA torch cap, suspend. The shell's torch tile is not tried yet either.