Skip to content

J616s (M4 Pro) sleep, 1/9: device tree bindings and T6040 device tree - #1904

Closed
fbalazsy wants to merge 22 commits into
aurora-silicon:integration/aurorafrom
fbalazsy:j616s/split-dt
Closed

fbalazsy wants to merge 22 commits into
aurora-silicon:integration/aurorafrom
fbalazsy:j616s/split-dt

Conversation

@fbalazsy

@fbalazsy fbalazsy commented Nov 14, 2026 •

Copy link
Copy Markdown
Contributor

Device tree bindings and the T6040 (M4 Pro) / J616s device tree for hibernation and suspend-to-RAM under aura. First part of the split of #1477 into smaller pull requests; the drivers follow in their own pull requests, stacked on this one.

Depends on #1903: without it the dt-checks job reports the existing chosen warnings as new, because this adds the aura vendor prefix. That commit is included here as the first one.

Area What
dt-bindings: soc: apple One schema for the Apple sleep controllers (apple,sleep.yaml, replacing apple,t8140-sleep.yaml), with the T6040 controller: its register blocks, the power word pages, apple,apcie
dt-bindings: chosen aura,hibernate-layout (the fixed layout of the memory the boot loader keeps, which a hibernation image must not overwrite) and aurora,s2r-mailbox; the aura vendor prefix
dt-bindings: display T6041 display power words
Other bindings Properties the T6040 nodes use: PMGR, ProRes, PCIe, ATC PHY, DP audio, pinctrl, the USB4 router's Type-C PHY in phys
arm64: dts: apple: t6040 The sleep controller node (enabled per board, on J616s), ProRes, JPEG and DP audio nodes, each USB4 router's Type-C PHY, the AP pin states put back after suspend-to-RAM

Without the drivers of the next pull requests the new nodes stay unbound; nothing changes at runtime on any board.

The history is the one tested in #1477 (21 commits, some of them later revisions of earlier ones). I can squash them per binding and per tree if you prefer.

Tested as part of #1477 on the J616s (hibernation and suspend-to-RAM, results there). apple-dt-check.sh and dt_binding_check on the changed bindings run in the dt-checks job.

The whole stack, in merge order: #1903, #1904 (this), #1909 (hibernation core), #1910 (sleep controller), #1911 (coprocessors), #1912 (PCIe, storage, radios), #1913 (USB, Type-C, USB4), #1914 (display), #1915 (GPU), #1916 (ANE).

Not tested: these nodes on hardware without the drivers of the later parts (they stay unbound); the T6041 boards other than the J616s.

fbalazsy and others added 22 commits November 14, 2026 17:41
A "does not match any of the regexes" message lists every pattern the
schema allows, vendor-prefixes.yaml included. A change that adds a vendor
prefix lengthens that list, so each such warning the base already has is
reported once as removed and once as new, and the check fails although no
device tree changed. Mask the list the way phandle values already are.

Signed-off-by: František Balázsy <frantisekbalazsy@gmail.com>
… audio and USB4 properties

Describe what the J616s (M4 Pro, T6040) sleep and restore paths read from the
device tree: the T6040 sleep controller node, the T6041 ProRes compatible, the
PCIe and ATC PHY properties used after a power loss, the DP audio and USB4 ACIO
additions, nonposted-mmio on a PMGR block and the pin controller's
apple,resume-restore-all.

Signed-off-by: František Balázsy <frantisekbalazsy@gmail.com>
… audio

Describe the T6040 sleep controller and enable ProRes, JPEG and DP audio on the
J616s.

Signed-off-by: František Balázsy <frantisekbalazsy@gmail.com>
The T6040 ACIO driver starts a router only over its port's Type-C PHY in
CIO mode and refuses to probe without apple,atc-phy, but the routers'
nodes never named their PHY. With the J616s left back port's router
enabled, ACIO0 failed to probe ("Missing apple,atc-phy"), and the
three of them would on any board that enables them.

Name atcphy0..2, the PHY at the same port as the router (ADT acioN
atc-phy-parent), and make the property required for the T6040 router.

Signed-off-by: František Balázsy <frantisekbalazsy@gmail.com>
The arch/arm64/boot/dts/apple/t604x.dtsi part of "pinctrl: apple: put
every AP pin back after a T6040 S2R", which goes with the device tree
changes; the rest of that commit is with the sleep controller changes.

The AP GPIO block needs the saved configuration of every pin back on
the system wake, except the pins the ADT lists in
no-restore-gpio-pins (190-192 on J616s). Linux put back
only the pins it set up itself. A sleep that cuts the block's power then
left the pins the boot loader set up for others at their reset values,
among them the chip select of the internal panel's TCON bus; after the
wake the display firmware powered the panel's rails and never saw it
come up ("No device added after powering on the rails. HPD=0").

