Skip to content

arm64: dts: apple: t8152-j804: describe the MacBook Pro (M6) core board - #2107

Open
LiamRay11 wants to merge 8 commits into
aurora-silicon:integration/aurorafrom
LiamRay11:j804/dt-board
Open

LiamRay11 wants to merge 8 commits into
aurora-silicon:integration/aurorafrom
LiamRay11:j804/dt-board

Conversation

@LiamRay11

Copy link
Copy Markdown

Summary

Turns the disabled J804 inventory (t8152-j804.dts, 12 lines on t8152.dtsi) into a board description for a RAM boot from the loader (aurora,minimal-boot, as J873g). It builds on the shared T8152 description and its canonical labels, and adds the bindings the board needs. Storage, display, input, wireless, GPU, audio and media nodes follow with their drivers.

Commits

  • dt-bindings (one per file, enum additions with the existing fallbacks):
    • apple,t8152-pmgr and apple,t8152-pmgr-pwrstate. These are already used by the J873 DT, so this also removes base warnings.
    • apple,t8152-i2c, apple,t8152-wdt, apple,t8152-fpwm
    • apple,t8152-pinctrl with an apple,t8140-pinctrl fallback. T8140 is the uncached profile that honours gpio-reserved-ranges, following the existing T6050 -> T8132 pattern. With the T8103 profile, J804 takes an SError at probe reading pins 78/208. J873 is unchanged.
    • apple,t8152-cpuidle with an apple,t8140-cpuidle fallback, which the driver already matches.
  • arm64: dts: apple: t8152-j804:
    • the 12 CPUs, with the first two P-states per cluster (the unmanaged range, as on J873)
    • AIC and timer, the boot framebuffer, cpuidle
    • SMC: mailbox, apple,smc-pcio-gpio output for the trackpad AFE reset, and hwmon with fan/power/voltage/current keys. The fan is monitored only: there is no apple,fan-manual-control, so its speed stays under firmware control as on the other T8152 boards
    • watchdog
    • pinctrl with the ADT no-restore pins reserved
    • I2C1 with the jack codec (disabled until a sound card uses it) and I2C3 for the speaker amps
    • FPWM keyboard backlight (LED_FUNCTION_KBD_BACKLIGHT, LED_COLOR_ID_WHITE)
    • the boot NOR and PMGR via t8152-j873-qspi.dtsi, which J804 shares with J873g, plus SIO/I2C power states. Renaming it to a board-neutral name would touch J873g, so it is left for a separate change.
    • hwmon keys are listed in the board file rather than through hwmon-common.dtsi/hwmon-laptop.dtsi: those hardcode temperature keys, while J804 uses apple,discover-temperatures, and its fan mode key is the lower-case F0md

Testing

On hardware: MacBook Pro 14-inch (M6, J804), 2026-11-16, tested by LiamRay11.

  • What ran: kernel 7.3.0 built from integration/aurora bf423bf0e with all nine J804 linux PRs merged (t8152-mailboxes, dart-gen3, dt-board, centauri, g18-fast-retire, cfg80211-stale-scan, smc, cs42l84-jack, and an NVMe PR that is not sent yet), plus retest-only device-tree changes that are not part of these PRs: SSD nodes (ANS mailbox, SART, NVMe), PCIe port 0 with the N1 Wi-Fi, the USB0 gadget console, and a read-only NVRAM partition. Those nodes were needed to reach the root filesystem and SSH.
  • Booted through aura on the installed root filesystem. A systemctl reboot from this kernel (watchdog restart) returned to the installed system.

Results for this PR (this board file plus the retest-only nodes above):

  • 12 CPUs online, cpuidle (apple_idle), the watchdog (/dev/watchdog0; the restart above went through it), the NOR partitions (aura_stage2.log, adt, nvram), kbd_backlight, i2c-0/i2c-1 and pinctrl with the reserved ranges all probe and work.
  • With j804/smc: SMC AC and battery, 177 hwmon inputs, and the power/lid input device.
  • NVRAM: this PR leaves the nvram partition writable, as upstream's t8152-j873-qspi.dtsi (shared with J873g) has it for asahi-nvram and asahi-bless. The retest tree added read-only to it (mtd flags 0x800), so writes to it were not exercised.
  • t8152-j804.dtb itself has no CHECK_DTBS warning.

Known limitation: cpufreq logs invalid apple,fast-die-effort (-2): CPUs 1-6 stay limited to 972000 kHz. T8152's cpufreq expects a fast-die limit, and this tree does not provide apple,fast-die-effort (-2 is -ENOENT; the PMP report it would point at is not described yet), so the cluster keeps the driver's fallback limit. It is left for the follow-up with the full OPP tables and the thermal policy (see Deviations).

Checks on this base: scripts/dtc/apple-dt-check.sh (base bf423bf0e, head = this series together with j804/dart-gen3, j804/t8152-mailboxes and the J804 NVMe change): 137 Apple DTBs built at both, 0 new CHECK_DTBS warnings (8 removed: the J873g apple,t8152-pmgr/-pmgr-pwrstate ones), and dt_binding_check passes for every changed binding.

integration/aurora has since moved to 677be395b; this branch still merges into it without conflicts.

