Repository navigation
arm64: dts: apple: t6050: share the K boards' N1 and USB-C ports, add K114s and K116c - #2280
Draft
RyanTheTide wants to merge 1 commit into
Draft
RyanTheTide wants to merge 1 commit into
RyanTheTide wants to merge 1 commit 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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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)