Mark the AP block apple,resume-restore-all with the ADT's no-restore
list, snapshot every readable pin from the hardware at suspend_noirq
and write back the ones that changed at resume_noirq, logging the pins
that were not Linux's.

Signed-off-by: František Balázsy <frantisekbalazsy@gmail.com>
The arch/arm64/boot/dts/apple/t6040.dtsi part of "soc: apple:
t6040-sleep: name the T8140 driver instead of its pull request", which
goes with the device tree changes; the rest of that commit is with the
sleep controller changes.

Comments in the T6040 sleep code, the display driver and the T6040
device tree pointed at the T8140 sleep driver by a pull request number.
Name the driver (sleep.c) or the T8140 instead, and drop the
"currently unreachable" note on the sleep controller node.

No functional change.

Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
Signed-off-by: František Balázsy <frantisekbalazsy@gmail.com>
The arch/arm64/boot/dts/apple/t6040-j616s.dts,
arch/arm64/boot/dts/apple/t6040.dtsi part of "arm64: dts: apple: t6040:
enable the sleep controller per board", which goes with the device tree
changes; the rest of that commit is with the sleep controller changes.

The T6040 sleep controller's node is in the SoC's file, so every T6040
board has it, while its sleep has been run on the J616s alone. It maps
fixed T6040 blocks and installs suspend operations that make deep the
default state and then refuse it without t6040_sleep.allow_entry, which
is of no use on a board nobody has tested, and distribution kernels
build the controller.

Disable the node in t6040.dtsi and enable it in t6040-j616s.dts. On the
J614s and the J773s the controller no longer binds: suspend-to-idle
stays their sleep, and the debugfs preflight file is gone there.

The interrupt controller saved its configuration for a sleep on every
apple,t6041-aic3 whenever the controller was built. Key that on the
enabled node as well, so that the other machines with this AIC keep
their suspend and hibernation paths as they were.

Signed-off-by: František Balázsy <frantisekbalazsy@gmail.com>
…e,apcie

The description spoke of what a driver does with the node. Say what the
node is: the blocks an operating system at EL2 drives itself to suspend
the T6040 to RAM, and the display power states that have to be off
before it.

The boot loader adds apple,apcie to the node, the PCIe host whose shared
registers and tunables the storage controller's link needs after a
sleep, as on the T8140. The binding did not allow it. The pipe list also
lacked the description a vendor property needs, which the binding check
reported.

Signed-off-by: František Balázsy <frantisekbalazsy@gmail.com>
The MAINTAINERS part of "soc: apple: sleep: describe the T6040 part as
it is", which goes with the device tree changes; the rest of that commit
is with the sleep controller changes.

The file's opening comment still explained why the T6040 controller was
a driver of its own next to the generic one, and several comments named
functions the generic driver no longer has. Describe the part as it is
now, with suspend-to-RAM offered only to a system booted with
t6040_sleep.allow_entry=1, name the generic driver's functions, and say
in sleep.c that a SoC may bring a part.

List the private header next to the driver's sources.

Signed-off-by: František Balázsy <frantisekbalazsy@gmail.com>
The T6041 display coprocessors (apple,t6041-dcp, apple,t6041-dcpext)
name an apple,display-power node whose "ps" and "pmc-dcp" windows hold
the power-state words their driver lowers after it stops the firmware
for a suspend-to-RAM and raises on the wake, and the display PMC word
that counts the powered coprocessors. The boot loader publishes it with
the compatible apple,t6041-display-power: one node over the east power
manager block for the internal coprocessor, one over the west block
that both external coprocessors name. Describe it, as
apple,t8140-display-power.yaml does for T8140.

Signed-off-by: František Balázsy <frantisekbalazsy@gmail.com>
The comment on the sleep controller's storage link described how the
boot loader's publish behaves and recalled what a static property had
done on a J616s. Say what the tree has to give and what the boot loader
adds: apple,apcie and the PCIe host's windows and tunables come from
the boot loader, which leaves a node that has apple,apcie alone, so
the tree gives neither.

Comment only; the DTBs are unchanged.

Signed-off-by: František Balázsy <frantisekbalazsy@gmail.com>
The sleep controller has registers but its node had no unit address,
which dtc reports (unit_address_vs_reg). Name it after its first
register block, as the T8140 tree does. The boot loader and the kernel
find the node by its compatible, not by its path.

