Skip to content

arm64: dts: apple: t8152-j804: the SD card reader on PCIe port 2 (on #2338) - #2339

Draft
RyanTheTide wants to merge 10 commits into
integration/aurorafrom
dtfill/t8152-j804-sd
Draft

RyanTheTide wants to merge 10 commits into
integration/aurorafrom
dtfill/t8152-j804-sd

Conversation

@RyanTheTide

Copy link
Copy Markdown
Contributor

Problem

The J804's SD card reader (a GL9755 on apcie port 2) has no Linux node. aura#285 powers it and trains the link, but nothing binds.

Change

  • Add port 2 to the apcie host. Its port/PHY registers come from the J804 ADT. Host interrupts become 1571/1579/1587, because the driver picks a port's interrupt by port number. Bus 2 maps to pcie2_dart stream 1.
  • Add port02 with PERST# GPIO 5, max link speed 1, and the GL9755 mmc@0,0 (pci17a0,9755, card-detect and write-protect inverted per the ADT polarity).
  • Enable pcie2_dart with APCIE_SYS_GP.

Testing

cpp + dtc: only the J804 changes, in the host's port lists, pci@2,0 with the mmc node and an enabled pcie2_dart. J873g and J833ct are unchanged.

Still to run

  • @LiamRay11 (J804): insert a card, mmcblk0 appears, and dd if=/dev/mmcblk0 of=/dev/null bs=1M count=256 completes. Also check removal and reinsert, and that there is no DART fault.
Details

Assisted-by: LLM (Claude:Opus 5.5)

LiamRay11 and others added 10 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>
The J804 has no apcie host, port 0 or port-0 DART, so the N1 Wi-Fi and
Bluetooth functions that the centauri drivers handle never appear.

The J804 ADT's /arm-io/apcie, apcie/pci-bridge0 (PERST# GPIO 3, CLKREQ#
GPIO 0, maximum link speed 3), its centauri-control/alpha/beta functions
and /arm-io/dart-apcie0 have the same registers, interrupts and pins as
the J873g's. Move the host and port 0 from t8152-j873-n1.dtsi (sithglan)
into a board-neutral t8152-n1.dtsi and include it from both boards. The
J873g keeps its own pinctrl_ap and pcie0_dart in t8152-j873-n1.dtsi; its
DTB is unchanged. The J804 uses pcie0_dart and pinctrl_ap from t8152.dtsi
and its own board file.

On the J804, add the PMGR power states the port and its DART sit in, ADT
pmgr devices APCIE_GP (+0x8c0) and APCIE_SYS_GP (+0xec0, child of
APCIE_GP), kept on because the loader hands over a trained link, and give
them to the host and to pcie0_dart. Describe the Wi-Fi and Bluetooth
functions (0,1 and 0,2) with the wifi0 and bluetooth0 aliases, which the
loader fills from the ADT's /chosen mac-address-wifi0 and
mac-address-bluetooth0.

Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
The J804 has a GL9755 SD host controller on apcie port 2 (ADT
/arm-io/apcie/pci-bridge2/pcie-sdreader); the Mac mini has a different
device there, so this stays in the board file. The loader switches on the
reader's power (the ADT's SMC function-sd_pwr_en) and trains the link.

Add port 2 to the host: its port registers (+0x18a028000) and PHY lane
(+0x18f018000), from the apcie node's reg; the host interrupts of ports 0
to 2 (ADT apcie interrupts 1571, 1579, 1587), because the driver takes a
port's interrupt by its port number; and bus 2 on dart-apcie2, stream 1.
The port's PERST# is pci-bridge2's function-perst, GPIO 5, and its link
runs at gen 1 (maximum-link-speed 1). The port's MSIs come from the
host's shared range. Card detect and write protect are active high
(card-detect-polarity and write-protect-polarity 1), as in
t6050-j714s.dts and t8142-j704-pcie.dtsi.

Enable pcie2_dart with the apcie power state, APCIE_SYS_GP.

Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
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