From 3aefcf6c3c89ed36b5e6706c393740bc56fed941 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 05:32:20 +1100 Subject: [PATCH 1/4] arm64: dts: apple: describe remaining fleet control devices Describe the CPU and cluster power states, Type-C retimer interfaces and J413 panel control clients while keeping them disabled. Reuse the T6040 USB4 resource tree and bindings from the Thunderbolt lane; move its existing DART descriptions into that controller scope. Assisted-by: LLM Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> --- .../bindings/misc/apple,avellino.yaml | 30 + .../devicetree/bindings/pci/apple,pcie.yaml | 52 +- .../devicetree/bindings/phy/apple,atcrt.yaml | 2 + .../thunderbolt/apple,t8103-usb4-acio.yaml | 37 +- .../thunderbolt/apple,t8103-usb4-nhi.yaml | 6 +- .../boot/dts/apple/t6000-peripherals.dtsi | 108 ++++ arch/arm64/boot/dts/apple/t6040-j616s.dts | 18 + arch/arm64/boot/dts/apple/t6040-usb4.dtsi | 516 ++++++++++++++++++ arch/arm64/boot/dts/apple/t6040.dtsi | 58 +- arch/arm64/boot/dts/apple/t8112-j413.dts | 35 ++ .../boot/dts/apple/t8112-peripherals.dtsi | 84 +++ 11 files changed, 879 insertions(+), 67 deletions(-) create mode 100644 Documentation/devicetree/bindings/misc/apple,avellino.yaml create mode 100644 arch/arm64/boot/dts/apple/t6040-usb4.dtsi diff --git a/Documentation/devicetree/bindings/misc/apple,avellino.yaml b/Documentation/devicetree/bindings/misc/apple,avellino.yaml new file mode 100644 index 0000000000000..6d91cfb521c67 --- /dev/null +++ b/Documentation/devicetree/bindings/misc/apple,avellino.yaml @@ -0,0 +1,30 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/misc/apple,avellino.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple Avellino control interface + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Addressed Avellino control interfaces on an I2C bus. Describing their + bus addresses does not specify a register protocol or transfer firmware + ownership to the host. + +properties: + compatible: + items: + - const: apple,t8112-avellino + - const: apple,avellino + + reg: + maxItems: 1 + +required: + - compatible + - reg + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/pci/apple,pcie.yaml b/Documentation/devicetree/bindings/pci/apple,pcie.yaml index fcd5d9f7d08ae..6a1f35b618a57 100644 --- a/Documentation/devicetree/bindings/pci/apple,pcie.yaml +++ b/Documentation/devicetree/bindings/pci/apple,pcie.yaml @@ -78,6 +78,7 @@ properties: - const: apple,t8132-pciec - const: apple,t8122-pciec - const: apple,t8103-pciec + - const: apple,t6040-pciec apple,managed-sids: $ref: /schemas/types.yaml#/definitions/uint32-array @@ -110,7 +111,11 @@ properties: description: Interrupt specifiers, one for each root port. minItems: 1 - maxItems: 4 + maxItems: 6 + + interrupt-names: + minItems: 1 + maxItems: 6 msi-parent: true @@ -211,7 +216,9 @@ allOf: properties: compatible: contains: - const: apple,t8132-pciec + enum: + - apple,t8132-pciec + - apple,t6040-pciec then: required: - apple,msi-vector-base @@ -255,6 +262,7 @@ allOf: enum: - apple,t8103-pciec - apple,t6000-pciec + - apple,t6040-pciec then: properties: reg: @@ -286,11 +294,49 @@ allOf: - const: ltssm - const: intr2axi - const: oe-fabric + - items: + - const: config + - const: rc + - const: port0 + - const: fabric + - const: debug + - const: ioa + - const: ltssm + - const: intr2axi interrupts: - maxItems: 1 + maxItems: 6 ranges: minItems: 3 maxItems: 3 + allOf: + - if: + properties: + compatible: + contains: + const: apple,t6040-pciec + then: + properties: + reg: + minItems: 8 + maxItems: 8 + interrupts: + minItems: 6 + maxItems: 6 + interrupt-names: + items: + - const: port + - const: intx-a + - const: intx-b + - const: intx-c + - const: intx-d + - const: parity + required: + - interrupt-names + else: + properties: + interrupts: + maxItems: 1 + interrupt-names: false else: properties: resets: false diff --git a/Documentation/devicetree/bindings/phy/apple,atcrt.yaml b/Documentation/devicetree/bindings/phy/apple,atcrt.yaml index e2898b85fb9bb..6850dcbb97cb7 100644 --- a/Documentation/devicetree/bindings/phy/apple,atcrt.yaml +++ b/Documentation/devicetree/bindings/phy/apple,atcrt.yaml @@ -19,6 +19,8 @@ properties: - enum: - apple,t8103-atcrt - apple,t6000-atcrt + - apple,t8112-atcrt + - apple,t6041-atcrt - const: apple,atcrt reg: diff --git a/Documentation/devicetree/bindings/thunderbolt/apple,t8103-usb4-acio.yaml b/Documentation/devicetree/bindings/thunderbolt/apple,t8103-usb4-acio.yaml index 434a833cd31a2..b201200223bdb 100644 --- a/Documentation/devicetree/bindings/thunderbolt/apple,t8103-usb4-acio.yaml +++ b/Documentation/devicetree/bindings/thunderbolt/apple,t8103-usb4-acio.yaml @@ -17,8 +17,8 @@ description: | The co-processor exposes the Native Host Interface (NHI) and its DART IOMMU to the main SoC bus once it is running. They are therefore represented as - child nodes. All child registers are located in a single 16 MiB MMIO window - and use addresses relative to this window. + child nodes. All child registers use addresses relative to the router's MMIO + window. Type 7 expands that window and shifts its child offsets by 16 MiB. ACIO can only be powered on after the Type-C PHY has been switched to USB4/Thunderbolt mode. Before the connection to the remote device can be @@ -30,6 +30,7 @@ properties: oneOf: - const: apple,t8103-usb4-acio - const: apple,t8142-usb4-acio + - const: apple,t6040-usb4-acio - items: - enum: - apple,t6000-usb4-acio @@ -50,7 +51,7 @@ properties: PCIe adapter configuration space of the USB4 router. Present where the root complex exposes the adapter separately, so that the tunnel can be configured before a PCIe-C link is brought up. - - description: MxWrap co-processor control registers, on T8132 + - description: MxWrap co-processor control registers reg-names: minItems: 2 @@ -60,6 +61,14 @@ properties: - const: pcie-adapter - const: cpu + interrupts: + maxItems: 1 + description: Type 7 SRAM parity interrupt + + interrupt-names: + items: + - const: sram-parity + mboxes: maxItems: 1 description: Mailbox used for RTKit communication with the co-processor @@ -161,11 +170,12 @@ properties: required: - port@1 - iommu@a80000: +patternProperties: + "^iommu@(a80000|1a80000)$": $ref: /schemas/iommu/apple,dart.yaml# description: DART IOMMU exposed by ACIO and used for DMA from the NHI - nhi@f00000: + "^nhi@(f00000|1f00000)$": $ref: /schemas/thunderbolt/apple,t8103-usb4-nhi.yaml# description: Native Host Interface exposed by ACIO @@ -182,8 +192,6 @@ required: - ranges - nonposted-mmio - ports - - iommu@a80000 - - nhi@f00000 allOf: - $ref: /schemas/usb/usb-switch.yaml# @@ -204,6 +212,21 @@ allOf: else: properties: lstx-gpios: false + - if: + properties: + compatible: + contains: + const: apple,t6040-usb4-acio + then: + required: + - iommu@1a80000 + - nhi@1f00000 + - interrupts + - interrupt-names + else: + required: + - iommu@a80000 + - nhi@f00000 additionalProperties: false diff --git a/Documentation/devicetree/bindings/thunderbolt/apple,t8103-usb4-nhi.yaml b/Documentation/devicetree/bindings/thunderbolt/apple,t8103-usb4-nhi.yaml index d6dffe3ec8caf..ef291724b5a67 100644 --- a/Documentation/devicetree/bindings/thunderbolt/apple,t8103-usb4-nhi.yaml +++ b/Documentation/devicetree/bindings/thunderbolt/apple,t8103-usb4-nhi.yaml @@ -22,6 +22,7 @@ properties: oneOf: - const: apple,t8103-usb4-nhi - const: apple,t8142-usb4-nhi + - const: apple,t6040-usb4-nhi - items: - enum: - apple,t6000-usb4-nhi @@ -124,7 +125,9 @@ allOf: properties: compatible: contains: - const: apple,t8142-usb4-nhi + enum: + - apple,t8142-usb4-nhi + - apple,t6040-usb4-nhi then: properties: reg: @@ -147,6 +150,7 @@ allOf: - apple,t8122-usb4-nhi - apple,t8132-usb4-nhi - apple,t8142-usb4-nhi + - apple,t6040-usb4-nhi then: properties: iommus: diff --git a/arch/arm64/boot/dts/apple/t6000-peripherals.dtsi b/arch/arm64/boot/dts/apple/t6000-peripherals.dtsi index e935a6b239be4..57a65f7d8db0d 100644 --- a/arch/arm64/boot/dts/apple/t6000-peripherals.dtsi +++ b/arch/arm64/boot/dts/apple/t6000-peripherals.dtsi @@ -473,3 +473,111 @@ status = "disabled"; }; }; + +/* CPU and cluster power states are described without granting control. */ +&pmgr { + power-controller@0 { + compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate"; + reg = <0x0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "ecpu0_0"; + status = "disabled"; + }; + power-controller@8 { + compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate"; + reg = <0x8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "ecpu0_1"; + status = "disabled"; + }; + power-controller@20 { + compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate"; + reg = <0x20 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu0_0"; + status = "disabled"; + }; + power-controller@28 { + compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate"; + reg = <0x28 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu0_1"; + status = "disabled"; + }; + power-controller@30 { + compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate"; + reg = <0x30 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu0_2"; + status = "disabled"; + }; + power-controller@38 { + compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate"; + reg = <0x38 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu0_3"; + status = "disabled"; + }; + power-controller@40 { + compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate"; + reg = <0x40 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu1_0"; + status = "disabled"; + }; + power-controller@48 { + compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate"; + reg = <0x48 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu1_1"; + status = "disabled"; + }; + power-controller@50 { + compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate"; + reg = <0x50 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu1_2"; + status = "disabled"; + }; + power-controller@58 { + compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate"; + reg = <0x58 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu1_3"; + status = "disabled"; + }; + power-controller@60 { + compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate"; + reg = <0x60 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "ecpm"; + status = "disabled"; + }; + power-controller@68 { + compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate"; + reg = <0x68 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpm0"; + status = "disabled"; + }; + power-controller@70 { + compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate"; + reg = <0x70 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpm1"; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t6040-j616s.dts b/arch/arm64/boot/dts/apple/t6040-j616s.dts index 3d37cdc4df42e..29ba362ed79bc 100644 --- a/arch/arm64/boot/dts/apple/t6040-j616s.dts +++ b/arch/arm64/boot/dts/apple/t6040-j616s.dts @@ -130,3 +130,21 @@ }; }; }; + +&i2c6 { + retimer@18 { + compatible = "apple,t6041-atcrt", "apple,atcrt"; + reg = <0x18>; + status = "disabled"; + }; + retimer@19 { + compatible = "apple,t6041-atcrt", "apple,atcrt"; + reg = <0x19>; + status = "disabled"; + }; + retimer@1a { + compatible = "apple,t6041-atcrt", "apple,atcrt"; + reg = <0x1a>; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t6040-usb4.dtsi b/arch/arm64/boot/dts/apple/t6040-usb4.dtsi new file mode 100644 index 0000000000000..644f9f8766eff --- /dev/null +++ b/arch/arm64/boot/dts/apple/t6040-usb4.dtsi @@ -0,0 +1,516 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* + * T6040 USB4/PCIe-C resource description. + * + * Every node remains disabled until the Type-C PHY transition, bootloader + * tuning handoff, and dynamic PCIe RID-to-SID policy are qualified. + */ + +/ { + aliases { + usb4_0_rc = &usb4_0_acio; + usb4_0_nhi = &usb4_0_nhi; + usb4_0_pcie = &usb4_0_pcie; + usb4-0-pcie-adapter = &usb4_0_acio; + usb4_1_rc = &usb4_1_acio; + usb4_1_nhi = &usb4_1_nhi; + usb4_1_pcie = &usb4_1_pcie; + usb4-1-pcie-adapter = &usb4_1_acio; + usb4_2_rc = &usb4_2_acio; + usb4_2_nhi = &usb4_2_nhi; + usb4_2_pcie = &usb4_2_pcie; + usb4-2-pcie-adapter = &usb4_2_acio; + }; + + usb4_0_acio: cio@381ac0000 { + compatible = "apple,t6040-usb4-acio"; + reg = <0x3 0x81ac0000 0x0 0xc000>, + <0x3 0x81080000 0x0 0x26000>, + <0x3 0x81e44000 0x0 0x4000>, + <0x3 0x81100000 0x0 0x4000>; + reg-names = "rc", "sram", "pcie-adapter", "cpu"; + interrupt-parent = <&aic>; + interrupts = ; + interrupt-names = "sram-parity"; + mboxes = <&usb4_0_mbox>; + resets = <&ps_atc0_cio>; + power-domains = <&ps_atc0_cio>, <&ps_atc0_cio_pcie>, + <&ps_atc0_cio_usb>, <&ps_atc0_pcie>; + thunderbolt-switch; + apple,pcie-tunnel = <&usb4_0_pcie_tunnel>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x3 0x80000000 0x2000000>; + nonposted-mmio; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@1 { + reg = <1>; + endpoint { }; + }; + }; + + usb4_0_dart: iommu@1a80000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x1a80000 0xc000>; + #iommu-cells = <1>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + usb4_0_nhi: nhi@1f00000 { + compatible = "apple,t6040-usb4-nhi"; + reg = <0x1f00000 0x100000>; + reg-names = "nhi"; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + interrupt-names = "txring0", "txring1", "txring2", "txring3", + "txring4", "txring5", "txring6", "txring7", + "txring8", "txring9", "txring10", "txring11", + "rxring0", "rxring1", "rxring2", "rxring3", + "rxring4", "rxring5", "rxring6", "rxring7", + "rxring8", "rxring9", "rxring10", "rxring11"; + iommus = <&usb4_0_dart 0>, <&usb4_0_dart 1>, + <&usb4_0_dart 2>, <&usb4_0_dart 3>, + <&usb4_0_dart 4>, <&usb4_0_dart 5>, + <&usb4_0_dart 6>, <&usb4_0_dart 7>, + <&usb4_0_dart 8>, <&usb4_0_dart 9>, + <&usb4_0_dart 10>, <&usb4_0_dart 11>, + <&usb4_0_dart 16>, <&usb4_0_dart 17>, + <&usb4_0_dart 18>, <&usb4_0_dart 19>, + <&usb4_0_dart 20>, <&usb4_0_dart 21>, + <&usb4_0_dart 22>, <&usb4_0_dart 23>, + <&usb4_0_dart 24>, <&usb4_0_dart 25>, + <&usb4_0_dart 26>, <&usb4_0_dart 27>; + /* To be filled by the loader. */ + apple,thunderbolt-drom = [00]; + status = "disabled"; + }; + }; + + usb4_1_acio: cio@389ac0000 { + compatible = "apple,t6040-usb4-acio"; + reg = <0x3 0x89ac0000 0x0 0xc000>, + <0x3 0x89080000 0x0 0x26000>, + <0x3 0x89e44000 0x0 0x4000>, + <0x3 0x89100000 0x0 0x4000>; + reg-names = "rc", "sram", "pcie-adapter", "cpu"; + interrupt-parent = <&aic>; + interrupts = ; + interrupt-names = "sram-parity"; + mboxes = <&usb4_1_mbox>; + resets = <&ps_atc1_cio>; + power-domains = <&ps_atc1_cio>, <&ps_atc1_cio_pcie>, + <&ps_atc1_cio_usb>, <&ps_atc1_pcie>; + thunderbolt-switch; + apple,pcie-tunnel = <&usb4_1_pcie_tunnel>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x3 0x88000000 0x2000000>; + nonposted-mmio; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@1 { + reg = <1>; + endpoint { }; + }; + }; + + usb4_1_dart: iommu@1a80000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x1a80000 0xc000>; + #iommu-cells = <1>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + usb4_1_nhi: nhi@1f00000 { + compatible = "apple,t6040-usb4-nhi"; + reg = <0x1f00000 0x100000>; + reg-names = "nhi"; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + interrupt-names = "txring0", "txring1", "txring2", "txring3", + "txring4", "txring5", "txring6", "txring7", + "txring8", "txring9", "txring10", "txring11", + "rxring0", "rxring1", "rxring2", "rxring3", + "rxring4", "rxring5", "rxring6", "rxring7", + "rxring8", "rxring9", "rxring10", "rxring11"; + iommus = <&usb4_1_dart 0>, <&usb4_1_dart 1>, + <&usb4_1_dart 2>, <&usb4_1_dart 3>, + <&usb4_1_dart 4>, <&usb4_1_dart 5>, + <&usb4_1_dart 6>, <&usb4_1_dart 7>, + <&usb4_1_dart 8>, <&usb4_1_dart 9>, + <&usb4_1_dart 10>, <&usb4_1_dart 11>, + <&usb4_1_dart 16>, <&usb4_1_dart 17>, + <&usb4_1_dart 18>, <&usb4_1_dart 19>, + <&usb4_1_dart 20>, <&usb4_1_dart 21>, + <&usb4_1_dart 22>, <&usb4_1_dart 23>, + <&usb4_1_dart 24>, <&usb4_1_dart 25>, + <&usb4_1_dart 26>, <&usb4_1_dart 27>; + /* To be filled by the loader. */ + apple,thunderbolt-drom = [00]; + status = "disabled"; + }; + }; + + usb4_2_acio: cio@391ac0000 { + compatible = "apple,t6040-usb4-acio"; + reg = <0x3 0x91ac0000 0x0 0xc000>, + <0x3 0x91080000 0x0 0x26000>, + <0x3 0x91e44000 0x0 0x4000>, + <0x3 0x91100000 0x0 0x4000>; + reg-names = "rc", "sram", "pcie-adapter", "cpu"; + interrupt-parent = <&aic>; + interrupts = ; + interrupt-names = "sram-parity"; + mboxes = <&usb4_2_mbox>; + resets = <&ps_atc2_cio>; + power-domains = <&ps_atc2_cio>, <&ps_atc2_cio_pcie>, + <&ps_atc2_cio_usb>, <&ps_atc2_pcie>; + thunderbolt-switch; + apple,pcie-tunnel = <&usb4_2_pcie_tunnel>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x3 0x90000000 0x2000000>; + nonposted-mmio; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@1 { + reg = <1>; + endpoint { }; + }; + }; + + usb4_2_dart: iommu@1a80000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x1a80000 0xc000>; + #iommu-cells = <1>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + usb4_2_nhi: nhi@1f00000 { + compatible = "apple,t6040-usb4-nhi"; + reg = <0x1f00000 0x100000>; + reg-names = "nhi"; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + interrupt-names = "txring0", "txring1", "txring2", "txring3", + "txring4", "txring5", "txring6", "txring7", + "txring8", "txring9", "txring10", "txring11", + "rxring0", "rxring1", "rxring2", "rxring3", + "rxring4", "rxring5", "rxring6", "rxring7", + "rxring8", "rxring9", "rxring10", "rxring11"; + iommus = <&usb4_2_dart 0>, <&usb4_2_dart 1>, + <&usb4_2_dart 2>, <&usb4_2_dart 3>, + <&usb4_2_dart 4>, <&usb4_2_dart 5>, + <&usb4_2_dart 6>, <&usb4_2_dart 7>, + <&usb4_2_dart 8>, <&usb4_2_dart 9>, + <&usb4_2_dart 10>, <&usb4_2_dart 11>, + <&usb4_2_dart 16>, <&usb4_2_dart 17>, + <&usb4_2_dart 18>, <&usb4_2_dart 19>, + <&usb4_2_dart 20>, <&usb4_2_dart 21>, + <&usb4_2_dart 22>, <&usb4_2_dart 23>, + <&usb4_2_dart 24>, <&usb4_2_dart 25>, + <&usb4_2_dart 26>, <&usb4_2_dart 27>; + /* To be filled by the loader. */ + apple,thunderbolt-drom = [00]; + status = "disabled"; + }; + }; + + usb4_0_pcie_tunnel: usb4-pcie-tunnel-0 { + #address-cells = <2>; + #size-cells = <2>; + ranges; + nonposted-mmio; + + apciec0_dart: iommu@384000000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x3 0x84000000 0x0 0x20000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + usb4_0_pcie: pcie@1c50000000 { + compatible = "apple,t6040-pciec"; + device_type = "pci"; + reg = <0x1c 0x50000000 0x0 0x10000000>, + <0x3 0x84034000 0x0 0x4000>, + <0x3 0x84020000 0x0 0x8000>, + <0x3 0x84038000 0x0 0x4000>, + <0x3 0x84060000 0x0 0x4000>, + <0x3 0x80020000 0x0 0x4000>, + <0x3 0x8402c000 0x0 0x4000>, + <0x3 0x84028000 0x0 0x4000>; + reg-names = "config", "rc", "port0", "fabric", "debug", + "ioa", "ltssm", "intr2axi"; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + , + ; + interrupt-names = "port", "intx-a", "intx-b", "intx-c", + "intx-d", "parity"; + power-domains = <&ps_atc0_pcie>; + msi-controller; + msi-parent = <&usb4_0_pcie>; + msi-ranges = <&aic AIC_IRQ 2103 IRQ_TYPE_EDGE_RISING 32>; + apple,msi-vector-base = <0x20>; + iommu-map = <0x0 &apciec0_dart 0x0 0x100>; + iommu-map-mask = <0xff>; + bus-range = <0x0 0x80>; + #address-cells = <3>; + #size-cells = <2>; + ranges = <0x43000000 0x8 0x0 0x8 0x0 0x2 0x0>, + <0x02000000 0x0 0x100000 0xa 0x100000 0x0 0x3ff00000>, + <0x42000000 0x0 0x40000000 0xa 0x40000000 0x0 0x40000000>; + status = "disabled"; + + usb4_0_pcie_port: pci@0,0 { + device_type = "pci"; + reg = <0x0 0x0 0x0 0x0 0x0>; + external-facing; + #address-cells = <3>; + #size-cells = <2>; + ranges; + interrupt-controller; + #interrupt-cells = <1>; + interrupt-map-mask = <0 0 0 7>; + interrupt-map = <0 0 0 1 &usb4_0_pcie_port 0 0 0 0>, + <0 0 0 2 &usb4_0_pcie_port 0 0 0 1>, + <0 0 0 3 &usb4_0_pcie_port 0 0 0 2>, + <0 0 0 4 &usb4_0_pcie_port 0 0 0 3>; + }; + }; + }; + + usb4_1_pcie_tunnel: usb4-pcie-tunnel-1 { + #address-cells = <2>; + #size-cells = <2>; + ranges; + nonposted-mmio; + + apciec1_dart: iommu@38c000000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x3 0x8c000000 0x0 0x20000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + usb4_1_pcie: pcie@1c60000000 { + compatible = "apple,t6040-pciec"; + device_type = "pci"; + reg = <0x1c 0x60000000 0x0 0x10000000>, + <0x3 0x8c034000 0x0 0x4000>, + <0x3 0x8c020000 0x0 0x8000>, + <0x3 0x8c038000 0x0 0x4000>, + <0x3 0x8c060000 0x0 0x4000>, + <0x3 0x88020000 0x0 0x4000>, + <0x3 0x8c02c000 0x0 0x4000>, + <0x3 0x8c028000 0x0 0x4000>; + reg-names = "config", "rc", "port0", "fabric", "debug", + "ioa", "ltssm", "intr2axi"; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + , + ; + interrupt-names = "port", "intx-a", "intx-b", "intx-c", + "intx-d", "parity"; + power-domains = <&ps_atc1_pcie>; + msi-controller; + msi-parent = <&usb4_1_pcie>; + msi-ranges = <&aic AIC_IRQ 2135 IRQ_TYPE_EDGE_RISING 32>; + apple,msi-vector-base = <0x40>; + iommu-map = <0x0 &apciec1_dart 0x0 0x100>; + iommu-map-mask = <0xff>; + bus-range = <0x0 0x80>; + #address-cells = <3>; + #size-cells = <2>; + ranges = <0x43000000 0xc 0x0 0xc 0x0 0x2 0x0>, + <0x02000000 0x0 0x100000 0xe 0x100000 0x0 0x3ff00000>, + <0x42000000 0x0 0x40000000 0xe 0x40000000 0x0 0x40000000>; + status = "disabled"; + + usb4_1_pcie_port: pci@0,0 { + device_type = "pci"; + reg = <0x0 0x0 0x0 0x0 0x0>; + external-facing; + #address-cells = <3>; + #size-cells = <2>; + ranges; + interrupt-controller; + #interrupt-cells = <1>; + interrupt-map-mask = <0 0 0 7>; + interrupt-map = <0 0 0 1 &usb4_1_pcie_port 0 0 0 0>, + <0 0 0 2 &usb4_1_pcie_port 0 0 0 1>, + <0 0 0 3 &usb4_1_pcie_port 0 0 0 2>, + <0 0 0 4 &usb4_1_pcie_port 0 0 0 3>; + }; + }; + }; + + usb4_2_pcie_tunnel: usb4-pcie-tunnel-2 { + #address-cells = <2>; + #size-cells = <2>; + ranges; + nonposted-mmio; + + apciec2_dart: iommu@394000000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x3 0x94000000 0x0 0x20000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + usb4_2_pcie: pcie@1c70000000 { + compatible = "apple,t6040-pciec"; + device_type = "pci"; + reg = <0x1c 0x70000000 0x0 0x10000000>, + <0x3 0x94034000 0x0 0x4000>, + <0x3 0x94020000 0x0 0x8000>, + <0x3 0x94038000 0x0 0x4000>, + <0x3 0x94060000 0x0 0x4000>, + <0x3 0x90020000 0x0 0x4000>, + <0x3 0x9402c000 0x0 0x4000>, + <0x3 0x94028000 0x0 0x4000>; + reg-names = "config", "rc", "port0", "fabric", "debug", + "ioa", "ltssm", "intr2axi"; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + , + ; + interrupt-names = "port", "intx-a", "intx-b", "intx-c", + "intx-d", "parity"; + power-domains = <&ps_atc2_pcie>; + msi-controller; + msi-parent = <&usb4_2_pcie>; + msi-ranges = <&aic AIC_IRQ 2167 IRQ_TYPE_EDGE_RISING 32>; + apple,msi-vector-base = <0x60>; + iommu-map = <0x0 &apciec2_dart 0x0 0x100>; + iommu-map-mask = <0xff>; + bus-range = <0x0 0x80>; + #address-cells = <3>; + #size-cells = <2>; + ranges = <0x43000000 0x10 0x0 0x10 0x0 0x2 0x0>, + <0x02000000 0x0 0x100000 0x12 0x100000 0x0 0x3ff00000>, + <0x42000000 0x0 0x40000000 0x12 0x40000000 0x0 0x40000000>; + status = "disabled"; + + usb4_2_pcie_port: pci@0,0 { + device_type = "pci"; + reg = <0x0 0x0 0x0 0x0 0x0>; + external-facing; + #address-cells = <3>; + #size-cells = <2>; + ranges; + interrupt-controller; + #interrupt-cells = <1>; + interrupt-map-mask = <0 0 0 7>; + interrupt-map = <0 0 0 1 &usb4_2_pcie_port 0 0 0 0>, + <0 0 0 2 &usb4_2_pcie_port 0 0 0 1>, + <0 0 0 3 &usb4_2_pcie_port 0 0 0 2>, + <0 0 0 4 &usb4_2_pcie_port 0 0 0 3>; + }; + }; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t6040.dtsi b/arch/arm64/boot/dts/apple/t6040.dtsi index bd31e6435411e..bb9e68b23aac3 100644 --- a/arch/arm64/boot/dts/apple/t6040.dtsi +++ b/arch/arm64/boot/dts/apple/t6040.dtsi @@ -327,33 +327,6 @@ status = "disabled"; }; - apciec0_dart: iommu@384000000 { - compatible = "apple,t6041-dart", "apple,t8110-dart"; - reg = <0x3 0x84000000 0x0 0x20000>; - #iommu-cells = <1>; - interrupt-parent = <&aic>; - interrupts = ; - status = "disabled"; - }; - - apciec1_dart: iommu@38c000000 { - compatible = "apple,t6041-dart", "apple,t8110-dart"; - reg = <0x3 0x8c000000 0x0 0x20000>; - #iommu-cells = <1>; - interrupt-parent = <&aic>; - interrupts = ; - status = "disabled"; - }; - - apciec2_dart: iommu@394000000 { - compatible = "apple,t6041-dart", "apple,t8110-dart"; - reg = <0x3 0x94000000 0x0 0x20000>; - #iommu-cells = <1>; - interrupt-parent = <&aic>; - interrupts = ; - status = "disabled"; - }; - apcie1_dart: iommu@411000000 { compatible = "apple,t6041-dart", "apple,t8110-dart"; reg = <0x4 0x11000000 0x0 0x20000>; @@ -486,16 +459,6 @@ status = "disabled"; }; - usb4_0_dart: iommu@381a80000 { - compatible = "apple,t6041-dart", "apple,t8110-dart"; - reg = <0x3 0x81a80000 0x0 0xc000>; - #iommu-cells = <1>; - apple,dma-range = <0x100 0x0 0x300 0x0>; - interrupt-parent = <&aic>; - interrupts = ; - status = "disabled"; - }; - /* ACIO 1 remains disabled until its host-router handoff is supported. */ usb4_1_mbox: mailbox@389108000 { compatible = "apple,t6041-asc-mailbox", "apple,asc-mailbox-v4"; @@ -512,16 +475,6 @@ status = "disabled"; }; - usb4_1_dart: iommu@389a80000 { - compatible = "apple,t6041-dart", "apple,t8110-dart"; - reg = <0x3 0x89a80000 0x0 0xc000>; - #iommu-cells = <1>; - apple,dma-range = <0x100 0x0 0x300 0x0>; - interrupt-parent = <&aic>; - interrupts = ; - status = "disabled"; - }; - /* ACIO 2 remains disabled until its host-router handoff is supported. */ usb4_2_mbox: mailbox@391108000 { compatible = "apple,t6041-asc-mailbox", "apple,asc-mailbox-v4"; @@ -538,15 +491,6 @@ status = "disabled"; }; - usb4_2_dart: iommu@391a80000 { - compatible = "apple,t6041-dart", "apple,t8110-dart"; - reg = <0x3 0x91a80000 0x0 0xc000>; - #iommu-cells = <1>; - apple,dma-range = <0x100 0x0 0x300 0x0>; - interrupt-parent = <&aic>; - interrupts = ; - status = "disabled"; - }; }; &avd { @@ -687,3 +631,5 @@ apple,peak-bandwidth-bytes-per-second = /bits/ 64 <273066666656>; apple,bandwidth-class-bytes-per-second = /bits/ 64 <273000000000>; }; + +#include "t6040-usb4.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8112-j413.dts b/arch/arm64/boot/dts/apple/t8112-j413.dts index 6905fccec5299..bca9de836a999 100644 --- a/arch/arm64/boot/dts/apple/t8112-j413.dts +++ b/arch/arm64/boot/dts/apple/t8112-j413.dts @@ -313,3 +313,38 @@ status = "disabled"; }; }; + +&i2c2 { + retimer@18 { + compatible = "apple,t8112-atcrt", "apple,atcrt"; + reg = <0x18>; + status = "disabled"; + }; + retimer@19 { + compatible = "apple,t8112-atcrt", "apple,atcrt"; + reg = <0x19>; + status = "disabled"; + }; +}; + +&spi4 { + panel_controller: panel-timing-controller@0 { + compatible = "parade,dp855"; + reg = <0>; + status = "disabled"; + }; +}; + +&i2c4 { + avellino@44 { + compatible = "apple,t8112-avellino", "apple,avellino"; + reg = <0x44>; + status = "disabled"; + }; + + avellino@77 { + compatible = "apple,t8112-avellino", "apple,avellino"; + reg = <0x77>; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t8112-peripherals.dtsi b/arch/arm64/boot/dts/apple/t8112-peripherals.dtsi index 45e9fea6e3f94..1869b990d571f 100644 --- a/arch/arm64/boot/dts/apple/t8112-peripherals.dtsi +++ b/arch/arm64/boot/dts/apple/t8112-peripherals.dtsi @@ -380,3 +380,87 @@ status = "disabled"; }; }; + +/* CPU and cluster power states are described without granting control. */ +&pmgr { + power-controller@0 { + compatible = "apple,t8112-pmgr-pwrstate", "apple,pmgr-pwrstate"; + reg = <0x0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "ecpu0"; + status = "disabled"; + }; + power-controller@8 { + compatible = "apple,t8112-pmgr-pwrstate", "apple,pmgr-pwrstate"; + reg = <0x8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "ecpu1"; + status = "disabled"; + }; + power-controller@10 { + compatible = "apple,t8112-pmgr-pwrstate", "apple,pmgr-pwrstate"; + reg = <0x10 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "ecpu2"; + status = "disabled"; + }; + power-controller@18 { + compatible = "apple,t8112-pmgr-pwrstate", "apple,pmgr-pwrstate"; + reg = <0x18 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "ecpu3"; + status = "disabled"; + }; + power-controller@20 { + compatible = "apple,t8112-pmgr-pwrstate", "apple,pmgr-pwrstate"; + reg = <0x20 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu0"; + status = "disabled"; + }; + power-controller@28 { + compatible = "apple,t8112-pmgr-pwrstate", "apple,pmgr-pwrstate"; + reg = <0x28 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu1"; + status = "disabled"; + }; + power-controller@30 { + compatible = "apple,t8112-pmgr-pwrstate", "apple,pmgr-pwrstate"; + reg = <0x30 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu2"; + status = "disabled"; + }; + power-controller@38 { + compatible = "apple,t8112-pmgr-pwrstate", "apple,pmgr-pwrstate"; + reg = <0x38 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu3"; + status = "disabled"; + }; + power-controller@40 { + compatible = "apple,t8112-pmgr-pwrstate", "apple,pmgr-pwrstate"; + reg = <0x40 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "ecpm"; + status = "disabled"; + }; + power-controller@48 { + compatible = "apple,t8112-pmgr-pwrstate", "apple,pmgr-pwrstate"; + reg = <0x48 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpm"; + status = "disabled"; + }; +}; From 86fd4af60093cc4b8ceb7c1cb94d902ccbf1a011 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 05:34:47 +1100 Subject: [PATCH 2/4] arm64: dts: apple: describe J413 radio and NFC SPMI endpoints Reuse the generic radio PMU and Stockholm SPMI bindings for the populated followers. Both endpoints and their parent controllers remain disabled. Assisted-by: LLM Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> --- .../bindings/misc/apple,radio-pmu.yaml | 1 + .../net/nfc/apple,stockholm-spmi.yaml | 1 + arch/arm64/boot/dts/apple/t8112-j413.dts | 27 +++++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/Documentation/devicetree/bindings/misc/apple,radio-pmu.yaml b/Documentation/devicetree/bindings/misc/apple,radio-pmu.yaml index 3fc72258f1d96..b4f53a082bb8d 100644 --- a/Documentation/devicetree/bindings/misc/apple,radio-pmu.yaml +++ b/Documentation/devicetree/bindings/misc/apple,radio-pmu.yaml @@ -20,6 +20,7 @@ properties: - apple,t6041-radio-pmu - apple,t6000-wifibt-pmu - apple,t6000-uwb-pmu + - apple,t8112-wifibt-pmu - const: apple,radio-pmu reg: diff --git a/Documentation/devicetree/bindings/net/nfc/apple,stockholm-spmi.yaml b/Documentation/devicetree/bindings/net/nfc/apple,stockholm-spmi.yaml index 7187abfb733df..8a60fd5c95946 100644 --- a/Documentation/devicetree/bindings/net/nfc/apple,stockholm-spmi.yaml +++ b/Documentation/devicetree/bindings/net/nfc/apple,stockholm-spmi.yaml @@ -20,6 +20,7 @@ properties: - enum: - apple,t8103-stockholm-spmi - apple,t6000-stockholm-spmi + - apple,t8112-stockholm-spmi - const: apple,stockholm-spmi reg: diff --git a/arch/arm64/boot/dts/apple/t8112-j413.dts b/arch/arm64/boot/dts/apple/t8112-j413.dts index bca9de836a999..6bea58173d2ab 100644 --- a/arch/arm64/boot/dts/apple/t8112-j413.dts +++ b/arch/arm64/boot/dts/apple/t8112-j413.dts @@ -348,3 +348,30 @@ status = "disabled"; }; }; + +&aop_spmi0 { + radio-pmu@e { + compatible = "apple,t8112-wifibt-pmu", "apple,radio-pmu"; + reg = <0xe SPMI_USID>; + status = "disabled"; + }; +}; + +&aop_spmi1 { + interrupt-controller; + #interrupt-cells = <2>; + + nfc@c { + compatible = "apple,t8112-stockholm-spmi", "apple,stockholm-spmi"; + reg = <0xc SPMI_USID>; + interrupt-parent = <&aop_spmi1>; + interrupts = <160 IRQ_TYPE_NONE>, + <161 IRQ_TYPE_NONE>, + <162 IRQ_TYPE_NONE>, + <163 IRQ_TYPE_NONE>, + <164 IRQ_TYPE_NONE>, + <165 IRQ_TYPE_NONE>, + <166 IRQ_TYPE_NONE>; + status = "disabled"; + }; +}; From 5ae6f51e1aa8c12aa6ed270b9787a85cbb316773 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 05:38:46 +1100 Subject: [PATCH 3/4] arm64: dts: apple: keep the described PCIe tunnel containers disabled T6040 USB4 resource description from linux#1052. Only DT and binding description content is reused; no PCI or Thunderbolt driver changes are included. Keep the tunnel containers explicitly disabled along with their physical child devices. Assisted-by: LLM Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> --- arch/arm64/boot/dts/apple/t6040-usb4.dtsi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/boot/dts/apple/t6040-usb4.dtsi b/arch/arm64/boot/dts/apple/t6040-usb4.dtsi index 644f9f8766eff..178642ec35005 100644 --- a/arch/arm64/boot/dts/apple/t6040-usb4.dtsi +++ b/arch/arm64/boot/dts/apple/t6040-usb4.dtsi @@ -309,6 +309,7 @@ #size-cells = <2>; ranges; nonposted-mmio; + status = "disabled"; apciec0_dart: iommu@384000000 { compatible = "apple,t6041-dart", "apple,t8110-dart"; @@ -379,6 +380,7 @@ #size-cells = <2>; ranges; nonposted-mmio; + status = "disabled"; apciec1_dart: iommu@38c000000 { compatible = "apple,t6041-dart", "apple,t8110-dart"; @@ -449,6 +451,7 @@ #size-cells = <2>; ranges; nonposted-mmio; + status = "disabled"; apciec2_dart: iommu@394000000 { compatible = "apple,t6041-dart", "apple,t8110-dart"; From ab8ec26802241a88b755c0f56b27987785c262b1 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 05:41:24 +1100 Subject: [PATCH 4/4] arm64: dts: apple: use schema-compliant T6040 USB4 alias names Normalize the aliases in the description from linux#1052 to the lowercase, digits and hyphens required by the core schema. Node labels and all resource references stay the same; every router and PCIe tunnel remains disabled. Assisted-by: LLM Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> --- arch/arm64/boot/dts/apple/t6040-usb4.dtsi | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t6040-usb4.dtsi b/arch/arm64/boot/dts/apple/t6040-usb4.dtsi index 178642ec35005..dbe1e9c8a7a6f 100644 --- a/arch/arm64/boot/dts/apple/t6040-usb4.dtsi +++ b/arch/arm64/boot/dts/apple/t6040-usb4.dtsi @@ -8,17 +8,17 @@ / { aliases { - usb4_0_rc = &usb4_0_acio; - usb4_0_nhi = &usb4_0_nhi; - usb4_0_pcie = &usb4_0_pcie; + usb4-0-rc = &usb4_0_acio; + usb4-0-nhi = &usb4_0_nhi; + usb4-0-pcie = &usb4_0_pcie; usb4-0-pcie-adapter = &usb4_0_acio; - usb4_1_rc = &usb4_1_acio; - usb4_1_nhi = &usb4_1_nhi; - usb4_1_pcie = &usb4_1_pcie; + usb4-1-rc = &usb4_1_acio; + usb4-1-nhi = &usb4_1_nhi; + usb4-1-pcie = &usb4_1_pcie; usb4-1-pcie-adapter = &usb4_1_acio; - usb4_2_rc = &usb4_2_acio; - usb4_2_nhi = &usb4_2_nhi; - usb4_2_pcie = &usb4_2_pcie; + usb4-2-rc = &usb4_2_acio; + usb4-2-nhi = &usb4_2_nhi; + usb4-2-pcie = &usb4_2_pcie; usb4-2-pcie-adapter = &usb4_2_acio; };