Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9a14e4f
Merge current integration into the read-only T6050 base for staging
RyanTheTide Nov 7, 2026
7e0f7c7
arm64: dts: apple: stage disabled T6050 peripheral inventories
RyanTheTide Nov 7, 2026
131a512
arm64: dts: apple: resolve T6050 native references and EDAC groups
RyanTheTide Nov 7, 2026
fdadcd3
dt-bindings: apple: narrow T6050 selectors and reuse the UART contract
RyanTheTide Nov 7, 2026
183fe76
dt-bindings: apple: reconcile the existing T6050 boot profile prerequ…
RyanTheTide Nov 7, 2026
707ae64
dt-bindings: apple: retain T6050 video and I2C fallback identities
RyanTheTide Nov 7, 2026
bf1a9a8
arm64: dts: apple: retain T6050 shared resource views and binding types
RyanTheTide Nov 7, 2026
32c3062
dt-bindings: sound: fix T6050 AOP root property projection
RyanTheTide Nov 7, 2026
dcbdb5d
arm64: dts: apple: use native T6050 CPU affinities and board power votes
RyanTheTide Nov 7, 2026
e69878c
dt-bindings: PCI: retain the merged T6040 interrupt-name contract
RyanTheTide Nov 7, 2026
c1f7100
arm64: dts: apple: describe the shared T6050 audio proxy bank once
RyanTheTide Nov 7, 2026
dfd3ab9
Merge integration/aurora into the T6050 hardware inventory
RyanTheTide Nov 8, 2026
e2458b5
Merge integration/aurora into the T6050 hardware inventory
RyanTheTide Nov 8, 2026
25c1bd3
arm64: dts: apple: t6050: Describe the inventory the way the reviewed…
RyanTheTide Nov 8, 2026
f67926c
dt-bindings: apple: Add the T6050 inventory compatibles
RyanTheTide Nov 8, 2026
ec4ea17
arm64: dts: apple: adt-coverage: Update the J716s inventory
RyanTheTide Nov 8, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Documentation/devicetree/bindings/arm/apple.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,9 @@ properties:
- description: Apple M5 Pro SoC based platforms
items:
- enum:
- apple,j714s # MacBook Pro (14-inch, M5 Pro, 2026)
- apple,j716s # MacBook Pro (16-inch, M5 Pro, 2026)
- apple,j873s # Mac mini (M5 Pro, 2026)
- apple,k114s # MacBook Pro (14-inch PROLED XDR, M5 Pro, 2026)
- apple,k116s # MacBook Pro (16-inch PROLED XDR, M5 Pro, 2026)
- const: apple,t6050
Expand All @@ -492,6 +494,7 @@ properties:
- enum:
- apple,j714c # MacBook Pro (14-inch, M5 Max, 2026)
- apple,j716c # MacBook Pro (16-inch, M5 Max, 2026)
- apple,j775c # Mac Studio (M5 Max, 2026)
- apple,k114c # MacBook Pro (14-inch PROLED XDR, M5 Max, 2026)
- apple,k116c # MacBook Pro (16-inch PROLED XDR, M5 Max, 2026)
- const: apple,t6050
Expand Down
12 changes: 12 additions & 0 deletions Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ select:
- apple,t6000-pmgr-clocks
- apple,t6032-pmgr-clocks
- apple,t6041-pmgr-clocks
- apple,t6050-pmgr-clocks
- apple,t8103-pmgr-clocks
- apple,t8132-pmgr-clocks
- apple,t8140-pmgr-clocks
Expand Down Expand Up @@ -93,6 +94,7 @@ allOf:
- enum:
- apple,t6000-pmgr-clocks
- apple,t6041-pmgr-clocks
- apple,t6050-pmgr-clocks
- apple,t8103-pmgr-clocks
- apple,t8140-pmgr-clocks
- apple,t8142-pmgr-clocks
Expand Down Expand Up @@ -137,6 +139,16 @@ allOf:
reg:
minItems: 63
maxItems: 63
- if:
properties:
compatible:
contains:
const: apple,t6050-pmgr-clocks
then:
properties:
reg:
minItems: 60
maxItems: 60
- if:
properties:
compatible:
Expand Down
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/crypto/apple,aes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ select:
- apple,t6031-aes
- apple,t6032-aes
- apple,t6041-aes
- apple,t6050-aes
- apple,t8103-aes
- apple,t8112-aes
- apple,t8122-aes
Expand Down Expand Up @@ -121,6 +122,7 @@ allOf:
- apple,t6030-aes
- apple,t6031-aes
- apple,t6041-aes
- apple,t6050-aes
- apple,t8103-aes
- apple,t8112-aes
- apple,t8122-aes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ select:
contains:
enum:
- apple,t6041-dcp-expert
- apple,t6050-dcp-expert
- apple,t8132-dcp-expert
- apple,t8140-dcp-expert
required:
Expand Down Expand Up @@ -58,7 +59,9 @@ allOf:
compatible:
oneOf:
- items:
- const: apple,t6041-dcp-expert
- enum:
- apple,t6041-dcp-expert
- apple,t6050-dcp-expert
- const: apple,dcp-expert
- items:
- const: apple,t8140-dcp-expert
Expand Down
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/display/apple,dcp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ properties:
- apple,t6000-dcp
- apple,t6020-dcp
- apple,t6041-dcp
- apple,t6050-dcp
- apple,t8140-dcp
- apple,t8142-dcp
- const: apple,dcp
Expand Down
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/display/apple,dpin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ select:
- apple,t6031-dpin
- apple,t6032-dpin
- apple,t6041-dpin
- apple,t6050-dpin
- apple,t8103-dpin
- apple,t8112-dpin
- apple,t8122-dpin
Expand Down Expand Up @@ -101,6 +102,7 @@ allOf:
- apple,t6030-dpin
- apple,t6031-dpin
- apple,t6041-dpin
- apple,t6050-dpin
- apple,t8103-dpin
- apple,t8112-dpin
- apple,t8122-dpin
Expand Down
36 changes: 36 additions & 0 deletions Documentation/devicetree/bindings/display/apple,dptx-aux.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/display/apple,dptx-aux.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Apple DisplayPort AUX channel

