Skip to content

arm64: dts: apple: t6050-k116s: leave the DCP clocks and scratch to the loader - #1859

Merged
DjDeveloperr merged 2 commits into
aurora-silicon:integration/aurorafrom
axboe:k116s-dcp-aura
Nov 14, 2026
Merged

DjDeveloperr merged 2 commits into
aurora-silicon:integration/aurorafrom
axboe:k116s-dcp-aura

Conversation

@axboe

@axboe axboe commented Nov 13, 2026

Copy link
Copy Markdown
Contributor

Follow-up to the note on #1648, now that aurora-silicon/aura#226 is merged. Stacked on #1648 (head cd2c9f5); only the last commit is new.

aura's T6050 panel hand-off adds the DCP clock nodes, clocks and apple,bw-scratch itself and refuses a tree that already has them. This drops the two fixed-clock nodes and those two properties from the K116s dcp node; apple,clock-ids, the DART ranges and the panel node stay.

Tested on the K116s (27.2 stub): aura main 6ba9efc90858 as Stage 2, integration adb5a7e plus the K116s commits with this change. Linux at EL2, 18 CPUs; the panel is handed over, apple-drm initialises at 2.1 s, desktop at 3472x2170; GPU, Wi-Fi, sound and KVM come up.

Dependency: needs aura with #226. With an older loader that expects the properties in the tree, the panel is not handed over.

…he loader

aura's T6050 panel hand-off adds the DCP firmware's clock nodes, the
"clocks" property and the bandwidth request scratch
("apple,bw-scratch") to the dcp node from the ADT, as it does for the
J714s, and refuses a device tree that already carries them ("the device
tree already has a memory-region, clocks or apple,bw-scratch"). The
K116s tree had them written in for an earlier loader, so with aura main
the internal panel was not handed over.

Drop the two fixed-clock nodes, "clocks" and "apple,bw-scratch".
"apple,clock-ids", the DART ranges and the panel node stay. The values
aura fills in are the ones removed here: the dcpext0 PMC block at
0x20000 and clock ids 361 and 458.

Needs aura with the 27.2 K116s panel hand-off (aurora-silicon/aura#226).

Signed-off-by: Jens Axboe <axboe@kernel.dk>

@DjDeveloperr DjDeveloperr left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed the top commit. It removes /clock-dcp-firmware-361, /clock-dcp-firmware-458 and clocks/apple,bw-scratch from &dcp.

aura's T6050 hand-off, as of aurora-silicon/aura 6ba9efc90858 (#226), refuses a tree that still has these, and adds them back itself from the ADT: the clock nodes, the PMC reference, apple,bw-scratch, the framebuffer region and the firmware properties. Nothing this commit drops is left unfilled. With an older loader the DCP stays disabled and the display falls back to simpledrm, and aura main already refused the panel before this change. It merges cleanly with #1856, and #1648 underneath it is reviewed.

Approving. This lands after #1856, which carries #1648. Once #1856 is in I'll update the branch so CI runs on the final base.

@DjDeveloperr
DjDeveloperr merged commit 292773f into aurora-silicon:integration/aurora Nov 14, 2026
2 checks passed
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