Repository navigation
arm64: dts: apple: t6050: share the K boards' N1 and USB-C ports, add K114s and K116c - #2280
RyanTheTide wants to merge 3 commits into
Conversation
… K114s and K116c The K114s and K116c had no USB, no Wi-Fi/Bluetooth and no PCIe: the shared t6050-k114-k116.dtsi disabled ATC1, nub-spmi-a0 and the PCIe host, and only the K114c and K116s described their N1 port and USB-C ports, each in its own copy. The boards' ADTs have the same apcie0 port 0 (registers, IRQ 1523, PERST# GPIO 80, N1 on dart-apcie0 streams 1-3), the same PD controllers (hpm1 at 0xa on nub-spmi-a0, hpm2 at 0xc on nub-spmi-a1, SN201202x) and the same atc-phy, usb-drd and dart-usb nodes on all four boards. So: - t6050-k114-k116.dtsi now describes PCIe port 0 with the N1, its wifi0/bluetooth0 aliases and PERST# pin 80. The board file defines the N1's firmware name and its board-id before including it; the platform ID is board-id << 16 | 0x6050. - The new t6050-k114-k116-usb.dtsi describes ATC1 (left-front) and ATC2 (right): PD controllers, combo PHYs, DWC3s, DARTs and the atcphy aliases. Boards include it after t6050-peripherals.dtsi, which defines nub-spmi-a1 for them. - K114c and K116s keep only their deltas: K114c the nub-spmi-a0 fault queue window, the MagSafe PD controller and the ATC2 router; K116s the SD reader on port 1 and the single nub-spmi-a1 window. - K114s (board-id 0x14) and K116c (board-id 0x06) include both. The K114c and K116s DTBs are byte-identical before and after, as are the other T6050 DTBs. The shared blocks are Joshua Warren's K114c and Jens Axboe's K116s descriptions. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
|
Blockers: 1. The move itself checks out at the head: K114c and K116s are byte-identical, K114s and K116c get the K114c PCIe port 0 (only firmware-name and platform ID differ) and the K116s ATC1/ATC2 nodes, and the only newly exposed pin is 80 (112 stays reserved).
HW row: K114s on the rebased head: USB 3 device enumerates on left-front and right in both orientations, Assisted-by: LLM (Claude:Opus 5.5) |
t6050-k114c.dts: kept this branch's move of the N1 port and its aliases into t6050-k114-k116.dtsi, kept integration's nvram alias in a K114c aliases block. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
…e PERST# pin The K board headphone jack change opens pins 134 and 139 (the CS42L84's interrupt and reset) in the shared K114/K116 pinctrl_ap list, and this branch opens pin 80 for PCIe port 0. Use the union, <0 80>, <81 53>, <135 4>, <140 81>, in both so they land in either order. Both pins read cleanly; only pin 112 takes an SError. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
|
Merged integration/aurora (f5f023b); conflicts in t6050-k114c.dts resolved (K114c keeps integration's nvram alias; shared K114/K116 pinctrl_ap list set to the union with #2277: <0 80>, <81 53>, <135 4>, <140 81>), all eleven T6050 board DTBs build with unchanged dtc warnings; K114c, K116s and the other boards decompile identical to integration. |
|
The rebase is in, but dt-checks now fails: the DART power-domain check flags dart_apcie0 ( |
Problem
The K114s (14-inch M5 Pro) and K116c (16-inch M5 Max) have no USB, no Wi-Fi/Bluetooth and no PCIe. t6050-k114-k116.dtsi disables ATC1, nub-spmi-a0 and the PCIe host, and the two board files add nothing back. The K114c and K116s describe the same N1 port and USB-C ports, each in its own copy.
Change
The four boards' ADTs have the same apcie0 port 0 (registers, IRQ 1523, PERST# GPIO 80, the N1 on dart-apcie0 streams 1-3), the same PD controllers (hpm1 at 0xa on nub-spmi-a0, hpm2 at 0xc on nub-spmi-a1, SN201202x) and the same atc-phy1/2, usb-drd1/2 and dart-usb1/2 nodes. Only phandles differ.
t6050-k114-k116.dtsi: PCIe port 0 with the N1 (control, Wi-Fi, Bluetooth), the wifi0/bluetooth0 aliases, and PERST# pin 80 exposed. The board file definesT6050_K_N1_FIRMWAREandT6050_K_BOARD_IDbefore the include. The platform ID is(board-id << 16) | 0x6050.t6050-k114-k116-usb.dtsi: ATC1 (left-front) and ATC2 (right). It has the PD controllers with their connector graphs, the combo PHYs and mailboxes, the DWC3s, their DARTs, the ATC2 power states and the atcphy1/atcphy2 aliases. A board includes it aftert6050-peripherals.dtsi, which defines nub-spmi-a1 for these boards.The shared blocks are Joshua Warren's K114c and Jens Axboe's K116s descriptions.
Testing
make dtbs CHECK_DTBS=y(dtschema) for every T6050 DTB on this branch: builds clean, no dtc warnings, and no schema message that integration/aurora does not already have.Still to run
iw dev wlan0 linkshows an association, andhciconfig hci0 upsucceeds. This needsapple/centauri/k114s-ftab.binin place, and the boot loader must train port 0 as it does on the K114c.apple/centauri/k116c-ftab.bin.&port00,&hpm1,&hpm2and&nub_spmi_a0. Those labels are unchanged.Per-board values and DTB diffs
K114s and K116c DTB changes (both boards the same apart from the values above):
<0 80>, <81 140>(was<0 221>)Assisted-by: LLM (Claude:Opus 5.5)