Deviations from the bring-up tree

  • Full CPU OPP tables (E levels 2-8, P/M levels 2-21) are left to the thermal PR. Upstream's T8152 cpufreq caps at P-state 3 without a thermal policy.
  • USB (dwc3 plus two Gen3 DART instances per port) is left out: it needs apple,tlbi-aperture from j804/dart-gen3. The retest tree described USB0 as a gadget console with upstream's DART node model and it worked; the USB nodes come with their own PR.
  • SPMI with the Woodcote PMIC nvmem and the SN201202x Type-C controllers are left out. They need new bindings (apple,t8152-spmi, apple,woodcote-pmic) and are follow-ups.
  • The DockChannel UART stays disabled: J804 has no reader for it.

Hardware values

Addresses, IRQs, power-state offsets, the pcIO template and the GPIO reserved ranges are hardware description from the J804 ADT, in the same style as the existing T8152 files. There are no per-unit values: memory, CPU release addresses, the framebuffer, MAC and BD addresses are filled by the loader.

Dependencies

None for the tree. The SMC's input, power and pcIO cells only register with j804/smc; without it the SMC is telemetry-only, as on J873. Later J804 PRs build on this one.

🤖 Generated with Claude Code

LiamRay11 and others added 8 commits November 16, 2026 09:04
The T8152 (M6) PMGR blocks are compatible with the T8103 ones. The
J873 device tree already uses this compatible; document it.

Signed-off-by: LiamRay11 <228416644+LiamRay11@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The T8152 (M6) PMGR power state controls are compatible with the
T8103 ones. The J873 device tree already uses this compatible;
document it.

Signed-off-by: LiamRay11 <228416644+LiamRay11@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The I2C controllers of T8152 (M6) are compatible with the T8103 ones.

Signed-off-by: LiamRay11 <228416644+LiamRay11@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The T8152 (M6) watchdog is compatible with the T8103 one.

Signed-off-by: LiamRay11 <228416644+LiamRay11@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The T8152 (M6) FPWM, which drives the keyboard backlight of the
J804 MacBook Pro, is compatible with the S5L one.

Signed-off-by: LiamRay11 <228416644+LiamRay11@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Reading every pin of the T8152 GPIO block to fill a register cache at
probe takes an SError on the J804 MacBook Pro: pins 78 and 208 fault
on an AP read. The T8140 profile accesses the block uncached and
honours gpio-reserved-ranges, so a board that has to keep the CPU off
such pins can use "apple,t8152-pinctrl", "apple,t8140-pinctrl", as
T6050 does with its T8132 fallback. The existing T8103 fallback stays
valid for boards that do not need it.

Signed-off-by: LiamRay11 <228416644+LiamRay11@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
As on T8140, the OS cannot request core power-down on T8152 (M6) and
WFI is the only idle state. Allow "apple,t8152-cpuidle" with the
T8140 compatible as its fallback, which the driver already matches.

Signed-off-by: LiamRay11 <228416644+LiamRay11@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Turn the disabled J804 inventory into a board description for a RAM
boot from the loader, on top of the shared T8152 description:

  - the twelve CPUs (the loader removes those it has not started),
    with the first two performance states of each cluster, which the
    cpufreq driver may use without a thermal policy, as on J873
  - the AIC and the timer, the boot framebuffer and CPU idle
  - the SMC with its mailbox, the pcIO output that resets the
    trackpad's touch controller, and the hardware monitor: fan, power,
    voltage and current keys, with temperatures discovered. The fan
    is monitored only; its speed stays under firmware control
  - the watchdog, the GPIO controller with the pins that fault on an
    AP read reserved, the I2C controllers of the jack codec and the
    speaker amplifiers, and the keyboard backlight PWM
  - the boot NOR and the PMGR block from t8152-j873-qspi.dtsi, shared
    with J873, plus the SIO and I2C power states

Everything else stays described and disabled; the storage, display,
input, wireless and GPU nodes follow with their drivers. The values
come from the J804 ADT.

Tested on a MacBook Pro (M6, J804) with an equivalent standalone device
tree on an earlier base (integration/aurora f5fa539): all twelve CPUs
come up, the watchdog restarts the machine, the SMC hardware monitor
reports about 170 inputs including the fan, the keyboard backlight
lights, and the NVRAM partition of the boot NOR reads. This tree,
rewritten onto the shared T8152 labels, has not been booted.

Signed-off-by: LiamRay11 <228416644+LiamRay11@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

@sithglan sithglan 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.

Test report, 2026-11-17: Apple Mac mini M6 (J873g/T8152, board 0x24). PR revision tested: a96fb0778c158b79a93a2efea123b182143a626b.

Host validation used the combined #2105–2108/#2110–2112 series (54742c617db4 on 677be395b9d2) with Clang 22. All changed driver objects built with W=1 and no new warnings; two pre-existing DART unused-helper warnings were unchanged.

All 137 Apple DTBs built at both base and combined head, with zero new warning lines and eight removed. All ten changed bindings passed dt_binding_check. This validates the shared binding changes and the J804 DT build. The test machine is J873g, so J804 board behavior was not hardware-tested.

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