Signed-off-by: František Balázsy <frantisekbalazsy@gmail.com>
The T6040 sleep controller binding sat under power/, the T8140 one
under soc/apple/, for the same kind of block. Move it next to the
T8140 one, give apple,check-ps-b4-sleep-names its string-array type,
and list the file under the Apple SoC entry in MAINTAINERS.

Signed-off-by: František Balázsy <frantisekbalazsy@gmail.com>
The boot object publishes /chosen/aurora,s2r-mailbox, and the arm64
CPU ops, the spin-table hibernation and the Apple sleep driver read
it, but no binding described it. Document what its presence means and
the layout of the mailbox it points at.

Signed-off-by: František Balázsy <frantisekbalazsy@gmail.com>
The kernel hibernates on Apple silicon only where the boot object says,
in /chosen, that it keeps the same memory layout on every boot, and it
reads the device tree of the resuming boot at the address the boot
object gives there. Neither property had a binding, and their prefix
was not a registered one.

Register the prefix and describe the two properties. The prefix is the
name of the boot loader that defined them, as u-boot's is: its released
versions publish the properties under this name, so a kernel that
looked for another one would not hibernate with any of them.

Signed-off-by: František Balázsy <frantisekbalazsy@gmail.com>
The sleep controller cannot enter a suspend or undo one without any of its
eleven register blocks, and every T6040 board lists all of them. Make reg
and reg-names required with all eleven entries instead of accepting a node
with only the first two, and give the example the node it describes.

Signed-off-by: František Balázsy <frantisekbalazsy@gmail.com>
The soc-east and soc-ps windows are the SOC-East and SOC power word pages,
which the driver reads and writes as one range each: 0xd000 and 0x9000
bytes. Describe them as the pages they are, so that one mapping of each
serves every power word in them.

Signed-off-by: František Balázsy <frantisekbalazsy@gmail.com>
Give the soc-east and soc-ps windows of the sleep controller the extent of
the SOC-East (0x502280000) and SOC (0x502800000) power word pages, 0xd000
and 0x9000 bytes, instead of the first 0x1000 of each. The addresses are
unchanged.

Signed-off-by: František Balázsy <frantisekbalazsy@gmail.com>
The T6040, T8132 and T8140 sleep controllers do the same job and were
described by two schemas that named the same blocks differently. Describe
them in apple,sleep.yaml, with the register names per compatible, and give
the blocks the T6040 shares with the T8140 the T8140's names: cluster for
the CPU complexes' control words, pwrgate for the power-gate and voter
block, spmi for the PMU's SPMI controller and wake for the AOP block with
the wake masks.

The schema keeps what each SoC requires and refuses: the T6040 needs all
eleven of its register blocks, the SOC-East and SOC pages sized as the
driver maps them, and the display power-state table; the T8140 needs its
28 blocks, the wake sources and the display coprocessors; the T8132 its
25 blocks, the clock protection page as an optional 26th, and the display
coprocessors. The controllers are listed in MAINTAINERS under the one file.

The T6040 device tree and driver follow in the next two patches.

Signed-off-by: František Balázsy <frantisekbalazsy@gmail.com>
…8140's

Give the register blocks of the T6040 sleep controller that the T8140's
controller has too the names the schema uses for both: cluster, pwrgate,
spmi and wake. The addresses, sizes and order are unchanged; the compiled
tree differs only in those four names.

The driver looks the blocks up by these names and follows in the next
patch.

Signed-off-by: František Balázsy <frantisekbalazsy@gmail.com>
The T6040 USB4 router runs only over its port's Type-C PHY and tells
the PHY when it starts and stops. The PHY was named in a vendor phandle,
which the router resolved to a device node and looked up by hand for
each call.

Describe it with the standard phys property and the "cio" name the T8132
routers already use for the same PHY, so the PHY framework resolves it
and orders the router after the PHY. The T6040 routers require both.

Not run on a USB4/Thunderbolt device.

Signed-off-by: František Balázsy <frantisekbalazsy@gmail.com>
Name each router's Type-C PHY with phys, as the binding now describes,
instead of the vendor phandle. The routers stay disabled here, so no
default board changes. The built J616s device tree passes the router
schema.

Not run on a USB4/Thunderbolt device.

Signed-off-by: František Balázsy <frantisekbalazsy@gmail.com>
@fbalazsy

Copy link
Copy Markdown
Contributor Author

Closing: this stack is based on integration/aurora from 2026-11-14 and now conflicts with the sleep and spin-table work that landed since. I will rework the J616s (T6040) support on top of the current tree and open a new, smaller series.

@fbalazsy fbalazsy closed this Nov 18, 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