maintainers:
- Ryan Murray <81541646+RyanTheTide@users.noreply.github.com>

description: |
A T6050 block described from the ADT so that the device tree lists all of
the SoC's hardware. No driver uses it yet: the node stays disabled until
one does and the block is brought up on hardware.

properties:
compatible:
items:
- const: apple,t6050-dptx-aux
- const: apple,dptx-aux

reg:
minItems: 2
maxItems: 2
description: Register windows in the ADT's order, including views shared with other blocks.

power-domains:
maxItems: 1

required:
- compatible
- reg
- power-domains

additionalProperties: false
36 changes: 36 additions & 0 deletions Documentation/devicetree/bindings/dma/apple,admac-control.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/dma/apple,admac-control.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Apple audio DMA control block

maintainers:
- Ryan Murray <81541646+RyanTheTide@users.noreply.github.com>

description: |
A T6050 block described from the ADT so that the device tree lists all of
the SoC's hardware. No driver uses it yet: the node stays disabled until
one does and the block is brought up on hardware.

properties:
compatible:
items:
- const: apple,t6050-admac-control
- const: apple,admac-control

reg:
minItems: 2
maxItems: 2
description: Register windows in the ADT's order, including views shared with other blocks.

interrupts:
maxItems: 1

required:
- compatible
- reg
- interrupts

additionalProperties: false
19 changes: 14 additions & 5 deletions Documentation/devicetree/bindings/dma/apple,admac-secure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,24 @@ description: |

allOf:
- $ref: dma-controller.yaml#
- if:
properties:
compatible:
contains:
const: apple,t8140-admac-secure
then:
required:
- dma-channels
- interrupts
- iommus
- power-domains

properties:
compatible:
items:
- const: apple,t8140-admac-secure
- enum:
- apple,t6050-admac-secure
- apple,t8140-admac-secure
- const: apple,admac-secure

reg:
Expand All @@ -48,9 +61,5 @@ required:
- compatible
- reg
- '#dma-cells'
- dma-channels
- interrupts
- iommus
- power-domains

additionalProperties: false
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ select:
- apple,t8122-pcie-piodma
- apple,t8132-pcie-piodma
- apple,t8142-pcie-piodma
- apple,t6050-pcie-piodma
- apple,t8152-pcie-piodma
required:
- compatible
Expand Down Expand Up @@ -113,6 +114,7 @@ allOf:
- apple,t8112-pcie-piodma
- apple,t8122-pcie-piodma
- apple,t8142-pcie-piodma
- apple,t6050-pcie-piodma
- apple,t8152-pcie-piodma
- const: apple,pcie-piodma

Expand Down
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ select:
- apple,t8122-pciec-piodma
- apple,t8132-pciec-piodma
- apple,t8142-pciec-piodma
- apple,t6050-pciec-piodma
- apple,t8152-pciec-piodma
required:
- compatible
Expand Down Expand Up @@ -117,6 +118,7 @@ allOf:
- apple,t8112-pciec-piodma
- apple,t8122-pciec-piodma
- apple,t8142-pciec-piodma
- apple,t6050-pciec-piodma
- apple,t8152-pciec-piodma
- const: apple,pciec-piodma

Expand Down
39 changes: 37 additions & 2 deletions Documentation/devicetree/bindings/dma/apple,sio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,47 @@ allOf:
properties:
compatible:
contains:
const: apple,t8132-sio
const: apple,t6050-sio
required:
- compatible
then:
properties:
reg:
interrupts:
minItems: 4
clocks:
minItems: 2
maxItems: 2
required:
- interrupts
else:
properties:
interrupts: false
- if:
properties:
compatible:
contains:
const: apple,t8132-sio
required:
- compatible
then:
properties:
clocks:
minItems: 3
maxItems: 3
- if:
properties:
compatible:
contains:
enum:
- apple,t6050-sio
- apple,t8132-sio
required:
- compatible
then:
properties:
reg:
minItems: 2
maxItems: 2
status:
const: disabled
required:
Expand Down Expand Up @@ -84,6 +114,7 @@ properties:
- apple,t8112-sio
- apple,t8132-sio
- apple,t8140-sio
- apple,t6050-sio
- const: apple,sio
- description: T6041 firmware requires a generation-specific backend.
const: apple,t6041-sio
Expand All @@ -100,6 +131,10 @@ properties:
minItems: 1
maxItems: 3

interrupts:
maxItems: 4
description: On T6050, the coprocessor's mailbox interrupts in ADT order.

status: true

'#dma-cells':
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ select:
- apple,t6031-event-log
- apple,t6041-error-handler
- apple,t6041-event-log
- apple,t6050-error-handler
- apple,t6050-event-log
- apple,t8103-error-handler
- apple,t8103-event-log
- apple,t8112-error-handler
Expand Down Expand Up @@ -129,6 +131,7 @@ allOf:
- apple,t6030-error-handler
- apple,t6031-error-handler
- apple,t6041-error-handler
- apple,t6050-error-handler
- apple,t8103-error-handler
- apple,t8112-error-handler
- apple,t8122-error-handler
Expand All @@ -147,6 +150,7 @@ allOf:
- apple,t6030-event-log
- apple,t6031-event-log
- apple,t6041-event-log
- apple,t6050-event-log
- apple,t8103-event-log
- apple,t8112-event-log
- apple,t8122-event-log
Expand Down Expand Up @@ -251,6 +255,36 @@ allOf:
maxItems: 25
required:
- reg
- if:
properties:
compatible:
contains:
const: apple,t6050-error-handler
then:
properties:
interrupts:
minItems: 105
maxItems: 105
reg:
minItems: 214
maxItems: 214
required:
- reg
- if:
properties:
compatible:
contains:
const: apple,t6050-event-log
then:
properties:
interrupts:
minItems: 23
maxItems: 23
reg:
minItems: 141
maxItems: 141
required:
- reg
- if:
properties:
compatible:
Expand Down
Loading
Loading