From fe577f13678d33b5d45f1a424dfc03bf77daa16d Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 01:43:18 +1100 Subject: [PATCH 01/12] dt-bindings: apple: extend resource inventories to T8142 and T8152 Reuse the merged generic hardware contracts. Add the board identities and native error/event register and interrupt counts without changing the established generation-specific cases. These additions describe hardware resources and do not authorize driver takeover. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../devicetree/bindings/arm/apple.yaml | 10 ++- .../bindings/dma/apple,pcie-piodma.yaml | 6 ++ .../bindings/dma/apple,pciec-piodma.yaml | 6 ++ .../edac/apple,soc-error-handler.yaml | 76 ++++++++++++++++++- .../mailbox/apple,secure-mailbox.yaml | 3 + .../media/apple,isp-secure-proxy.yaml | 3 + .../bindings/soc/apple/apple,aon-ptd.yaml | 6 ++ .../bindings/soc/apple/apple,esm.yaml | 6 ++ .../bindings/soc/apple/apple,rsm.yaml | 6 ++ .../bindings/timer/apple,aic-timebase.yaml | 6 ++ .../watchdog/apple,secure-watchdog.yaml | 3 + 11 files changed, 127 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/apple.yaml b/Documentation/devicetree/bindings/arm/apple.yaml index 19972afe6eb3d..9895cf5a44824 100644 --- a/Documentation/devicetree/bindings/arm/apple.yaml +++ b/Documentation/devicetree/bindings/arm/apple.yaml @@ -365,13 +365,19 @@ properties: - description: Apple M5 SoC based platforms items: - - const: apple,j813 # MacBook Air (13-inch, M5, 2026) + - enum: + - apple,j704 # MacBook Pro (14-inch, M5) + - apple,j813 # MacBook Air (13-inch, M5, 2026) + - apple,j815 # MacBook Air (15-inch, M5) - const: apple,t8142 - const: apple,arm-platform - description: Apple M6 SoC based platforms items: - - const: apple,j873g # Mac mini (M6) + - enum: + - apple,j804 # MacBook Pro (14-inch, M6) + - apple,j833ct # iMac (M6) + - apple,j873g # Mac mini (M6) - const: apple,t8152 - const: apple,arm-platform diff --git a/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml b/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml index 530b4f7402804..bf855c696c889 100644 --- a/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml +++ b/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml @@ -16,6 +16,12 @@ description: | properties: compatible: oneOf: + - items: + - const: apple,t8142-pcie-piodma + - const: apple,pcie-piodma + - items: + - const: apple,t8152-pcie-piodma + - const: apple,pcie-piodma - items: - const: apple,t6041-pcie-piodma - const: apple,pcie-piodma diff --git a/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml b/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml index 7381a24bba808..1edbf9d91c01a 100644 --- a/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml +++ b/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml @@ -16,6 +16,12 @@ description: | properties: compatible: oneOf: + - items: + - const: apple,t8142-pciec-piodma + - const: apple,pciec-piodma + - items: + - const: apple,t8152-pciec-piodma + - const: apple,pciec-piodma - items: - const: apple,t6041-pciec-piodma - const: apple,pciec-piodma diff --git a/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml b/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml index 157b0f836b1e3..a4b5024a8f670 100644 --- a/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml +++ b/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml @@ -17,6 +17,18 @@ description: | properties: compatible: oneOf: + - items: + - const: apple,t8142-error-handler + - const: apple,soc-error-handler + - items: + - const: apple,t8142-event-log + - const: apple,soc-event-log + - items: + - const: apple,t8152-error-handler + - const: apple,soc-error-handler + - items: + - const: apple,t8152-event-log + - const: apple,soc-event-log - items: - const: apple,t6041-error-handler - const: apple,soc-error-handler @@ -32,11 +44,11 @@ properties: interrupts: minItems: 9 - maxItems: 89 + maxItems: 96 reg: minItems: 10 - maxItems: 25 + maxItems: 120 description: | T6041 uses the qualified per-source NI status apertures in interrupt order. T8140 publishes its native error/event register banks in @@ -48,6 +60,66 @@ required: - interrupts allOf: + - if: + properties: + compatible: + contains: + const: apple,t8142-error-handler + then: + properties: + reg: + minItems: 33 + maxItems: 33 + interrupts: + minItems: 31 + maxItems: 31 + required: + - reg + - if: + properties: + compatible: + contains: + const: apple,t8142-event-log + then: + properties: + reg: + minItems: 51 + maxItems: 51 + interrupts: + minItems: 13 + maxItems: 13 + required: + - reg + - if: + properties: + compatible: + contains: + const: apple,t8152-error-handler + then: + properties: + reg: + minItems: 120 + maxItems: 120 + interrupts: + minItems: 96 + maxItems: 96 + required: + - reg + - if: + properties: + compatible: + contains: + const: apple,t8152-event-log + then: + properties: + reg: + minItems: 57 + maxItems: 57 + interrupts: + minItems: 9 + maxItems: 9 + required: + - reg - if: properties: compatible: diff --git a/Documentation/devicetree/bindings/mailbox/apple,secure-mailbox.yaml b/Documentation/devicetree/bindings/mailbox/apple,secure-mailbox.yaml index d9a92eefd1356..d0431819daee5 100644 --- a/Documentation/devicetree/bindings/mailbox/apple,secure-mailbox.yaml +++ b/Documentation/devicetree/bindings/mailbox/apple,secure-mailbox.yaml @@ -16,6 +16,9 @@ description: | properties: compatible: oneOf: + - items: + - const: apple,t8142-secure-mailbox + - const: apple,secure-mailbox - items: - const: apple,t8140-secure-mailbox - const: apple,secure-mailbox diff --git a/Documentation/devicetree/bindings/media/apple,isp-secure-proxy.yaml b/Documentation/devicetree/bindings/media/apple,isp-secure-proxy.yaml index cb90bbe4b4251..ce7fc20cd3a53 100644 --- a/Documentation/devicetree/bindings/media/apple,isp-secure-proxy.yaml +++ b/Documentation/devicetree/bindings/media/apple,isp-secure-proxy.yaml @@ -16,6 +16,9 @@ description: | properties: compatible: oneOf: + - items: + - const: apple,t8152-isp-secure-proxy + - const: apple,isp-secure-proxy - items: - const: apple,t8140-isp-secure-proxy - const: apple,isp-secure-proxy diff --git a/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml b/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml index 13dec59b733fc..14b0f932466e8 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml @@ -16,6 +16,12 @@ description: | properties: compatible: oneOf: + - items: + - const: apple,t8142-aon-ptd + - const: apple,aon-ptd + - items: + - const: apple,t8152-aon-ptd + - const: apple,aon-ptd - items: - const: apple,t6041-aon-ptd - const: apple,aon-ptd diff --git a/Documentation/devicetree/bindings/soc/apple/apple,esm.yaml b/Documentation/devicetree/bindings/soc/apple/apple,esm.yaml index 0565bb2dfdf95..e345cddf610d0 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,esm.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,esm.yaml @@ -16,6 +16,12 @@ description: | properties: compatible: oneOf: + - items: + - const: apple,t8142-esm + - const: apple,esm + - items: + - const: apple,t8152-esm + - const: apple,esm - items: - const: apple,t8140-esm - const: apple,esm diff --git a/Documentation/devicetree/bindings/soc/apple/apple,rsm.yaml b/Documentation/devicetree/bindings/soc/apple/apple,rsm.yaml index 15e3e504b06ba..d33c0b8826aa0 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,rsm.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,rsm.yaml @@ -15,6 +15,12 @@ description: | properties: compatible: oneOf: + - items: + - const: apple,t8142-rsm + - const: apple,rsm + - items: + - const: apple,t8152-rsm + - const: apple,rsm - items: - const: apple,t8140-rsm - const: apple,rsm diff --git a/Documentation/devicetree/bindings/timer/apple,aic-timebase.yaml b/Documentation/devicetree/bindings/timer/apple,aic-timebase.yaml index 19a606988c907..6e445d52dec60 100644 --- a/Documentation/devicetree/bindings/timer/apple,aic-timebase.yaml +++ b/Documentation/devicetree/bindings/timer/apple,aic-timebase.yaml @@ -15,6 +15,12 @@ description: | properties: compatible: oneOf: + - items: + - const: apple,t8142-aic-timebase + - const: apple,aic-timebase + - items: + - const: apple,t8152-aic-timebase + - const: apple,aic-timebase - items: - const: apple,t6041-aic-timebase - const: apple,aic-timebase diff --git a/Documentation/devicetree/bindings/watchdog/apple,secure-watchdog.yaml b/Documentation/devicetree/bindings/watchdog/apple,secure-watchdog.yaml index 706d1ed52ef64..6a0082e9b94c9 100644 --- a/Documentation/devicetree/bindings/watchdog/apple,secure-watchdog.yaml +++ b/Documentation/devicetree/bindings/watchdog/apple,secure-watchdog.yaml @@ -15,6 +15,9 @@ description: | properties: compatible: oneOf: + - items: + - const: apple,t8142-secure-watchdog + - const: apple,secure-watchdog - items: - const: apple,t8140-secure-watchdog - const: apple,secure-watchdog From d55c39319e5d11dffee4860ef66503e38dd07623 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 01:43:18 +1100 Subject: [PATCH 02/12] arm64: dts: apple: add disabled T8142 board inventories Describe J704 and J815 identities and CPU/interrupt/serial resources in a common SoC include. Add disabled DART, PIODMA, error-monitoring, telemetry and secure-transport inventories where the complete merged interface is resolved. Preserve the qualified J813 profile and leave ownership, APIF splits and downstream wiring for separate work. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- arch/arm64/boot/dts/apple/Makefile | 2 + .../boot/dts/apple/t8142-j704-inventory.dtsi | 535 ++++++++++++++++++ arch/arm64/boot/dts/apple/t8142-j704.dts | 12 + .../boot/dts/apple/t8142-j813-inventory.dtsi | 336 +++++++++++ arch/arm64/boot/dts/apple/t8142-j813.dts | 2 + .../boot/dts/apple/t8142-j815-inventory.dtsi | 481 ++++++++++++++++ arch/arm64/boot/dts/apple/t8142-j815.dts | 12 + arch/arm64/boot/dts/apple/t8142.dtsi | 175 ++++++ 8 files changed, 1555 insertions(+) create mode 100644 arch/arm64/boot/dts/apple/t8142-j704-inventory.dtsi create mode 100644 arch/arm64/boot/dts/apple/t8142-j704.dts create mode 100644 arch/arm64/boot/dts/apple/t8142-j813-inventory.dtsi create mode 100644 arch/arm64/boot/dts/apple/t8142-j815-inventory.dtsi create mode 100644 arch/arm64/boot/dts/apple/t8142-j815.dts create mode 100644 arch/arm64/boot/dts/apple/t8142.dtsi diff --git a/arch/arm64/boot/dts/apple/Makefile b/arch/arm64/boot/dts/apple/Makefile index 52b15f4bdb8cb..5f9646c716d2f 100644 --- a/arch/arm64/boot/dts/apple/Makefile +++ b/arch/arm64/boot/dts/apple/Makefile @@ -120,3 +120,5 @@ dtb-$(CONFIG_ARCH_APPLE) += t8142-j813.dtb dtb-$(CONFIG_ARCH_APPLE) += t8152-j873g.dtb # Explicit cold-ANE lead test; never select as the production board DTB. +dtb-$(CONFIG_ARCH_APPLE) += t8142-j704.dtb +dtb-$(CONFIG_ARCH_APPLE) += t8142-j815.dtb diff --git a/arch/arm64/boot/dts/apple/t8142-j704-inventory.dtsi b/arch/arm64/boot/dts/apple/t8142-j704-inventory.dtsi new file mode 100644 index 0000000000000..70bafb7633f1b --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8142-j704-inventory.dtsi @@ -0,0 +1,535 @@ +// SPDX-License-Identifier: GPL-2.0-only OR MIT +/* Hardware resources only. Ownership and driver enables require qualification. */ + +&{/soc} { + + dt5_dart_apcie2: iommu@48a000000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x8a000000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_apcie0: iommu@488000000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x88000000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_apciec0: iommu@404000000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x4000000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_acio0: iommu@401a80000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x1a80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_apciec1: iommu@40c000000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0xc000000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_acio1: iommu@409a80000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x9a80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_apciec3: iommu@41c000000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x1c000000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_acio3: iommu@419a80000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x19a80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_aop: iommu@390fc0000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x90fc0000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_pmp: iommu@380300000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x80300000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_sep: iommu@308b80000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x8b80000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_sio: iommu@3a5060000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xa5060000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_rsm: iommu@3899a0000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x899a0000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_mtp: iommu@394800000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x94800000 0x0 0xc000>, + <0x3 0x94810000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_usb0: iommu@402f00000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x2f00000 0x0 0xc000>, + <0x4 0x2f80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_usb1: iommu@40af00000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0xaf00000 0x0 0xc000>, + <0x4 0xaf80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_usb3: iommu@41af00000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x1af00000 0x0 0xc000>, + <0x4 0x1af80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dcp: iommu@286340000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x2 0x86340000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_disp0: iommu@286300000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x2 0x86300000 0x0 0xc000>, + <0x2 0x86314000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_disp0_isoc: iommu@286180000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x2 0x86180000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dcpext0: iommu@506340000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x6340000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dispext0: iommu@506300000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x6300000 0x0 0xc000>, + <0x5 0x6314000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dispext0_isoc: iommu@506180000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x6180000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dcpext1: iommu@3aa340000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xaa340000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dispext1: iommu@3aa300000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xaa300000 0x0 0xc000>, + <0x3 0xaa314000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dispext1_isoc: iommu@3aa180000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xaa180000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_scaler: iommu@305260000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x5260000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_jpeg: iommu@301020000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x1020000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_avd: iommu@501020000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x1020000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_apr: iommu@3a1020000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xa1020000 0x0 0xc000>, + <0x3 0xa1034000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_scdc: iommu@3a1040000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xa1040000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_apcie2_piodma: dma-controller@48a030000 { + compatible = "apple,t8142-pcie-piodma", "apple,pcie-piodma"; + reg = <0x4 0x8a030000 0x0 0x4000>, + <0x4 0x8a034000 0x0 0x4000>, + <0x4 0x8a038000 0x0 0x4000>; + interrupts = ; + iommus = <&dt5_dart_apcie2 17>; + status = "disabled"; + }; + + dt5_apcie0_piodma: dma-controller@488030000 { + compatible = "apple,t8142-pcie-piodma", "apple,pcie-piodma"; + reg = <0x4 0x88030000 0x0 0x4000>, + <0x4 0x88034000 0x0 0x4000>, + <0x4 0x88038000 0x0 0x4000>; + interrupts = ; + iommus = <&dt5_dart_apcie0 17>; + status = "disabled"; + }; + + dt5_apciec0_piodma: dma-controller@404068000 { + compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; + reg = <0x4 0x4068000 0x0 0x4000>, + <0x4 0x406c000 0x0 0x4000>, + <0x4 0x4070000 0x0 0x4000>, + <0x4 0x403c000 0x0 0x4000>; + interrupts = ; + iommus = <&dt5_dart_apciec0 254>; + status = "disabled"; + }; + + dt5_apciec1_piodma: dma-controller@40c068000 { + compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; + reg = <0x4 0xc068000 0x0 0x4000>, + <0x4 0xc06c000 0x0 0x4000>, + <0x4 0xc070000 0x0 0x4000>, + <0x4 0xc03c000 0x0 0x4000>; + interrupts = ; + iommus = <&dt5_dart_apciec1 254>; + status = "disabled"; + }; + + dt5_apciec3_piodma: dma-controller@41c068000 { + compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; + reg = <0x4 0x1c068000 0x0 0x4000>, + <0x4 0x1c06c000 0x0 0x4000>, + <0x4 0x1c070000 0x0 0x4000>, + <0x4 0x1c03c000 0x0 0x4000>; + interrupts = ; + iommus = <&dt5_dart_apciec3 254>; + status = "disabled"; + }; + + dt5_aic_timebase: aic-timebase@591180000 { + compatible = "apple,t8142-aic-timebase", "apple,aic-timebase"; + reg = <0x5 0x91180000 0x0 0x1000>; + status = "disabled"; + }; + + dt5_error_handler: error-handler@308d00000 { + compatible = "apple,t8142-error-handler", "apple,soc-error-handler"; + reg = <0x3 0x8d00000 0x0 0x40000>, + <0x3 0x8900000 0x0 0x8000>, + <0x3 0x80000000 0x0 0x3c000>, + <0x3 0x80728000 0x0 0x4000>, + <0x3 0x80768000 0x0 0x4000>, + <0x3 0x882c8000 0x0 0x4000>, + <0x3 0x82000000 0x0 0x1000000>, + <0x3 0x803d0000 0x0 0x4000>, + <0x2 0x20000000 0x0 0x140000>, + <0x2 0x21000000 0x0 0x3c000>, + <0x2 0x21200000 0x0 0x3c000>, + <0x2 0x21400000 0x0 0x3c000>, + <0x2 0x21600000 0x0 0x3c000>, + <0x2 0x21800000 0x0 0x3c000>, + <0x2 0x21a00000 0x0 0x3c000>, + <0x2 0x21c00000 0x0 0x3c000>, + <0x2 0x21e00000 0x0 0x3c000>, + <0x2 0x4f000000 0x0 0x8000>, + <0x2 0x50000000 0x0 0x8000>, + <0x2 0x51000000 0x0 0x8000>, + <0x2 0x52000000 0x0 0x8000>, + <0x2 0x53000000 0x0 0x8000>, + <0x2 0x54000000 0x0 0x8000>, + <0x2 0x55000000 0x0 0x8000>, + <0x2 0x56000000 0x0 0x8000>, + <0x2 0x5f000000 0x0 0x8000>, + <0x2 0x6f000000 0x0 0x8000>, + <0x2 0x57000000 0x0 0x1000000>, + <0x2 0x58000000 0x0 0x1000000>, + <0x2 0x59000000 0x0 0x1000000>, + <0x3 0x80770000 0x0 0x4000>, + <0x3 0x80771000 0x0 0x4000>, + <0x2 0x5b000000 0x0 0x24000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + status = "disabled"; + }; + + dt5_aop_exclave_mailbox: mailbox@5e067c000 { + compatible = "apple,t8142-secure-mailbox", "apple,secure-mailbox"; + reg = <0x5 0xe067c000 0x0 0x4000>; + interrupts = , + ; + iommus = <&dt5_dart_aop 1>; + status = "disabled"; + }; + + dt5_event_log_handler: event-log@380700000 { + compatible = "apple,t8142-event-log", "apple,soc-event-log"; + reg = <0x3 0x80700000 0x0 0xd0000>, + <0x3 0x88280000 0x0 0x80000>, + <0x3 0x80000000 0x0 0x3c000>, + <0x3 0x88200000 0x0 0x2c000>, + <0x3 0x8028c000 0x0 0x4000>, + <0x3 0x80280000 0x0 0x8000>, + <0x4 0x21878000 0x0 0x4000>, + <0x4 0x21868000 0x0 0x8000>, + <0x3 0x80340000 0x0 0xc000>, + <0x3 0x80350000 0x0 0xc000>, + <0x3 0x80208000 0x0 0x4000>, + <0x3 0x80208400 0x0 0x4000>, + <0x3 0x8020a400 0x0 0x4000>, + <0x3 0x8020a600 0x0 0x4000>, + <0x3 0x8020a700 0x0 0x4000>, + <0x3 0x8020a800 0x0 0x4000>, + <0x3 0x8020aa00 0x0 0x4000>, + <0x3 0x8020ab00 0x0 0x4000>, + <0x3 0x8020ac00 0x0 0x4000>, + <0x3 0x8020ae00 0x0 0x4000>, + <0x3 0x8020af00 0x0 0x4000>, + <0x3 0x8020b000 0x0 0x4000>, + <0x3 0x8020b200 0x0 0x4000>, + <0x3 0x8020b300 0x0 0x4000>, + <0x3 0x8020b400 0x0 0x4000>, + <0x3 0x8020b600 0x0 0x4000>, + <0x3 0x8020b700 0x0 0x4000>, + <0x3 0x8020b800 0x0 0x4000>, + <0x3 0x8020ba00 0x0 0x4000>, + <0x3 0x8020bb00 0x0 0x4000>, + <0x3 0x8020bc00 0x0 0x4000>, + <0x3 0x8020be00 0x0 0x4000>, + <0x3 0x8020bf00 0x0 0x4000>, + <0x3 0x8020c000 0x0 0x4000>, + <0x3 0x8020c200 0x0 0x4000>, + <0x3 0x8020c300 0x0 0x4000>, + <0x3 0x8020c400 0x0 0x4000>, + <0x3 0x8020c600 0x0 0x4000>, + <0x3 0x8020c700 0x0 0x4000>, + <0x3 0x8020c800 0x0 0x4000>, + <0x3 0x8020ca00 0x0 0x4000>, + <0x3 0x8020cb00 0x0 0x4000>, + <0x3 0x8020cc00 0x0 0x4000>, + <0x3 0x8020ce00 0x0 0x4000>, + <0x3 0x8020d000 0x0 0x4000>, + <0x3 0x8020d200 0x0 0x4000>, + <0x3 0x8020d400 0x0 0x4000>, + <0x3 0x8020d600 0x0 0x4000>, + <0x3 0x8020d800 0x0 0x4000>, + <0x3 0x8020da00 0x0 0x4000>, + <0x3 0x82700000 0x0 0x114000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + ; + status = "disabled"; + }; + + dt5_esm: esm@55a67c000 { + compatible = "apple,t8142-esm", "apple,esm"; + reg = <0x5 0x5a67c000 0x0 0x4000>; + interrupts = , + ; + iommus = <&dt5_dart_sep 2>; + status = "disabled"; + }; + + dt5_aon_ptd: aon-ptd@38c840000 { + compatible = "apple,t8142-aon-ptd", "apple,aon-ptd"; + reg = <0x3 0x8c840000 0x0 0x4000>, + <0x3 0x8c850000 0x0 0x4000>, + <0x3 0x8c858000 0x0 0x4000>, + <0x3 0x8c860000 0x0 0x4000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + interrupt-controller; + #interrupt-cells = <1>; + #address-cells = <0>; + status = "disabled"; + }; + + dt5_rsm: rsm@389825000 { + compatible = "apple,t8142-rsm", "apple,rsm"; + reg = <0x3 0x89825000 0x0 0x4000>, + <0x3 0x898c0000 0x0 0x4>; + interrupts = ; + iommus = <&dt5_dart_rsm 0>; + status = "disabled"; + }; + + dt5_hib_exclave_watchdog: secure-watchdog@5d82b0000 { + compatible = "apple,t8142-secure-watchdog", "apple,secure-watchdog"; + reg = <0x5 0xd82b0000 0x0 0x4000>; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t8142-j704.dts b/arch/arm64/boot/dts/apple/t8142-j704.dts new file mode 100644 index 0000000000000..64b0c56c604c2 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8142-j704.dts @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-only OR MIT +/dts-v1/; + +#include "t8142.dtsi" + +/ { + model = "Apple MacBook Pro (14-inch, M5)"; + compatible = "apple,j704", "apple,t8142", "apple,arm-platform"; + chassis-type = "laptop"; +}; + +#include "t8142-j704-inventory.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8142-j813-inventory.dtsi b/arch/arm64/boot/dts/apple/t8142-j813-inventory.dtsi new file mode 100644 index 0000000000000..a2454ad1d25e0 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8142-j813-inventory.dtsi @@ -0,0 +1,336 @@ +// SPDX-License-Identifier: GPL-2.0-only OR MIT +/* Hardware resources only. Ownership and driver enables require qualification. */ + +&{/soc} { + + dt5_dart_apciec0: iommu@404000000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x4000000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_acio0: iommu@401a80000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x1a80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_apciec1: iommu@40c000000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0xc000000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_acio1: iommu@409a80000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x9a80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_sep: iommu@308b80000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x8b80000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_sio: iommu@3a5060000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xa5060000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_rsm: iommu@3899a0000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x899a0000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_disp0_isoc: iommu@286180000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x2 0x86180000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dcpext0: iommu@506340000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x6340000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dispext0: iommu@506300000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x6300000 0x0 0xc000>, + <0x5 0x6314000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dispext0_isoc: iommu@506180000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x6180000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dcpext1: iommu@3aa340000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xaa340000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dispext1: iommu@3aa300000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xaa300000 0x0 0xc000>, + <0x3 0xaa314000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dispext1_isoc: iommu@3aa180000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xaa180000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_scaler: iommu@305260000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x5260000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_jpeg: iommu@301020000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x1020000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_apr: iommu@3a1020000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xa1020000 0x0 0xc000>, + <0x3 0xa1034000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_scdc: iommu@3a1040000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xa1040000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_apcie0_piodma: dma-controller@488030000 { + compatible = "apple,t8142-pcie-piodma", "apple,pcie-piodma"; + reg = <0x4 0x88030000 0x0 0x4000>, + <0x4 0x88034000 0x0 0x4000>, + <0x4 0x88038000 0x0 0x4000>; + interrupts = ; + iommus = <&dart_apcie0 17>; + status = "disabled"; + }; + + dt5_apciec0_piodma: dma-controller@404068000 { + compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; + reg = <0x4 0x4068000 0x0 0x4000>, + <0x4 0x406c000 0x0 0x4000>, + <0x4 0x4070000 0x0 0x4000>, + <0x4 0x403c000 0x0 0x4000>; + interrupts = ; + iommus = <&dt5_dart_apciec0 254>; + status = "disabled"; + }; + + dt5_apciec1_piodma: dma-controller@40c068000 { + compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; + reg = <0x4 0xc068000 0x0 0x4000>, + <0x4 0xc06c000 0x0 0x4000>, + <0x4 0xc070000 0x0 0x4000>, + <0x4 0xc03c000 0x0 0x4000>; + interrupts = ; + iommus = <&dt5_dart_apciec1 254>; + status = "disabled"; + }; + + dt5_aic_timebase: aic-timebase@591180000 { + compatible = "apple,t8142-aic-timebase", "apple,aic-timebase"; + reg = <0x5 0x91180000 0x0 0x1000>; + status = "disabled"; + }; + + dt5_error_handler: error-handler@308d00000 { + compatible = "apple,t8142-error-handler", "apple,soc-error-handler"; + reg = <0x3 0x8d00000 0x0 0x40000>, + <0x3 0x8900000 0x0 0x8000>, + <0x3 0x80000000 0x0 0x3c000>, + <0x3 0x80728000 0x0 0x4000>, + <0x3 0x80768000 0x0 0x4000>, + <0x3 0x882c8000 0x0 0x4000>, + <0x3 0x82000000 0x0 0x1000000>, + <0x3 0x803d0000 0x0 0x4000>, + <0x2 0x20000000 0x0 0x140000>, + <0x2 0x21000000 0x0 0x3c000>, + <0x2 0x21200000 0x0 0x3c000>, + <0x2 0x21400000 0x0 0x3c000>, + <0x2 0x21600000 0x0 0x3c000>, + <0x2 0x21800000 0x0 0x3c000>, + <0x2 0x21a00000 0x0 0x3c000>, + <0x2 0x21c00000 0x0 0x3c000>, + <0x2 0x21e00000 0x0 0x3c000>, + <0x2 0x4f000000 0x0 0x8000>, + <0x2 0x50000000 0x0 0x8000>, + <0x2 0x51000000 0x0 0x8000>, + <0x2 0x52000000 0x0 0x8000>, + <0x2 0x53000000 0x0 0x8000>, + <0x2 0x54000000 0x0 0x8000>, + <0x2 0x55000000 0x0 0x8000>, + <0x2 0x56000000 0x0 0x8000>, + <0x2 0x5f000000 0x0 0x8000>, + <0x2 0x6f000000 0x0 0x8000>, + <0x2 0x57000000 0x0 0x1000000>, + <0x2 0x58000000 0x0 0x1000000>, + <0x2 0x59000000 0x0 0x1000000>, + <0x3 0x80770000 0x0 0x4000>, + <0x3 0x80771000 0x0 0x4000>, + <0x2 0x5b000000 0x0 0x24000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + status = "disabled"; + }; + + dt5_aop_exclave_mailbox: mailbox@5e067c000 { + compatible = "apple,t8142-secure-mailbox", "apple,secure-mailbox"; + reg = <0x5 0xe067c000 0x0 0x4000>; + interrupts = , + ; + iommus = <&aop_dart 1>; + status = "disabled"; + }; + + dt5_esm: esm@55a67c000 { + compatible = "apple,t8142-esm", "apple,esm"; + reg = <0x5 0x5a67c000 0x0 0x4000>; + interrupts = , + ; + iommus = <&dt5_dart_sep 2>; + status = "disabled"; + }; + + dt5_aon_ptd: aon-ptd@38c840000 { + compatible = "apple,t8142-aon-ptd", "apple,aon-ptd"; + reg = <0x3 0x8c840000 0x0 0x4000>, + <0x3 0x8c850000 0x0 0x4000>, + <0x3 0x8c858000 0x0 0x4000>, + <0x3 0x8c860000 0x0 0x4000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + interrupt-controller; + #interrupt-cells = <1>; + #address-cells = <0>; + status = "disabled"; + }; + + dt5_rsm: rsm@389825000 { + compatible = "apple,t8142-rsm", "apple,rsm"; + reg = <0x3 0x89825000 0x0 0x4000>, + <0x3 0x898c0000 0x0 0x4>; + interrupts = ; + iommus = <&dt5_dart_rsm 0>; + status = "disabled"; + }; + + dt5_hib_exclave_watchdog: secure-watchdog@5d82b0000 { + compatible = "apple,t8142-secure-watchdog", "apple,secure-watchdog"; + reg = <0x5 0xd82b0000 0x0 0x4000>; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t8142-j813.dts b/arch/arm64/boot/dts/apple/t8142-j813.dts index dd1526e6caad1..518ca5042d8c3 100644 --- a/arch/arm64/boot/dts/apple/t8142-j813.dts +++ b/arch/arm64/boot/dts/apple/t8142-j813.dts @@ -404,3 +404,5 @@ #include "t8142-j813-n1.dtsi" #include "t8142-j813-power.dtsi" #include "t8142-j813-audio.dtsi" + +#include "t8142-j813-inventory.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8142-j815-inventory.dtsi b/arch/arm64/boot/dts/apple/t8142-j815-inventory.dtsi new file mode 100644 index 0000000000000..e581540b49866 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8142-j815-inventory.dtsi @@ -0,0 +1,481 @@ +// SPDX-License-Identifier: GPL-2.0-only OR MIT +/* Hardware resources only. Ownership and driver enables require qualification. */ + +&{/soc} { + + dt5_dart_apcie0: iommu@488000000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x88000000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_apciec0: iommu@404000000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x4000000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_acio0: iommu@401a80000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x1a80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_apciec1: iommu@40c000000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0xc000000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_acio1: iommu@409a80000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x9a80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_aop: iommu@390fc0000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x90fc0000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_pmp: iommu@380300000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x80300000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_sep: iommu@308b80000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x8b80000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_sio: iommu@3a5060000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xa5060000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_rsm: iommu@3899a0000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x899a0000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_mtp: iommu@394800000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x94800000 0x0 0xc000>, + <0x3 0x94810000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_usb0: iommu@402f00000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x2f00000 0x0 0xc000>, + <0x4 0x2f80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_usb1: iommu@40af00000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0xaf00000 0x0 0xc000>, + <0x4 0xaf80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dcp: iommu@286340000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x2 0x86340000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_disp0: iommu@286300000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x2 0x86300000 0x0 0xc000>, + <0x2 0x86314000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_disp0_isoc: iommu@286180000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x2 0x86180000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dcpext0: iommu@506340000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x6340000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dispext0: iommu@506300000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x6300000 0x0 0xc000>, + <0x5 0x6314000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dispext0_isoc: iommu@506180000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x6180000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dcpext1: iommu@3aa340000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xaa340000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dispext1: iommu@3aa300000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xaa300000 0x0 0xc000>, + <0x3 0xaa314000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dispext1_isoc: iommu@3aa180000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xaa180000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_scaler: iommu@305260000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x5260000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_jpeg: iommu@301020000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x1020000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_avd: iommu@501020000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x1020000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_apr: iommu@3a1020000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xa1020000 0x0 0xc000>, + <0x3 0xa1034000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_scdc: iommu@3a1040000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xa1040000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_apcie0_piodma: dma-controller@488030000 { + compatible = "apple,t8142-pcie-piodma", "apple,pcie-piodma"; + reg = <0x4 0x88030000 0x0 0x4000>, + <0x4 0x88034000 0x0 0x4000>, + <0x4 0x88038000 0x0 0x4000>; + interrupts = ; + iommus = <&dt5_dart_apcie0 17>; + status = "disabled"; + }; + + dt5_apciec0_piodma: dma-controller@404068000 { + compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; + reg = <0x4 0x4068000 0x0 0x4000>, + <0x4 0x406c000 0x0 0x4000>, + <0x4 0x4070000 0x0 0x4000>, + <0x4 0x403c000 0x0 0x4000>; + interrupts = ; + iommus = <&dt5_dart_apciec0 254>; + status = "disabled"; + }; + + dt5_apciec1_piodma: dma-controller@40c068000 { + compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; + reg = <0x4 0xc068000 0x0 0x4000>, + <0x4 0xc06c000 0x0 0x4000>, + <0x4 0xc070000 0x0 0x4000>, + <0x4 0xc03c000 0x0 0x4000>; + interrupts = ; + iommus = <&dt5_dart_apciec1 254>; + status = "disabled"; + }; + + dt5_aic_timebase: aic-timebase@591180000 { + compatible = "apple,t8142-aic-timebase", "apple,aic-timebase"; + reg = <0x5 0x91180000 0x0 0x1000>; + status = "disabled"; + }; + + dt5_error_handler: error-handler@308d00000 { + compatible = "apple,t8142-error-handler", "apple,soc-error-handler"; + reg = <0x3 0x8d00000 0x0 0x40000>, + <0x3 0x8900000 0x0 0x8000>, + <0x3 0x80000000 0x0 0x3c000>, + <0x3 0x80728000 0x0 0x4000>, + <0x3 0x80768000 0x0 0x4000>, + <0x3 0x882c8000 0x0 0x4000>, + <0x3 0x82000000 0x0 0x1000000>, + <0x3 0x803d0000 0x0 0x4000>, + <0x2 0x20000000 0x0 0x140000>, + <0x2 0x21000000 0x0 0x3c000>, + <0x2 0x21200000 0x0 0x3c000>, + <0x2 0x21400000 0x0 0x3c000>, + <0x2 0x21600000 0x0 0x3c000>, + <0x2 0x21800000 0x0 0x3c000>, + <0x2 0x21a00000 0x0 0x3c000>, + <0x2 0x21c00000 0x0 0x3c000>, + <0x2 0x21e00000 0x0 0x3c000>, + <0x2 0x4f000000 0x0 0x8000>, + <0x2 0x50000000 0x0 0x8000>, + <0x2 0x51000000 0x0 0x8000>, + <0x2 0x52000000 0x0 0x8000>, + <0x2 0x53000000 0x0 0x8000>, + <0x2 0x54000000 0x0 0x8000>, + <0x2 0x55000000 0x0 0x8000>, + <0x2 0x56000000 0x0 0x8000>, + <0x2 0x5f000000 0x0 0x8000>, + <0x2 0x6f000000 0x0 0x8000>, + <0x2 0x57000000 0x0 0x1000000>, + <0x2 0x58000000 0x0 0x1000000>, + <0x2 0x59000000 0x0 0x1000000>, + <0x3 0x80770000 0x0 0x4000>, + <0x3 0x80771000 0x0 0x4000>, + <0x2 0x5b000000 0x0 0x24000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + status = "disabled"; + }; + + dt5_aop_exclave_mailbox: mailbox@5e067c000 { + compatible = "apple,t8142-secure-mailbox", "apple,secure-mailbox"; + reg = <0x5 0xe067c000 0x0 0x4000>; + interrupts = , + ; + iommus = <&dt5_dart_aop 1>; + status = "disabled"; + }; + + dt5_event_log_handler: event-log@380700000 { + compatible = "apple,t8142-event-log", "apple,soc-event-log"; + reg = <0x3 0x80700000 0x0 0xd0000>, + <0x3 0x88280000 0x0 0x80000>, + <0x3 0x80000000 0x0 0x3c000>, + <0x3 0x88200000 0x0 0x2c000>, + <0x3 0x8028c000 0x0 0x4000>, + <0x3 0x80280000 0x0 0x8000>, + <0x4 0x21878000 0x0 0x4000>, + <0x4 0x21868000 0x0 0x8000>, + <0x3 0x80340000 0x0 0xc000>, + <0x3 0x80350000 0x0 0xc000>, + <0x3 0x80208000 0x0 0x4000>, + <0x3 0x80208400 0x0 0x4000>, + <0x3 0x8020a400 0x0 0x4000>, + <0x3 0x8020a600 0x0 0x4000>, + <0x3 0x8020a700 0x0 0x4000>, + <0x3 0x8020a800 0x0 0x4000>, + <0x3 0x8020aa00 0x0 0x4000>, + <0x3 0x8020ab00 0x0 0x4000>, + <0x3 0x8020ac00 0x0 0x4000>, + <0x3 0x8020ae00 0x0 0x4000>, + <0x3 0x8020af00 0x0 0x4000>, + <0x3 0x8020b000 0x0 0x4000>, + <0x3 0x8020b200 0x0 0x4000>, + <0x3 0x8020b300 0x0 0x4000>, + <0x3 0x8020b400 0x0 0x4000>, + <0x3 0x8020b600 0x0 0x4000>, + <0x3 0x8020b700 0x0 0x4000>, + <0x3 0x8020b800 0x0 0x4000>, + <0x3 0x8020ba00 0x0 0x4000>, + <0x3 0x8020bb00 0x0 0x4000>, + <0x3 0x8020bc00 0x0 0x4000>, + <0x3 0x8020be00 0x0 0x4000>, + <0x3 0x8020bf00 0x0 0x4000>, + <0x3 0x8020c000 0x0 0x4000>, + <0x3 0x8020c200 0x0 0x4000>, + <0x3 0x8020c300 0x0 0x4000>, + <0x3 0x8020c400 0x0 0x4000>, + <0x3 0x8020c600 0x0 0x4000>, + <0x3 0x8020c700 0x0 0x4000>, + <0x3 0x8020c800 0x0 0x4000>, + <0x3 0x8020ca00 0x0 0x4000>, + <0x3 0x8020cb00 0x0 0x4000>, + <0x3 0x8020cc00 0x0 0x4000>, + <0x3 0x8020ce00 0x0 0x4000>, + <0x3 0x8020d000 0x0 0x4000>, + <0x3 0x8020d200 0x0 0x4000>, + <0x3 0x8020d400 0x0 0x4000>, + <0x3 0x8020d600 0x0 0x4000>, + <0x3 0x8020d800 0x0 0x4000>, + <0x3 0x8020da00 0x0 0x4000>, + <0x3 0x82700000 0x0 0x114000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + ; + status = "disabled"; + }; + + dt5_esm: esm@55a67c000 { + compatible = "apple,t8142-esm", "apple,esm"; + reg = <0x5 0x5a67c000 0x0 0x4000>; + interrupts = , + ; + iommus = <&dt5_dart_sep 2>; + status = "disabled"; + }; + + dt5_aon_ptd: aon-ptd@38c840000 { + compatible = "apple,t8142-aon-ptd", "apple,aon-ptd"; + reg = <0x3 0x8c840000 0x0 0x4000>, + <0x3 0x8c850000 0x0 0x4000>, + <0x3 0x8c858000 0x0 0x4000>, + <0x3 0x8c860000 0x0 0x4000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + interrupt-controller; + #interrupt-cells = <1>; + #address-cells = <0>; + status = "disabled"; + }; + + dt5_rsm: rsm@389825000 { + compatible = "apple,t8142-rsm", "apple,rsm"; + reg = <0x3 0x89825000 0x0 0x4000>, + <0x3 0x898c0000 0x0 0x4>; + interrupts = ; + iommus = <&dt5_dart_rsm 0>; + status = "disabled"; + }; + + dt5_hib_exclave_watchdog: secure-watchdog@5d82b0000 { + compatible = "apple,t8142-secure-watchdog", "apple,secure-watchdog"; + reg = <0x5 0xd82b0000 0x0 0x4000>; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t8142-j815.dts b/arch/arm64/boot/dts/apple/t8142-j815.dts new file mode 100644 index 0000000000000..4000f8177ec68 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8142-j815.dts @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-only OR MIT +/dts-v1/; + +#include "t8142.dtsi" + +/ { + model = "Apple MacBook Air (15-inch, M5)"; + compatible = "apple,j815", "apple,t8142", "apple,arm-platform"; + chassis-type = "laptop"; +}; + +#include "t8142-j815-inventory.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8142.dtsi b/arch/arm64/boot/dts/apple/t8142.dtsi new file mode 100644 index 0000000000000..f084af6a774db --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8142.dtsi @@ -0,0 +1,175 @@ +// SPDX-License-Identifier: GPL-2.0-only OR MIT +/* + * Common hardware inventory for boards without a qualified boot profile. + * Firmware fills RAM and CPU release addresses. Keep new devices disabled; + * CPU harvesting, firmware handoff and enables need separate qualification. + */ +#include +#include + +/ { + #address-cells = <2>; + #size-cells = <2>; + interrupt-parent = <&aic>; + + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + }; + + memory@10000000000 { + device_type = "memory"; + reg = <0x100 0 0 0>; /* Filled by the loader. */ + }; + + cpus { + #address-cells = <2>; + #size-cells = <0>; + + cpu0: cpu@0 { + status = "disabled"; + compatible = "apple,t8142-e"; + device_type = "cpu"; + reg = <0 0x0>; + enable-method = "spin-table"; + cpu-release-addr = <0 0>; /* Filled by the loader. */ + }; + + cpu1: cpu@1 { + status = "disabled"; + compatible = "apple,t8142-e"; + device_type = "cpu"; + reg = <0 0x1>; + enable-method = "spin-table"; + cpu-release-addr = <0 0>; /* Filled by the loader. */ + }; + + cpu2: cpu@2 { + status = "disabled"; + compatible = "apple,t8142-e"; + device_type = "cpu"; + reg = <0 0x2>; + enable-method = "spin-table"; + cpu-release-addr = <0 0>; /* Filled by the loader. */ + }; + + cpu3: cpu@3 { + status = "disabled"; + compatible = "apple,t8142-e"; + device_type = "cpu"; + reg = <0 0x3>; + enable-method = "spin-table"; + cpu-release-addr = <0 0>; /* Filled by the loader. */ + }; + + cpu4: cpu@4 { + status = "disabled"; + compatible = "apple,t8142-e"; + device_type = "cpu"; + reg = <0 0x4>; + enable-method = "spin-table"; + cpu-release-addr = <0 0>; /* Filled by the loader. */ + }; + + cpu5: cpu@5 { + status = "disabled"; + compatible = "apple,t8142-e"; + device_type = "cpu"; + reg = <0 0x5>; + enable-method = "spin-table"; + cpu-release-addr = <0 0>; /* Filled by the loader. */ + }; + + cpu6: cpu@10100 { + status = "disabled"; + compatible = "apple,t8142-p"; + device_type = "cpu"; + reg = <0 0x10100>; + enable-method = "spin-table"; + cpu-release-addr = <0 0>; /* Filled by the loader. */ + }; + + cpu7: cpu@10101 { + status = "disabled"; + compatible = "apple,t8142-p"; + device_type = "cpu"; + reg = <0 0x10101>; + enable-method = "spin-table"; + cpu-release-addr = <0 0>; /* Filled by the loader. */ + }; + + cpu8: cpu@10102 { + status = "disabled"; + compatible = "apple,t8142-p"; + device_type = "cpu"; + reg = <0 0x10102>; + enable-method = "spin-table"; + cpu-release-addr = <0 0>; /* Filled by the loader. */ + }; + + cpu9: cpu@10103 { + status = "disabled"; + compatible = "apple,t8142-p"; + device_type = "cpu"; + reg = <0 0x10103>; + enable-method = "spin-table"; + cpu-release-addr = <0 0>; /* Filled by the loader. */ + }; + }; + + timer { + status = "disabled"; + compatible = "arm,armv8-timer"; + interrupts = , + , + , + ; + interrupt-names = "phys", "virt", "hyp-phys", "hyp-virt"; + }; + + clkref: clock-ref { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <24000000>; + }; + + soc { + compatible = "simple-bus"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + nonposted-mmio; + + aic: interrupt-controller@381000000 { + status = "disabled"; + compatible = "apple,t8142-aic3", "apple,t8122-aic3"; + interrupt-controller; + #address-cells = <0>; + #interrupt-cells = <3>; + reg = <3 0x81000000 0 0x1cc000>, + <3 0x81040000 0 0x4000>; + reg-names = "core", "event"; + }; + + serial0: serial@3a5200000 { + status = "disabled"; + compatible = "apple,s5l-uart"; + reg = <3 0xa5200000 0 0x4000>; + reg-io-width = <4>; + interrupts = ; + clocks = <&clkref>, <&clkref>; + clock-names = "uart", "clk_uart_baud0"; + }; + + dockchannel: serial@38812c000 { + status = "disabled"; + compatible = "apple,dockchannel-uart"; + reg = <3 0x8812c000 0 0x4000>, + <3 0x88128000 0 0x4000>, + <3 0x8810c000 0 0x1000>; + reg-names = "data", "config", "irq"; + interrupts = ; + }; + }; +}; From ced1e5e6e6fc386487489fc8a591f4ed054dcbb2 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 01:43:45 +1100 Subject: [PATCH 03/12] arm64: dts: apple: group T8142 board build entries Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- arch/arm64/boot/dts/apple/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/apple/Makefile b/arch/arm64/boot/dts/apple/Makefile index 5f9646c716d2f..ba01490a1bd28 100644 --- a/arch/arm64/boot/dts/apple/Makefile +++ b/arch/arm64/boot/dts/apple/Makefile @@ -116,9 +116,9 @@ dtb-$(CONFIG_ARCH_APPLE) += t8132-j713.dtb dtb-$(CONFIG_ARCH_APPLE) += t8132-j715.dtb dtb-$(CONFIG_ARCH_APPLE) += t8132-j773g.dtb dtb-$(CONFIG_ARCH_APPLE) += t8140-j700.dtb +dtb-$(CONFIG_ARCH_APPLE) += t8142-j704.dtb dtb-$(CONFIG_ARCH_APPLE) += t8142-j813.dtb +dtb-$(CONFIG_ARCH_APPLE) += t8142-j815.dtb dtb-$(CONFIG_ARCH_APPLE) += t8152-j873g.dtb # Explicit cold-ANE lead test; never select as the production board DTB. -dtb-$(CONFIG_ARCH_APPLE) += t8142-j704.dtb -dtb-$(CONFIG_ARCH_APPLE) += t8142-j815.dtb From c7fb520394b8db3d0ebb34114a3675dd965842dc Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 01:47:44 +1100 Subject: [PATCH 04/12] arm64: dts: apple: retain complete disabled platform status inventories Describe the J813 event status windows without granting ownership of their shared apertures. Keep the common H18 mailbox and native error-window contract extensions identical across the family series. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../edac/apple,soc-error-handler.yaml | 4 +- .../mailbox/apple,secure-mailbox.yaml | 21 +++++- .../boot/dts/apple/t8142-j813-inventory.dtsi | 70 +++++++++++++++++++ 3 files changed, 93 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml b/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml index a4b5024a8f670..010169e3e9b1c 100644 --- a/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml +++ b/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml @@ -54,6 +54,8 @@ properties: order. T8140 publishes its native error/event register banks in hardware-description order; their presence does not establish safe AP access and the instances remain disabled until qualified. + T8142 and T8152 likewise retain their native status windows; T8152 + board descriptions publish 112 or 120 error-handler apertures. required: - compatible @@ -98,7 +100,7 @@ allOf: then: properties: reg: - minItems: 120 + minItems: 112 maxItems: 120 interrupts: minItems: 96 diff --git a/Documentation/devicetree/bindings/mailbox/apple,secure-mailbox.yaml b/Documentation/devicetree/bindings/mailbox/apple,secure-mailbox.yaml index d0431819daee5..6b50540015458 100644 --- a/Documentation/devicetree/bindings/mailbox/apple,secure-mailbox.yaml +++ b/Documentation/devicetree/bindings/mailbox/apple,secure-mailbox.yaml @@ -16,6 +16,9 @@ description: | properties: compatible: oneOf: + - items: + - const: apple,t8152-secure-mailbox + - const: apple,secure-mailbox - items: - const: apple,t8142-secure-mailbox - const: apple,secure-mailbox @@ -29,7 +32,7 @@ properties: interrupts: minItems: 2 - maxItems: 2 + maxItems: 3 iommus: maxItems: 1 @@ -40,4 +43,20 @@ required: - interrupts - iommus +allOf: + - if: + properties: + compatible: + contains: + const: apple,t8152-secure-mailbox + then: + properties: + interrupts: + minItems: 3 + maxItems: 3 + else: + properties: + interrupts: + maxItems: 2 + additionalProperties: false diff --git a/arch/arm64/boot/dts/apple/t8142-j813-inventory.dtsi b/arch/arm64/boot/dts/apple/t8142-j813-inventory.dtsi index a2454ad1d25e0..604c1c8bd5fe0 100644 --- a/arch/arm64/boot/dts/apple/t8142-j813-inventory.dtsi +++ b/arch/arm64/boot/dts/apple/t8142-j813-inventory.dtsi @@ -333,4 +333,74 @@ reg = <0x5 0xd82b0000 0x0 0x4000>; status = "disabled"; }; + + dt5_event_log_handler: event-log@380700000 { + compatible = "apple,t8142-event-log", "apple,soc-event-log"; + reg = <0x3 0x80700000 0x0 0xd0000>, + <0x3 0x88280000 0x0 0x80000>, + <0x3 0x80000000 0x0 0x3c000>, + <0x3 0x88200000 0x0 0x2c000>, + <0x3 0x8028c000 0x0 0x4000>, + <0x3 0x80280000 0x0 0x8000>, + <0x4 0x21878000 0x0 0x4000>, + <0x4 0x21868000 0x0 0x8000>, + <0x3 0x80340000 0x0 0xc000>, + <0x3 0x80350000 0x0 0xc000>, + <0x3 0x80208000 0x0 0x4000>, + <0x3 0x80208400 0x0 0x4000>, + <0x3 0x8020a400 0x0 0x4000>, + <0x3 0x8020a600 0x0 0x4000>, + <0x3 0x8020a700 0x0 0x4000>, + <0x3 0x8020a800 0x0 0x4000>, + <0x3 0x8020aa00 0x0 0x4000>, + <0x3 0x8020ab00 0x0 0x4000>, + <0x3 0x8020ac00 0x0 0x4000>, + <0x3 0x8020ae00 0x0 0x4000>, + <0x3 0x8020af00 0x0 0x4000>, + <0x3 0x8020b000 0x0 0x4000>, + <0x3 0x8020b200 0x0 0x4000>, + <0x3 0x8020b300 0x0 0x4000>, + <0x3 0x8020b400 0x0 0x4000>, + <0x3 0x8020b600 0x0 0x4000>, + <0x3 0x8020b700 0x0 0x4000>, + <0x3 0x8020b800 0x0 0x4000>, + <0x3 0x8020ba00 0x0 0x4000>, + <0x3 0x8020bb00 0x0 0x4000>, + <0x3 0x8020bc00 0x0 0x4000>, + <0x3 0x8020be00 0x0 0x4000>, + <0x3 0x8020bf00 0x0 0x4000>, + <0x3 0x8020c000 0x0 0x4000>, + <0x3 0x8020c200 0x0 0x4000>, + <0x3 0x8020c300 0x0 0x4000>, + <0x3 0x8020c400 0x0 0x4000>, + <0x3 0x8020c600 0x0 0x4000>, + <0x3 0x8020c700 0x0 0x4000>, + <0x3 0x8020c800 0x0 0x4000>, + <0x3 0x8020ca00 0x0 0x4000>, + <0x3 0x8020cb00 0x0 0x4000>, + <0x3 0x8020cc00 0x0 0x4000>, + <0x3 0x8020ce00 0x0 0x4000>, + <0x3 0x8020d000 0x0 0x4000>, + <0x3 0x8020d200 0x0 0x4000>, + <0x3 0x8020d400 0x0 0x4000>, + <0x3 0x8020d600 0x0 0x4000>, + <0x3 0x8020d800 0x0 0x4000>, + <0x3 0x8020da00 0x0 0x4000>, + <0x3 0x82700000 0x0 0x114000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + ; + /* Shared status windows do not grant AP ownership. */ + status = "disabled"; + }; }; From 25ad666d0dedd82cee0c8dfc3e01ecbed2736e0f Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 01:59:35 +1100 Subject: [PATCH 05/12] arm64: dts: apple: follow the AIC3 provider schema Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- arch/arm64/boot/dts/apple/t8142.dtsi | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/boot/dts/apple/t8142.dtsi b/arch/arm64/boot/dts/apple/t8142.dtsi index f084af6a774db..815ab9db68f3f 100644 --- a/arch/arm64/boot/dts/apple/t8142.dtsi +++ b/arch/arm64/boot/dts/apple/t8142.dtsi @@ -145,7 +145,6 @@ status = "disabled"; compatible = "apple,t8142-aic3", "apple,t8122-aic3"; interrupt-controller; - #address-cells = <0>; #interrupt-cells = <3>; reg = <3 0x81000000 0 0x1cc000>, <3 0x81040000 0 0x4000>; From be5f633fda8162c2dcf610c0a7a0d57bb23ee84b Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 02:32:19 +1100 Subject: [PATCH 06/12] dt-bindings: edac: apple: preserve the T6041 event-window bound Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../devicetree/bindings/edac/apple,soc-error-handler.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml b/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml index 010169e3e9b1c..5e6dea0485739 100644 --- a/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml +++ b/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml @@ -157,6 +157,8 @@ allOf: const: apple,t6041-event-log then: properties: + reg: + maxItems: 25 interrupts: minItems: 21 maxItems: 21 From 1ce68d0ab939c47386dd1048baa315d16d64902d Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 03:20:26 +1100 Subject: [PATCH 07/12] arm64: dts: apple: describe the separate MSR23 firmware scaler family Add the full disabled T8142 firmware/descriptor scaler resources with both DMA streams and the resolved MSR/ASE/clock/reset controls. Use apple,scaler-v23 so the direct-register driver cannot match the fallback. Dedicated DART gate mappings remain unproven and are not guessed. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../bindings/clock/apple,pmgr-clocks.yaml | 11 ++ .../bindings/media/apple,scaler-v23.yaml | 111 ++++++++++++++++ .../boot/dts/apple/t8142-j704-inventory.dtsi | 3 + .../boot/dts/apple/t8142-j813-inventory.dtsi | 3 + .../boot/dts/apple/t8142-j815-inventory.dtsi | 3 + .../boot/dts/apple/t8142-scaler-v23.dtsi | 124 ++++++++++++++++++ arch/arm64/boot/dts/apple/t8142.dtsi | 10 ++ 7 files changed, 265 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/apple,scaler-v23.yaml create mode 100644 arch/arm64/boot/dts/apple/t8142-scaler-v23.dtsi diff --git a/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml b/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml index 71e74f7d59a83..2df73646a4d06 100644 --- a/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml +++ b/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml @@ -23,6 +23,7 @@ properties: - enum: - apple,t6041-pmgr-clocks - apple,t8140-pmgr-clocks + - apple,t8142-pmgr-clocks - const: apple,pmgr-clocks reg: @@ -44,6 +45,16 @@ required: - apple,pmgr allOf: + - if: + properties: + compatible: + contains: + const: apple,t8142-pmgr-clocks + then: + properties: + reg: + minItems: 54 + maxItems: 54 - if: properties: compatible: diff --git a/Documentation/devicetree/bindings/media/apple,scaler-v23.yaml b/Documentation/devicetree/bindings/media/apple,scaler-v23.yaml new file mode 100644 index 0000000000000..ac3fa521557d5 --- /dev/null +++ b/Documentation/devicetree/bindings/media/apple,scaler-v23.yaml @@ -0,0 +1,111 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/apple,scaler-v23.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple firmware and descriptor based scaler + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + MSR hardware version 23 and later uses a firmware/descriptor interface + with mailbox, scratch and dashboard resources. It is a different hardware + interface from the direct-register scaler family used through T8140 and + must not advertise the apple,scaler fallback matched by that driver. + Register windows and interrupt sources retain hardware-interface order. + Some logical interfaces share an aperture, so repeated register tuples + are intentional. Firmware, coefficients and workload policy are not DT + resources. Each instance has its own DART; an advertised MSRn-DART + gate belongs to that DART, rather than the scaler functional domains. + Keep the device disabled until its firmware handoff, clocks, + power and reset ownership have been qualified. + +properties: + compatible: + items: + - enum: + - apple,t6050-scaler + - apple,t8142-scaler + - apple,t8152-scaler + - const: apple,scaler-v23 + + reg: + minItems: 10 + maxItems: 12 + description: Register apertures in hardware-interface order. + + interrupts: + minItems: 15 + maxItems: 20 + description: | + MSR and APIODMA completion/error sources, followed by the firmware + mailbox, scratch and dashboard sources in hardware-interface order. + + iommus: + items: + - description: Pixel-data stream (SID 0) in this scaler's DART. + - description: APIODMA register-stream transfers (SID 1) in the same DART. + + clocks: + maxItems: 1 + + power-domains: + minItems: 1 + maxItems: 2 + description: Functional MSR and ASE core domains where their providers are qualified. + + resets: + maxItems: 1 + + status: + const: disabled + +required: + - compatible + - reg + - interrupts + - iommus + - status + +allOf: + - if: + properties: + compatible: + contains: + const: apple,t8152-scaler + then: + properties: + reg: + minItems: 12 + maxItems: 12 + interrupts: + minItems: 15 + maxItems: 15 + else: + properties: + reg: + minItems: 10 + maxItems: 10 + interrupts: + minItems: 20 + maxItems: 20 + - if: + properties: + compatible: + contains: + enum: + - apple,t6050-scaler + - apple,t8142-scaler + then: + properties: + power-domains: + minItems: 2 + maxItems: 2 + required: + - clocks + - power-domains + - resets + +additionalProperties: false diff --git a/arch/arm64/boot/dts/apple/t8142-j704-inventory.dtsi b/arch/arm64/boot/dts/apple/t8142-j704-inventory.dtsi index 70bafb7633f1b..e0a939c0aaa7d 100644 --- a/arch/arm64/boot/dts/apple/t8142-j704-inventory.dtsi +++ b/arch/arm64/boot/dts/apple/t8142-j704-inventory.dtsi @@ -223,6 +223,7 @@ reg = <0x3 0x5260000 0x0 0x20000>; interrupts = ; #iommu-cells = <1>; + /* A dedicated scaler-DART gate mapping is not published by this ADT. */ status = "disabled"; }; @@ -533,3 +534,5 @@ status = "disabled"; }; }; + +#include "t8142-scaler-v23.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8142-j813-inventory.dtsi b/arch/arm64/boot/dts/apple/t8142-j813-inventory.dtsi index 604c1c8bd5fe0..50d1b5cda1112 100644 --- a/arch/arm64/boot/dts/apple/t8142-j813-inventory.dtsi +++ b/arch/arm64/boot/dts/apple/t8142-j813-inventory.dtsi @@ -122,6 +122,7 @@ reg = <0x3 0x5260000 0x0 0x20000>; interrupts = ; #iommu-cells = <1>; + /* A dedicated scaler-DART gate mapping is not published by this ADT. */ status = "disabled"; }; @@ -404,3 +405,5 @@ status = "disabled"; }; }; + +#include "t8142-scaler-v23.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8142-j815-inventory.dtsi b/arch/arm64/boot/dts/apple/t8142-j815-inventory.dtsi index e581540b49866..41138bd7bab06 100644 --- a/arch/arm64/boot/dts/apple/t8142-j815-inventory.dtsi +++ b/arch/arm64/boot/dts/apple/t8142-j815-inventory.dtsi @@ -190,6 +190,7 @@ reg = <0x3 0x5260000 0x0 0x20000>; interrupts = ; #iommu-cells = <1>; + /* A dedicated scaler-DART gate mapping is not published by this ADT. */ status = "disabled"; }; @@ -479,3 +480,5 @@ status = "disabled"; }; }; + +#include "t8142-scaler-v23.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8142-scaler-v23.dtsi b/arch/arm64/boot/dts/apple/t8142-scaler-v23.dtsi new file mode 100644 index 0000000000000..8d140dc3112b9 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8142-scaler-v23.dtsi @@ -0,0 +1,124 @@ +// SPDX-License-Identifier: GPL-2.0-only OR MIT +/* Firmware/descriptor scaler family. No direct-MMIO scaler driver fallback. */ + +&pmgr { + dt5_ps_msr: power-controller@2a8 { + compatible = "apple,t8142-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x2a8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "msr"; + status = "disabled"; + }; + dt5_ps_msr_ase_core: power-controller@320 { + compatible = "apple,t8142-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x320 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "msr-ase-core"; + power-domains = <&dt5_ps_msr>; + status = "disabled"; + }; +}; + +&{/soc} { + dt5_peripheral_clocks: clock-controller@380700000 { + compatible = "apple,t8142-pmgr-clocks", "apple,pmgr-clocks"; + reg = <0x3 0x80700000 0x0 0xd0000>, + <0x3 0x88280000 0x0 0x80000>, + <0x3 0x80000000 0x0 0x3c000>, + <0x3 0x88200000 0x0 0x2c000>, + <0x3 0x88004000 0x0 0x1000>, + <0x2 0x10e20000 0x0 0x1268>, + <0x2 0x10f00000 0x0 0x40088>, + <0x2 0x10e40000 0x0 0xc020>, + <0x2 0x10e50000 0x0 0x9048>, + <0x2 0x10e70000 0x0 0xffe8>, + <0x2 0x10050000 0x0 0x9010>, + <0x2 0x10150000 0x0 0x9010>, + <0x2 0x10250000 0x0 0x9010>, + <0x2 0x10350000 0x0 0x9010>, + <0x2 0x10450000 0x0 0x9010>, + <0x2 0x10550000 0x0 0x9010>, + <0x2 0x11e20000 0x0 0x12e8>, + <0x2 0x11f00000 0x0 0x40088>, + <0x2 0x11e40000 0x0 0xc020>, + <0x2 0x11e50000 0x0 0x9048>, + <0x2 0x11e70000 0x0 0xffe8>, + <0x2 0x11050000 0x0 0x9018>, + <0x2 0x11150000 0x0 0x9018>, + <0x2 0x11250000 0x0 0x9018>, + <0x2 0x11350000 0x0 0x9018>, + <0x3 0x80280000 0x0 0x8000>, + <0x3 0x88700000 0x0 0x4000>, + <0x3 0x88100000 0x0 0xa8000>, + <0x4 0x2195c000 0x0 0x4000>, + <0x4 0x21960000 0x0 0x4000>, + <0x4 0x21974000 0x0 0x4000>, + <0x3 0x80208000 0x0 0x8000>, + <0x3 0x80700000 0x0 0x18000>, + <0x3 0x80728000 0x0 0x4000>, + <0x3 0x80724000 0x0 0x4000>, + <0x3 0x80764000 0x0 0x4000>, + <0x3 0x80780000 0x0 0x4000>, + <0x3 0x80760000 0x0 0x4000>, + <0x3 0x882b8000 0x0 0x10000>, + <0x3 0x882c8000 0x0 0x4000>, + <0x3 0x882d0000 0x0 0x8000>, + <0x3 0x803c0000 0x0 0x20000>, + <0x3 0x80730000 0x0 0x14000>, + <0x2 0x11000000 0x0 0xff4000>, + <0x4 0x21954000 0x0 0x4000>, + <0x3 0x80768000 0x0 0x4000>, + <0x3 0x8002c000 0x0 0x4000>, + <0x3 0x82000000 0x0 0x1000000>, + <0x5 0x80e80000 0x0 0x30000>, + <0x5 0x80ec0000 0x0 0x4000>, + <0x5 0x80ec0000 0x0 0x8000>, + <0x5 0x80e30000 0x0 0x4000>, + <0x5 0x80e30000 0x0 0x8000>, + <0x2 0x10000000 0x0 0xff4000>; + #clock-cells = <1>; + apple,pmgr = <&pmgr>; + status = "disabled"; + }; + + dt5_scaler0: scaler@305000000 { + compatible = "apple,t8142-scaler", "apple,scaler-v23"; + reg = <0x3 0x5000000 0x0 0x14000>, + <0x3 0x5210000 0x0 0x4000>, + <0x3 0x5204000 0x0 0x4000>, + <0x3 0x4000000 0x0 0x8000>, + <0x3 0x52c0000 0x0 0x40000>, + <0x3 0x5340000 0x0 0x14c000>, + <0x3 0x52a0000 0x0 0x4000>, + <0x3 0x5208000 0x0 0x4000>, + <0x3 0x5210000 0x0 0x4000>, + <0x3 0x5220000 0x0 0x4000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + iommus = <&dt5_dart_scaler 0>, <&dt5_dart_scaler 1>; + clocks = <&dt5_peripheral_clocks 399>; + power-domains = <&dt5_ps_msr>, <&dt5_ps_msr_ase_core>; + resets = <&dt5_ps_msr>; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t8142.dtsi b/arch/arm64/boot/dts/apple/t8142.dtsi index 815ab9db68f3f..866e117062893 100644 --- a/arch/arm64/boot/dts/apple/t8142.dtsi +++ b/arch/arm64/boot/dts/apple/t8142.dtsi @@ -172,3 +172,13 @@ }; }; }; + +&{/soc} { + pmgr: power-management@380700000 { + compatible = "apple,t8142-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd"; + reg = <0x3 0x80700000 0 0xd0000>; + #address-cells = <1>; + #size-cells = <1>; + status = "disabled"; + }; +}; From 94b491d1884e4c5b68bdc75a855f0846269deef1 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 05:16:31 +1100 Subject: [PATCH 08/12] arm64: dts: apple: group T8142 resources by board and SoC Keep board-specific resources in their DTS files and share disabled SoC resources through t8142-peripherals.dtsi. The existing J813 boot profile remains self-contained, so the common include avoids replacing its qualified root and CPU definitions. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- arch/arm64/boot/dts/apple/t8142-j704.dts | 538 +++++++++++++++++- arch/arm64/boot/dts/apple/t8142-j813.dts | 409 ++++++++++++- arch/arm64/boot/dts/apple/t8142-j815.dts | 484 +++++++++++++++- .../boot/dts/apple/t8142-peripherals.dtsi | 124 ++++ 4 files changed, 1552 insertions(+), 3 deletions(-) create mode 100644 arch/arm64/boot/dts/apple/t8142-peripherals.dtsi diff --git a/arch/arm64/boot/dts/apple/t8142-j704.dts b/arch/arm64/boot/dts/apple/t8142-j704.dts index 64b0c56c604c2..1e4ad021f0dd4 100644 --- a/arch/arm64/boot/dts/apple/t8142-j704.dts +++ b/arch/arm64/boot/dts/apple/t8142-j704.dts @@ -9,4 +9,540 @@ chassis-type = "laptop"; }; -#include "t8142-j704-inventory.dtsi" +/* Hardware resources only. Ownership and driver enables require qualification. */ + +&{/soc} { + + dt5_dart_apcie2: iommu@48a000000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x8a000000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_apcie0: iommu@488000000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x88000000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_apciec0: iommu@404000000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x4000000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_acio0: iommu@401a80000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x1a80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_apciec1: iommu@40c000000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0xc000000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_acio1: iommu@409a80000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x9a80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_apciec3: iommu@41c000000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x1c000000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_acio3: iommu@419a80000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x19a80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_aop: iommu@390fc0000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x90fc0000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_pmp: iommu@380300000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x80300000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_sep: iommu@308b80000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x8b80000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_sio: iommu@3a5060000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xa5060000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_rsm: iommu@3899a0000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x899a0000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_mtp: iommu@394800000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x94800000 0x0 0xc000>, + <0x3 0x94810000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_usb0: iommu@402f00000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x2f00000 0x0 0xc000>, + <0x4 0x2f80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_usb1: iommu@40af00000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0xaf00000 0x0 0xc000>, + <0x4 0xaf80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_usb3: iommu@41af00000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x1af00000 0x0 0xc000>, + <0x4 0x1af80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dcp: iommu@286340000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x2 0x86340000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_disp0: iommu@286300000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x2 0x86300000 0x0 0xc000>, + <0x2 0x86314000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_disp0_isoc: iommu@286180000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x2 0x86180000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dcpext0: iommu@506340000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x6340000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dispext0: iommu@506300000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x6300000 0x0 0xc000>, + <0x5 0x6314000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dispext0_isoc: iommu@506180000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x6180000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dcpext1: iommu@3aa340000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xaa340000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dispext1: iommu@3aa300000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xaa300000 0x0 0xc000>, + <0x3 0xaa314000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dispext1_isoc: iommu@3aa180000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xaa180000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_scaler: iommu@305260000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x5260000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + /* A dedicated scaler-DART gate mapping is not published by this ADT. */ + status = "disabled"; + }; + + dt5_dart_jpeg: iommu@301020000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x1020000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_avd: iommu@501020000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x1020000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_apr: iommu@3a1020000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xa1020000 0x0 0xc000>, + <0x3 0xa1034000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_scdc: iommu@3a1040000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xa1040000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_apcie2_piodma: dma-controller@48a030000 { + compatible = "apple,t8142-pcie-piodma", "apple,pcie-piodma"; + reg = <0x4 0x8a030000 0x0 0x4000>, + <0x4 0x8a034000 0x0 0x4000>, + <0x4 0x8a038000 0x0 0x4000>; + interrupts = ; + iommus = <&dt5_dart_apcie2 17>; + status = "disabled"; + }; + + dt5_apcie0_piodma: dma-controller@488030000 { + compatible = "apple,t8142-pcie-piodma", "apple,pcie-piodma"; + reg = <0x4 0x88030000 0x0 0x4000>, + <0x4 0x88034000 0x0 0x4000>, + <0x4 0x88038000 0x0 0x4000>; + interrupts = ; + iommus = <&dt5_dart_apcie0 17>; + status = "disabled"; + }; + + dt5_apciec0_piodma: dma-controller@404068000 { + compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; + reg = <0x4 0x4068000 0x0 0x4000>, + <0x4 0x406c000 0x0 0x4000>, + <0x4 0x4070000 0x0 0x4000>, + <0x4 0x403c000 0x0 0x4000>; + interrupts = ; + iommus = <&dt5_dart_apciec0 254>; + status = "disabled"; + }; + + dt5_apciec1_piodma: dma-controller@40c068000 { + compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; + reg = <0x4 0xc068000 0x0 0x4000>, + <0x4 0xc06c000 0x0 0x4000>, + <0x4 0xc070000 0x0 0x4000>, + <0x4 0xc03c000 0x0 0x4000>; + interrupts = ; + iommus = <&dt5_dart_apciec1 254>; + status = "disabled"; + }; + + dt5_apciec3_piodma: dma-controller@41c068000 { + compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; + reg = <0x4 0x1c068000 0x0 0x4000>, + <0x4 0x1c06c000 0x0 0x4000>, + <0x4 0x1c070000 0x0 0x4000>, + <0x4 0x1c03c000 0x0 0x4000>; + interrupts = ; + iommus = <&dt5_dart_apciec3 254>; + status = "disabled"; + }; + + dt5_aic_timebase: aic-timebase@591180000 { + compatible = "apple,t8142-aic-timebase", "apple,aic-timebase"; + reg = <0x5 0x91180000 0x0 0x1000>; + status = "disabled"; + }; + + dt5_error_handler: error-handler@308d00000 { + compatible = "apple,t8142-error-handler", "apple,soc-error-handler"; + reg = <0x3 0x8d00000 0x0 0x40000>, + <0x3 0x8900000 0x0 0x8000>, + <0x3 0x80000000 0x0 0x3c000>, + <0x3 0x80728000 0x0 0x4000>, + <0x3 0x80768000 0x0 0x4000>, + <0x3 0x882c8000 0x0 0x4000>, + <0x3 0x82000000 0x0 0x1000000>, + <0x3 0x803d0000 0x0 0x4000>, + <0x2 0x20000000 0x0 0x140000>, + <0x2 0x21000000 0x0 0x3c000>, + <0x2 0x21200000 0x0 0x3c000>, + <0x2 0x21400000 0x0 0x3c000>, + <0x2 0x21600000 0x0 0x3c000>, + <0x2 0x21800000 0x0 0x3c000>, + <0x2 0x21a00000 0x0 0x3c000>, + <0x2 0x21c00000 0x0 0x3c000>, + <0x2 0x21e00000 0x0 0x3c000>, + <0x2 0x4f000000 0x0 0x8000>, + <0x2 0x50000000 0x0 0x8000>, + <0x2 0x51000000 0x0 0x8000>, + <0x2 0x52000000 0x0 0x8000>, + <0x2 0x53000000 0x0 0x8000>, + <0x2 0x54000000 0x0 0x8000>, + <0x2 0x55000000 0x0 0x8000>, + <0x2 0x56000000 0x0 0x8000>, + <0x2 0x5f000000 0x0 0x8000>, + <0x2 0x6f000000 0x0 0x8000>, + <0x2 0x57000000 0x0 0x1000000>, + <0x2 0x58000000 0x0 0x1000000>, + <0x2 0x59000000 0x0 0x1000000>, + <0x3 0x80770000 0x0 0x4000>, + <0x3 0x80771000 0x0 0x4000>, + <0x2 0x5b000000 0x0 0x24000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + status = "disabled"; + }; + + dt5_aop_exclave_mailbox: mailbox@5e067c000 { + compatible = "apple,t8142-secure-mailbox", "apple,secure-mailbox"; + reg = <0x5 0xe067c000 0x0 0x4000>; + interrupts = , + ; + iommus = <&dt5_dart_aop 1>; + status = "disabled"; + }; + + dt5_event_log_handler: event-log@380700000 { + compatible = "apple,t8142-event-log", "apple,soc-event-log"; + reg = <0x3 0x80700000 0x0 0xd0000>, + <0x3 0x88280000 0x0 0x80000>, + <0x3 0x80000000 0x0 0x3c000>, + <0x3 0x88200000 0x0 0x2c000>, + <0x3 0x8028c000 0x0 0x4000>, + <0x3 0x80280000 0x0 0x8000>, + <0x4 0x21878000 0x0 0x4000>, + <0x4 0x21868000 0x0 0x8000>, + <0x3 0x80340000 0x0 0xc000>, + <0x3 0x80350000 0x0 0xc000>, + <0x3 0x80208000 0x0 0x4000>, + <0x3 0x80208400 0x0 0x4000>, + <0x3 0x8020a400 0x0 0x4000>, + <0x3 0x8020a600 0x0 0x4000>, + <0x3 0x8020a700 0x0 0x4000>, + <0x3 0x8020a800 0x0 0x4000>, + <0x3 0x8020aa00 0x0 0x4000>, + <0x3 0x8020ab00 0x0 0x4000>, + <0x3 0x8020ac00 0x0 0x4000>, + <0x3 0x8020ae00 0x0 0x4000>, + <0x3 0x8020af00 0x0 0x4000>, + <0x3 0x8020b000 0x0 0x4000>, + <0x3 0x8020b200 0x0 0x4000>, + <0x3 0x8020b300 0x0 0x4000>, + <0x3 0x8020b400 0x0 0x4000>, + <0x3 0x8020b600 0x0 0x4000>, + <0x3 0x8020b700 0x0 0x4000>, + <0x3 0x8020b800 0x0 0x4000>, + <0x3 0x8020ba00 0x0 0x4000>, + <0x3 0x8020bb00 0x0 0x4000>, + <0x3 0x8020bc00 0x0 0x4000>, + <0x3 0x8020be00 0x0 0x4000>, + <0x3 0x8020bf00 0x0 0x4000>, + <0x3 0x8020c000 0x0 0x4000>, + <0x3 0x8020c200 0x0 0x4000>, + <0x3 0x8020c300 0x0 0x4000>, + <0x3 0x8020c400 0x0 0x4000>, + <0x3 0x8020c600 0x0 0x4000>, + <0x3 0x8020c700 0x0 0x4000>, + <0x3 0x8020c800 0x0 0x4000>, + <0x3 0x8020ca00 0x0 0x4000>, + <0x3 0x8020cb00 0x0 0x4000>, + <0x3 0x8020cc00 0x0 0x4000>, + <0x3 0x8020ce00 0x0 0x4000>, + <0x3 0x8020d000 0x0 0x4000>, + <0x3 0x8020d200 0x0 0x4000>, + <0x3 0x8020d400 0x0 0x4000>, + <0x3 0x8020d600 0x0 0x4000>, + <0x3 0x8020d800 0x0 0x4000>, + <0x3 0x8020da00 0x0 0x4000>, + <0x3 0x82700000 0x0 0x114000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + ; + status = "disabled"; + }; + + dt5_esm: esm@55a67c000 { + compatible = "apple,t8142-esm", "apple,esm"; + reg = <0x5 0x5a67c000 0x0 0x4000>; + interrupts = , + ; + iommus = <&dt5_dart_sep 2>; + status = "disabled"; + }; + + dt5_aon_ptd: aon-ptd@38c840000 { + compatible = "apple,t8142-aon-ptd", "apple,aon-ptd"; + reg = <0x3 0x8c840000 0x0 0x4000>, + <0x3 0x8c850000 0x0 0x4000>, + <0x3 0x8c858000 0x0 0x4000>, + <0x3 0x8c860000 0x0 0x4000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + interrupt-controller; + #interrupt-cells = <1>; + #address-cells = <0>; + status = "disabled"; + }; + + dt5_rsm: rsm@389825000 { + compatible = "apple,t8142-rsm", "apple,rsm"; + reg = <0x3 0x89825000 0x0 0x4000>, + <0x3 0x898c0000 0x0 0x4>; + interrupts = ; + iommus = <&dt5_dart_rsm 0>; + status = "disabled"; + }; + + dt5_hib_exclave_watchdog: secure-watchdog@5d82b0000 { + compatible = "apple,t8142-secure-watchdog", "apple,secure-watchdog"; + reg = <0x5 0xd82b0000 0x0 0x4000>; + status = "disabled"; + }; +}; + +#include "t8142-peripherals.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8142-j813.dts b/arch/arm64/boot/dts/apple/t8142-j813.dts index 518ca5042d8c3..888711239a238 100644 --- a/arch/arm64/boot/dts/apple/t8142-j813.dts +++ b/arch/arm64/boot/dts/apple/t8142-j813.dts @@ -405,4 +405,411 @@ #include "t8142-j813-power.dtsi" #include "t8142-j813-audio.dtsi" -#include "t8142-j813-inventory.dtsi" +/* Hardware resources only. Ownership and driver enables require qualification. */ + +&{/soc} { + + dt5_dart_apciec0: iommu@404000000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x4000000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_acio0: iommu@401a80000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x1a80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_apciec1: iommu@40c000000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0xc000000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_acio1: iommu@409a80000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x9a80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_sep: iommu@308b80000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x8b80000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_sio: iommu@3a5060000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xa5060000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_rsm: iommu@3899a0000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x899a0000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_disp0_isoc: iommu@286180000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x2 0x86180000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dcpext0: iommu@506340000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x6340000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dispext0: iommu@506300000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x6300000 0x0 0xc000>, + <0x5 0x6314000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dispext0_isoc: iommu@506180000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x6180000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dcpext1: iommu@3aa340000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xaa340000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dispext1: iommu@3aa300000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xaa300000 0x0 0xc000>, + <0x3 0xaa314000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dispext1_isoc: iommu@3aa180000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xaa180000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_scaler: iommu@305260000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x5260000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + /* A dedicated scaler-DART gate mapping is not published by this ADT. */ + status = "disabled"; + }; + + dt5_dart_jpeg: iommu@301020000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x1020000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_apr: iommu@3a1020000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xa1020000 0x0 0xc000>, + <0x3 0xa1034000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_scdc: iommu@3a1040000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xa1040000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_apcie0_piodma: dma-controller@488030000 { + compatible = "apple,t8142-pcie-piodma", "apple,pcie-piodma"; + reg = <0x4 0x88030000 0x0 0x4000>, + <0x4 0x88034000 0x0 0x4000>, + <0x4 0x88038000 0x0 0x4000>; + interrupts = ; + iommus = <&dart_apcie0 17>; + status = "disabled"; + }; + + dt5_apciec0_piodma: dma-controller@404068000 { + compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; + reg = <0x4 0x4068000 0x0 0x4000>, + <0x4 0x406c000 0x0 0x4000>, + <0x4 0x4070000 0x0 0x4000>, + <0x4 0x403c000 0x0 0x4000>; + interrupts = ; + iommus = <&dt5_dart_apciec0 254>; + status = "disabled"; + }; + + dt5_apciec1_piodma: dma-controller@40c068000 { + compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; + reg = <0x4 0xc068000 0x0 0x4000>, + <0x4 0xc06c000 0x0 0x4000>, + <0x4 0xc070000 0x0 0x4000>, + <0x4 0xc03c000 0x0 0x4000>; + interrupts = ; + iommus = <&dt5_dart_apciec1 254>; + status = "disabled"; + }; + + dt5_aic_timebase: aic-timebase@591180000 { + compatible = "apple,t8142-aic-timebase", "apple,aic-timebase"; + reg = <0x5 0x91180000 0x0 0x1000>; + status = "disabled"; + }; + + dt5_error_handler: error-handler@308d00000 { + compatible = "apple,t8142-error-handler", "apple,soc-error-handler"; + reg = <0x3 0x8d00000 0x0 0x40000>, + <0x3 0x8900000 0x0 0x8000>, + <0x3 0x80000000 0x0 0x3c000>, + <0x3 0x80728000 0x0 0x4000>, + <0x3 0x80768000 0x0 0x4000>, + <0x3 0x882c8000 0x0 0x4000>, + <0x3 0x82000000 0x0 0x1000000>, + <0x3 0x803d0000 0x0 0x4000>, + <0x2 0x20000000 0x0 0x140000>, + <0x2 0x21000000 0x0 0x3c000>, + <0x2 0x21200000 0x0 0x3c000>, + <0x2 0x21400000 0x0 0x3c000>, + <0x2 0x21600000 0x0 0x3c000>, + <0x2 0x21800000 0x0 0x3c000>, + <0x2 0x21a00000 0x0 0x3c000>, + <0x2 0x21c00000 0x0 0x3c000>, + <0x2 0x21e00000 0x0 0x3c000>, + <0x2 0x4f000000 0x0 0x8000>, + <0x2 0x50000000 0x0 0x8000>, + <0x2 0x51000000 0x0 0x8000>, + <0x2 0x52000000 0x0 0x8000>, + <0x2 0x53000000 0x0 0x8000>, + <0x2 0x54000000 0x0 0x8000>, + <0x2 0x55000000 0x0 0x8000>, + <0x2 0x56000000 0x0 0x8000>, + <0x2 0x5f000000 0x0 0x8000>, + <0x2 0x6f000000 0x0 0x8000>, + <0x2 0x57000000 0x0 0x1000000>, + <0x2 0x58000000 0x0 0x1000000>, + <0x2 0x59000000 0x0 0x1000000>, + <0x3 0x80770000 0x0 0x4000>, + <0x3 0x80771000 0x0 0x4000>, + <0x2 0x5b000000 0x0 0x24000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + status = "disabled"; + }; + + dt5_aop_exclave_mailbox: mailbox@5e067c000 { + compatible = "apple,t8142-secure-mailbox", "apple,secure-mailbox"; + reg = <0x5 0xe067c000 0x0 0x4000>; + interrupts = , + ; + iommus = <&aop_dart 1>; + status = "disabled"; + }; + + dt5_esm: esm@55a67c000 { + compatible = "apple,t8142-esm", "apple,esm"; + reg = <0x5 0x5a67c000 0x0 0x4000>; + interrupts = , + ; + iommus = <&dt5_dart_sep 2>; + status = "disabled"; + }; + + dt5_aon_ptd: aon-ptd@38c840000 { + compatible = "apple,t8142-aon-ptd", "apple,aon-ptd"; + reg = <0x3 0x8c840000 0x0 0x4000>, + <0x3 0x8c850000 0x0 0x4000>, + <0x3 0x8c858000 0x0 0x4000>, + <0x3 0x8c860000 0x0 0x4000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + interrupt-controller; + #interrupt-cells = <1>; + #address-cells = <0>; + status = "disabled"; + }; + + dt5_rsm: rsm@389825000 { + compatible = "apple,t8142-rsm", "apple,rsm"; + reg = <0x3 0x89825000 0x0 0x4000>, + <0x3 0x898c0000 0x0 0x4>; + interrupts = ; + iommus = <&dt5_dart_rsm 0>; + status = "disabled"; + }; + + dt5_hib_exclave_watchdog: secure-watchdog@5d82b0000 { + compatible = "apple,t8142-secure-watchdog", "apple,secure-watchdog"; + reg = <0x5 0xd82b0000 0x0 0x4000>; + status = "disabled"; + }; + + dt5_event_log_handler: event-log@380700000 { + compatible = "apple,t8142-event-log", "apple,soc-event-log"; + reg = <0x3 0x80700000 0x0 0xd0000>, + <0x3 0x88280000 0x0 0x80000>, + <0x3 0x80000000 0x0 0x3c000>, + <0x3 0x88200000 0x0 0x2c000>, + <0x3 0x8028c000 0x0 0x4000>, + <0x3 0x80280000 0x0 0x8000>, + <0x4 0x21878000 0x0 0x4000>, + <0x4 0x21868000 0x0 0x8000>, + <0x3 0x80340000 0x0 0xc000>, + <0x3 0x80350000 0x0 0xc000>, + <0x3 0x80208000 0x0 0x4000>, + <0x3 0x80208400 0x0 0x4000>, + <0x3 0x8020a400 0x0 0x4000>, + <0x3 0x8020a600 0x0 0x4000>, + <0x3 0x8020a700 0x0 0x4000>, + <0x3 0x8020a800 0x0 0x4000>, + <0x3 0x8020aa00 0x0 0x4000>, + <0x3 0x8020ab00 0x0 0x4000>, + <0x3 0x8020ac00 0x0 0x4000>, + <0x3 0x8020ae00 0x0 0x4000>, + <0x3 0x8020af00 0x0 0x4000>, + <0x3 0x8020b000 0x0 0x4000>, + <0x3 0x8020b200 0x0 0x4000>, + <0x3 0x8020b300 0x0 0x4000>, + <0x3 0x8020b400 0x0 0x4000>, + <0x3 0x8020b600 0x0 0x4000>, + <0x3 0x8020b700 0x0 0x4000>, + <0x3 0x8020b800 0x0 0x4000>, + <0x3 0x8020ba00 0x0 0x4000>, + <0x3 0x8020bb00 0x0 0x4000>, + <0x3 0x8020bc00 0x0 0x4000>, + <0x3 0x8020be00 0x0 0x4000>, + <0x3 0x8020bf00 0x0 0x4000>, + <0x3 0x8020c000 0x0 0x4000>, + <0x3 0x8020c200 0x0 0x4000>, + <0x3 0x8020c300 0x0 0x4000>, + <0x3 0x8020c400 0x0 0x4000>, + <0x3 0x8020c600 0x0 0x4000>, + <0x3 0x8020c700 0x0 0x4000>, + <0x3 0x8020c800 0x0 0x4000>, + <0x3 0x8020ca00 0x0 0x4000>, + <0x3 0x8020cb00 0x0 0x4000>, + <0x3 0x8020cc00 0x0 0x4000>, + <0x3 0x8020ce00 0x0 0x4000>, + <0x3 0x8020d000 0x0 0x4000>, + <0x3 0x8020d200 0x0 0x4000>, + <0x3 0x8020d400 0x0 0x4000>, + <0x3 0x8020d600 0x0 0x4000>, + <0x3 0x8020d800 0x0 0x4000>, + <0x3 0x8020da00 0x0 0x4000>, + <0x3 0x82700000 0x0 0x114000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + ; + /* Shared status windows do not grant AP ownership. */ + status = "disabled"; + }; +}; + +#include "t8142-peripherals.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8142-j815.dts b/arch/arm64/boot/dts/apple/t8142-j815.dts index 4000f8177ec68..94a8b0ee575ba 100644 --- a/arch/arm64/boot/dts/apple/t8142-j815.dts +++ b/arch/arm64/boot/dts/apple/t8142-j815.dts @@ -9,4 +9,486 @@ chassis-type = "laptop"; }; -#include "t8142-j815-inventory.dtsi" +/* Hardware resources only. Ownership and driver enables require qualification. */ + +&{/soc} { + + dt5_dart_apcie0: iommu@488000000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x88000000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_apciec0: iommu@404000000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x4000000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_acio0: iommu@401a80000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x1a80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_apciec1: iommu@40c000000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0xc000000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_acio1: iommu@409a80000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x9a80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_aop: iommu@390fc0000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x90fc0000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_pmp: iommu@380300000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x80300000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_sep: iommu@308b80000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x8b80000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_sio: iommu@3a5060000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xa5060000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_rsm: iommu@3899a0000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x899a0000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_mtp: iommu@394800000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x94800000 0x0 0xc000>, + <0x3 0x94810000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_usb0: iommu@402f00000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x2f00000 0x0 0xc000>, + <0x4 0x2f80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_usb1: iommu@40af00000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0xaf00000 0x0 0xc000>, + <0x4 0xaf80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dcp: iommu@286340000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x2 0x86340000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_disp0: iommu@286300000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x2 0x86300000 0x0 0xc000>, + <0x2 0x86314000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_disp0_isoc: iommu@286180000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x2 0x86180000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dcpext0: iommu@506340000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x6340000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dispext0: iommu@506300000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x6300000 0x0 0xc000>, + <0x5 0x6314000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dispext0_isoc: iommu@506180000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x6180000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dcpext1: iommu@3aa340000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xaa340000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dispext1: iommu@3aa300000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xaa300000 0x0 0xc000>, + <0x3 0xaa314000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_dispext1_isoc: iommu@3aa180000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xaa180000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_scaler: iommu@305260000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x5260000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + /* A dedicated scaler-DART gate mapping is not published by this ADT. */ + status = "disabled"; + }; + + dt5_dart_jpeg: iommu@301020000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x1020000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_avd: iommu@501020000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x1020000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_apr: iommu@3a1020000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xa1020000 0x0 0xc000>, + <0x3 0xa1034000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_dart_scdc: iommu@3a1040000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xa1040000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dt5_apcie0_piodma: dma-controller@488030000 { + compatible = "apple,t8142-pcie-piodma", "apple,pcie-piodma"; + reg = <0x4 0x88030000 0x0 0x4000>, + <0x4 0x88034000 0x0 0x4000>, + <0x4 0x88038000 0x0 0x4000>; + interrupts = ; + iommus = <&dt5_dart_apcie0 17>; + status = "disabled"; + }; + + dt5_apciec0_piodma: dma-controller@404068000 { + compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; + reg = <0x4 0x4068000 0x0 0x4000>, + <0x4 0x406c000 0x0 0x4000>, + <0x4 0x4070000 0x0 0x4000>, + <0x4 0x403c000 0x0 0x4000>; + interrupts = ; + iommus = <&dt5_dart_apciec0 254>; + status = "disabled"; + }; + + dt5_apciec1_piodma: dma-controller@40c068000 { + compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; + reg = <0x4 0xc068000 0x0 0x4000>, + <0x4 0xc06c000 0x0 0x4000>, + <0x4 0xc070000 0x0 0x4000>, + <0x4 0xc03c000 0x0 0x4000>; + interrupts = ; + iommus = <&dt5_dart_apciec1 254>; + status = "disabled"; + }; + + dt5_aic_timebase: aic-timebase@591180000 { + compatible = "apple,t8142-aic-timebase", "apple,aic-timebase"; + reg = <0x5 0x91180000 0x0 0x1000>; + status = "disabled"; + }; + + dt5_error_handler: error-handler@308d00000 { + compatible = "apple,t8142-error-handler", "apple,soc-error-handler"; + reg = <0x3 0x8d00000 0x0 0x40000>, + <0x3 0x8900000 0x0 0x8000>, + <0x3 0x80000000 0x0 0x3c000>, + <0x3 0x80728000 0x0 0x4000>, + <0x3 0x80768000 0x0 0x4000>, + <0x3 0x882c8000 0x0 0x4000>, + <0x3 0x82000000 0x0 0x1000000>, + <0x3 0x803d0000 0x0 0x4000>, + <0x2 0x20000000 0x0 0x140000>, + <0x2 0x21000000 0x0 0x3c000>, + <0x2 0x21200000 0x0 0x3c000>, + <0x2 0x21400000 0x0 0x3c000>, + <0x2 0x21600000 0x0 0x3c000>, + <0x2 0x21800000 0x0 0x3c000>, + <0x2 0x21a00000 0x0 0x3c000>, + <0x2 0x21c00000 0x0 0x3c000>, + <0x2 0x21e00000 0x0 0x3c000>, + <0x2 0x4f000000 0x0 0x8000>, + <0x2 0x50000000 0x0 0x8000>, + <0x2 0x51000000 0x0 0x8000>, + <0x2 0x52000000 0x0 0x8000>, + <0x2 0x53000000 0x0 0x8000>, + <0x2 0x54000000 0x0 0x8000>, + <0x2 0x55000000 0x0 0x8000>, + <0x2 0x56000000 0x0 0x8000>, + <0x2 0x5f000000 0x0 0x8000>, + <0x2 0x6f000000 0x0 0x8000>, + <0x2 0x57000000 0x0 0x1000000>, + <0x2 0x58000000 0x0 0x1000000>, + <0x2 0x59000000 0x0 0x1000000>, + <0x3 0x80770000 0x0 0x4000>, + <0x3 0x80771000 0x0 0x4000>, + <0x2 0x5b000000 0x0 0x24000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + status = "disabled"; + }; + + dt5_aop_exclave_mailbox: mailbox@5e067c000 { + compatible = "apple,t8142-secure-mailbox", "apple,secure-mailbox"; + reg = <0x5 0xe067c000 0x0 0x4000>; + interrupts = , + ; + iommus = <&dt5_dart_aop 1>; + status = "disabled"; + }; + + dt5_event_log_handler: event-log@380700000 { + compatible = "apple,t8142-event-log", "apple,soc-event-log"; + reg = <0x3 0x80700000 0x0 0xd0000>, + <0x3 0x88280000 0x0 0x80000>, + <0x3 0x80000000 0x0 0x3c000>, + <0x3 0x88200000 0x0 0x2c000>, + <0x3 0x8028c000 0x0 0x4000>, + <0x3 0x80280000 0x0 0x8000>, + <0x4 0x21878000 0x0 0x4000>, + <0x4 0x21868000 0x0 0x8000>, + <0x3 0x80340000 0x0 0xc000>, + <0x3 0x80350000 0x0 0xc000>, + <0x3 0x80208000 0x0 0x4000>, + <0x3 0x80208400 0x0 0x4000>, + <0x3 0x8020a400 0x0 0x4000>, + <0x3 0x8020a600 0x0 0x4000>, + <0x3 0x8020a700 0x0 0x4000>, + <0x3 0x8020a800 0x0 0x4000>, + <0x3 0x8020aa00 0x0 0x4000>, + <0x3 0x8020ab00 0x0 0x4000>, + <0x3 0x8020ac00 0x0 0x4000>, + <0x3 0x8020ae00 0x0 0x4000>, + <0x3 0x8020af00 0x0 0x4000>, + <0x3 0x8020b000 0x0 0x4000>, + <0x3 0x8020b200 0x0 0x4000>, + <0x3 0x8020b300 0x0 0x4000>, + <0x3 0x8020b400 0x0 0x4000>, + <0x3 0x8020b600 0x0 0x4000>, + <0x3 0x8020b700 0x0 0x4000>, + <0x3 0x8020b800 0x0 0x4000>, + <0x3 0x8020ba00 0x0 0x4000>, + <0x3 0x8020bb00 0x0 0x4000>, + <0x3 0x8020bc00 0x0 0x4000>, + <0x3 0x8020be00 0x0 0x4000>, + <0x3 0x8020bf00 0x0 0x4000>, + <0x3 0x8020c000 0x0 0x4000>, + <0x3 0x8020c200 0x0 0x4000>, + <0x3 0x8020c300 0x0 0x4000>, + <0x3 0x8020c400 0x0 0x4000>, + <0x3 0x8020c600 0x0 0x4000>, + <0x3 0x8020c700 0x0 0x4000>, + <0x3 0x8020c800 0x0 0x4000>, + <0x3 0x8020ca00 0x0 0x4000>, + <0x3 0x8020cb00 0x0 0x4000>, + <0x3 0x8020cc00 0x0 0x4000>, + <0x3 0x8020ce00 0x0 0x4000>, + <0x3 0x8020d000 0x0 0x4000>, + <0x3 0x8020d200 0x0 0x4000>, + <0x3 0x8020d400 0x0 0x4000>, + <0x3 0x8020d600 0x0 0x4000>, + <0x3 0x8020d800 0x0 0x4000>, + <0x3 0x8020da00 0x0 0x4000>, + <0x3 0x82700000 0x0 0x114000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + ; + status = "disabled"; + }; + + dt5_esm: esm@55a67c000 { + compatible = "apple,t8142-esm", "apple,esm"; + reg = <0x5 0x5a67c000 0x0 0x4000>; + interrupts = , + ; + iommus = <&dt5_dart_sep 2>; + status = "disabled"; + }; + + dt5_aon_ptd: aon-ptd@38c840000 { + compatible = "apple,t8142-aon-ptd", "apple,aon-ptd"; + reg = <0x3 0x8c840000 0x0 0x4000>, + <0x3 0x8c850000 0x0 0x4000>, + <0x3 0x8c858000 0x0 0x4000>, + <0x3 0x8c860000 0x0 0x4000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + interrupt-controller; + #interrupt-cells = <1>; + #address-cells = <0>; + status = "disabled"; + }; + + dt5_rsm: rsm@389825000 { + compatible = "apple,t8142-rsm", "apple,rsm"; + reg = <0x3 0x89825000 0x0 0x4000>, + <0x3 0x898c0000 0x0 0x4>; + interrupts = ; + iommus = <&dt5_dart_rsm 0>; + status = "disabled"; + }; + + dt5_hib_exclave_watchdog: secure-watchdog@5d82b0000 { + compatible = "apple,t8142-secure-watchdog", "apple,secure-watchdog"; + reg = <0x5 0xd82b0000 0x0 0x4000>; + status = "disabled"; + }; +}; + +#include "t8142-peripherals.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8142-peripherals.dtsi b/arch/arm64/boot/dts/apple/t8142-peripherals.dtsi new file mode 100644 index 0000000000000..8d140dc3112b9 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8142-peripherals.dtsi @@ -0,0 +1,124 @@ +// SPDX-License-Identifier: GPL-2.0-only OR MIT +/* Firmware/descriptor scaler family. No direct-MMIO scaler driver fallback. */ + +&pmgr { + dt5_ps_msr: power-controller@2a8 { + compatible = "apple,t8142-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x2a8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "msr"; + status = "disabled"; + }; + dt5_ps_msr_ase_core: power-controller@320 { + compatible = "apple,t8142-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x320 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "msr-ase-core"; + power-domains = <&dt5_ps_msr>; + status = "disabled"; + }; +}; + +&{/soc} { + dt5_peripheral_clocks: clock-controller@380700000 { + compatible = "apple,t8142-pmgr-clocks", "apple,pmgr-clocks"; + reg = <0x3 0x80700000 0x0 0xd0000>, + <0x3 0x88280000 0x0 0x80000>, + <0x3 0x80000000 0x0 0x3c000>, + <0x3 0x88200000 0x0 0x2c000>, + <0x3 0x88004000 0x0 0x1000>, + <0x2 0x10e20000 0x0 0x1268>, + <0x2 0x10f00000 0x0 0x40088>, + <0x2 0x10e40000 0x0 0xc020>, + <0x2 0x10e50000 0x0 0x9048>, + <0x2 0x10e70000 0x0 0xffe8>, + <0x2 0x10050000 0x0 0x9010>, + <0x2 0x10150000 0x0 0x9010>, + <0x2 0x10250000 0x0 0x9010>, + <0x2 0x10350000 0x0 0x9010>, + <0x2 0x10450000 0x0 0x9010>, + <0x2 0x10550000 0x0 0x9010>, + <0x2 0x11e20000 0x0 0x12e8>, + <0x2 0x11f00000 0x0 0x40088>, + <0x2 0x11e40000 0x0 0xc020>, + <0x2 0x11e50000 0x0 0x9048>, + <0x2 0x11e70000 0x0 0xffe8>, + <0x2 0x11050000 0x0 0x9018>, + <0x2 0x11150000 0x0 0x9018>, + <0x2 0x11250000 0x0 0x9018>, + <0x2 0x11350000 0x0 0x9018>, + <0x3 0x80280000 0x0 0x8000>, + <0x3 0x88700000 0x0 0x4000>, + <0x3 0x88100000 0x0 0xa8000>, + <0x4 0x2195c000 0x0 0x4000>, + <0x4 0x21960000 0x0 0x4000>, + <0x4 0x21974000 0x0 0x4000>, + <0x3 0x80208000 0x0 0x8000>, + <0x3 0x80700000 0x0 0x18000>, + <0x3 0x80728000 0x0 0x4000>, + <0x3 0x80724000 0x0 0x4000>, + <0x3 0x80764000 0x0 0x4000>, + <0x3 0x80780000 0x0 0x4000>, + <0x3 0x80760000 0x0 0x4000>, + <0x3 0x882b8000 0x0 0x10000>, + <0x3 0x882c8000 0x0 0x4000>, + <0x3 0x882d0000 0x0 0x8000>, + <0x3 0x803c0000 0x0 0x20000>, + <0x3 0x80730000 0x0 0x14000>, + <0x2 0x11000000 0x0 0xff4000>, + <0x4 0x21954000 0x0 0x4000>, + <0x3 0x80768000 0x0 0x4000>, + <0x3 0x8002c000 0x0 0x4000>, + <0x3 0x82000000 0x0 0x1000000>, + <0x5 0x80e80000 0x0 0x30000>, + <0x5 0x80ec0000 0x0 0x4000>, + <0x5 0x80ec0000 0x0 0x8000>, + <0x5 0x80e30000 0x0 0x4000>, + <0x5 0x80e30000 0x0 0x8000>, + <0x2 0x10000000 0x0 0xff4000>; + #clock-cells = <1>; + apple,pmgr = <&pmgr>; + status = "disabled"; + }; + + dt5_scaler0: scaler@305000000 { + compatible = "apple,t8142-scaler", "apple,scaler-v23"; + reg = <0x3 0x5000000 0x0 0x14000>, + <0x3 0x5210000 0x0 0x4000>, + <0x3 0x5204000 0x0 0x4000>, + <0x3 0x4000000 0x0 0x8000>, + <0x3 0x52c0000 0x0 0x40000>, + <0x3 0x5340000 0x0 0x14c000>, + <0x3 0x52a0000 0x0 0x4000>, + <0x3 0x5208000 0x0 0x4000>, + <0x3 0x5210000 0x0 0x4000>, + <0x3 0x5220000 0x0 0x4000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + iommus = <&dt5_dart_scaler 0>, <&dt5_dart_scaler 1>; + clocks = <&dt5_peripheral_clocks 399>; + power-domains = <&dt5_ps_msr>, <&dt5_ps_msr_ase_core>; + resets = <&dt5_ps_msr>; + status = "disabled"; + }; +}; From 5e9b8fae27ed24c3b2ee26fd3fe426723881824d Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 05:16:48 +1100 Subject: [PATCH 09/12] arm64: dts: apple: remove superseded T8142 include splits Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../boot/dts/apple/t8142-j704-inventory.dtsi | 538 ------------------ .../boot/dts/apple/t8142-j813-inventory.dtsi | 409 ------------- .../boot/dts/apple/t8142-j815-inventory.dtsi | 484 ---------------- .../boot/dts/apple/t8142-scaler-v23.dtsi | 124 ---- 4 files changed, 1555 deletions(-) delete mode 100644 arch/arm64/boot/dts/apple/t8142-j704-inventory.dtsi delete mode 100644 arch/arm64/boot/dts/apple/t8142-j813-inventory.dtsi delete mode 100644 arch/arm64/boot/dts/apple/t8142-j815-inventory.dtsi delete mode 100644 arch/arm64/boot/dts/apple/t8142-scaler-v23.dtsi diff --git a/arch/arm64/boot/dts/apple/t8142-j704-inventory.dtsi b/arch/arm64/boot/dts/apple/t8142-j704-inventory.dtsi deleted file mode 100644 index e0a939c0aaa7d..0000000000000 --- a/arch/arm64/boot/dts/apple/t8142-j704-inventory.dtsi +++ /dev/null @@ -1,538 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only OR MIT -/* Hardware resources only. Ownership and driver enables require qualification. */ - -&{/soc} { - - dt5_dart_apcie2: iommu@48a000000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x8a000000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_apcie0: iommu@488000000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x88000000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_apciec0: iommu@404000000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x4000000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_acio0: iommu@401a80000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x1a80000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_apciec1: iommu@40c000000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0xc000000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_acio1: iommu@409a80000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x9a80000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_apciec3: iommu@41c000000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x1c000000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_acio3: iommu@419a80000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x19a80000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_aop: iommu@390fc0000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x90fc0000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_pmp: iommu@380300000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x80300000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_sep: iommu@308b80000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x8b80000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_sio: iommu@3a5060000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xa5060000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_rsm: iommu@3899a0000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x899a0000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_mtp: iommu@394800000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x94800000 0x0 0xc000>, - <0x3 0x94810000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_usb0: iommu@402f00000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x2f00000 0x0 0xc000>, - <0x4 0x2f80000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_usb1: iommu@40af00000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0xaf00000 0x0 0xc000>, - <0x4 0xaf80000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_usb3: iommu@41af00000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x1af00000 0x0 0xc000>, - <0x4 0x1af80000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dcp: iommu@286340000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x2 0x86340000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_disp0: iommu@286300000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x2 0x86300000 0x0 0xc000>, - <0x2 0x86314000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_disp0_isoc: iommu@286180000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x2 0x86180000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dcpext0: iommu@506340000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x5 0x6340000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dispext0: iommu@506300000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x5 0x6300000 0x0 0xc000>, - <0x5 0x6314000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dispext0_isoc: iommu@506180000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x5 0x6180000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dcpext1: iommu@3aa340000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xaa340000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dispext1: iommu@3aa300000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xaa300000 0x0 0xc000>, - <0x3 0xaa314000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dispext1_isoc: iommu@3aa180000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xaa180000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_scaler: iommu@305260000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x5260000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - /* A dedicated scaler-DART gate mapping is not published by this ADT. */ - status = "disabled"; - }; - - dt5_dart_jpeg: iommu@301020000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x1020000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_avd: iommu@501020000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x5 0x1020000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_apr: iommu@3a1020000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xa1020000 0x0 0xc000>, - <0x3 0xa1034000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_scdc: iommu@3a1040000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xa1040000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_apcie2_piodma: dma-controller@48a030000 { - compatible = "apple,t8142-pcie-piodma", "apple,pcie-piodma"; - reg = <0x4 0x8a030000 0x0 0x4000>, - <0x4 0x8a034000 0x0 0x4000>, - <0x4 0x8a038000 0x0 0x4000>; - interrupts = ; - iommus = <&dt5_dart_apcie2 17>; - status = "disabled"; - }; - - dt5_apcie0_piodma: dma-controller@488030000 { - compatible = "apple,t8142-pcie-piodma", "apple,pcie-piodma"; - reg = <0x4 0x88030000 0x0 0x4000>, - <0x4 0x88034000 0x0 0x4000>, - <0x4 0x88038000 0x0 0x4000>; - interrupts = ; - iommus = <&dt5_dart_apcie0 17>; - status = "disabled"; - }; - - dt5_apciec0_piodma: dma-controller@404068000 { - compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; - reg = <0x4 0x4068000 0x0 0x4000>, - <0x4 0x406c000 0x0 0x4000>, - <0x4 0x4070000 0x0 0x4000>, - <0x4 0x403c000 0x0 0x4000>; - interrupts = ; - iommus = <&dt5_dart_apciec0 254>; - status = "disabled"; - }; - - dt5_apciec1_piodma: dma-controller@40c068000 { - compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; - reg = <0x4 0xc068000 0x0 0x4000>, - <0x4 0xc06c000 0x0 0x4000>, - <0x4 0xc070000 0x0 0x4000>, - <0x4 0xc03c000 0x0 0x4000>; - interrupts = ; - iommus = <&dt5_dart_apciec1 254>; - status = "disabled"; - }; - - dt5_apciec3_piodma: dma-controller@41c068000 { - compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; - reg = <0x4 0x1c068000 0x0 0x4000>, - <0x4 0x1c06c000 0x0 0x4000>, - <0x4 0x1c070000 0x0 0x4000>, - <0x4 0x1c03c000 0x0 0x4000>; - interrupts = ; - iommus = <&dt5_dart_apciec3 254>; - status = "disabled"; - }; - - dt5_aic_timebase: aic-timebase@591180000 { - compatible = "apple,t8142-aic-timebase", "apple,aic-timebase"; - reg = <0x5 0x91180000 0x0 0x1000>; - status = "disabled"; - }; - - dt5_error_handler: error-handler@308d00000 { - compatible = "apple,t8142-error-handler", "apple,soc-error-handler"; - reg = <0x3 0x8d00000 0x0 0x40000>, - <0x3 0x8900000 0x0 0x8000>, - <0x3 0x80000000 0x0 0x3c000>, - <0x3 0x80728000 0x0 0x4000>, - <0x3 0x80768000 0x0 0x4000>, - <0x3 0x882c8000 0x0 0x4000>, - <0x3 0x82000000 0x0 0x1000000>, - <0x3 0x803d0000 0x0 0x4000>, - <0x2 0x20000000 0x0 0x140000>, - <0x2 0x21000000 0x0 0x3c000>, - <0x2 0x21200000 0x0 0x3c000>, - <0x2 0x21400000 0x0 0x3c000>, - <0x2 0x21600000 0x0 0x3c000>, - <0x2 0x21800000 0x0 0x3c000>, - <0x2 0x21a00000 0x0 0x3c000>, - <0x2 0x21c00000 0x0 0x3c000>, - <0x2 0x21e00000 0x0 0x3c000>, - <0x2 0x4f000000 0x0 0x8000>, - <0x2 0x50000000 0x0 0x8000>, - <0x2 0x51000000 0x0 0x8000>, - <0x2 0x52000000 0x0 0x8000>, - <0x2 0x53000000 0x0 0x8000>, - <0x2 0x54000000 0x0 0x8000>, - <0x2 0x55000000 0x0 0x8000>, - <0x2 0x56000000 0x0 0x8000>, - <0x2 0x5f000000 0x0 0x8000>, - <0x2 0x6f000000 0x0 0x8000>, - <0x2 0x57000000 0x0 0x1000000>, - <0x2 0x58000000 0x0 0x1000000>, - <0x2 0x59000000 0x0 0x1000000>, - <0x3 0x80770000 0x0 0x4000>, - <0x3 0x80771000 0x0 0x4000>, - <0x2 0x5b000000 0x0 0x24000>; - interrupts = , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - ; - status = "disabled"; - }; - - dt5_aop_exclave_mailbox: mailbox@5e067c000 { - compatible = "apple,t8142-secure-mailbox", "apple,secure-mailbox"; - reg = <0x5 0xe067c000 0x0 0x4000>; - interrupts = , - ; - iommus = <&dt5_dart_aop 1>; - status = "disabled"; - }; - - dt5_event_log_handler: event-log@380700000 { - compatible = "apple,t8142-event-log", "apple,soc-event-log"; - reg = <0x3 0x80700000 0x0 0xd0000>, - <0x3 0x88280000 0x0 0x80000>, - <0x3 0x80000000 0x0 0x3c000>, - <0x3 0x88200000 0x0 0x2c000>, - <0x3 0x8028c000 0x0 0x4000>, - <0x3 0x80280000 0x0 0x8000>, - <0x4 0x21878000 0x0 0x4000>, - <0x4 0x21868000 0x0 0x8000>, - <0x3 0x80340000 0x0 0xc000>, - <0x3 0x80350000 0x0 0xc000>, - <0x3 0x80208000 0x0 0x4000>, - <0x3 0x80208400 0x0 0x4000>, - <0x3 0x8020a400 0x0 0x4000>, - <0x3 0x8020a600 0x0 0x4000>, - <0x3 0x8020a700 0x0 0x4000>, - <0x3 0x8020a800 0x0 0x4000>, - <0x3 0x8020aa00 0x0 0x4000>, - <0x3 0x8020ab00 0x0 0x4000>, - <0x3 0x8020ac00 0x0 0x4000>, - <0x3 0x8020ae00 0x0 0x4000>, - <0x3 0x8020af00 0x0 0x4000>, - <0x3 0x8020b000 0x0 0x4000>, - <0x3 0x8020b200 0x0 0x4000>, - <0x3 0x8020b300 0x0 0x4000>, - <0x3 0x8020b400 0x0 0x4000>, - <0x3 0x8020b600 0x0 0x4000>, - <0x3 0x8020b700 0x0 0x4000>, - <0x3 0x8020b800 0x0 0x4000>, - <0x3 0x8020ba00 0x0 0x4000>, - <0x3 0x8020bb00 0x0 0x4000>, - <0x3 0x8020bc00 0x0 0x4000>, - <0x3 0x8020be00 0x0 0x4000>, - <0x3 0x8020bf00 0x0 0x4000>, - <0x3 0x8020c000 0x0 0x4000>, - <0x3 0x8020c200 0x0 0x4000>, - <0x3 0x8020c300 0x0 0x4000>, - <0x3 0x8020c400 0x0 0x4000>, - <0x3 0x8020c600 0x0 0x4000>, - <0x3 0x8020c700 0x0 0x4000>, - <0x3 0x8020c800 0x0 0x4000>, - <0x3 0x8020ca00 0x0 0x4000>, - <0x3 0x8020cb00 0x0 0x4000>, - <0x3 0x8020cc00 0x0 0x4000>, - <0x3 0x8020ce00 0x0 0x4000>, - <0x3 0x8020d000 0x0 0x4000>, - <0x3 0x8020d200 0x0 0x4000>, - <0x3 0x8020d400 0x0 0x4000>, - <0x3 0x8020d600 0x0 0x4000>, - <0x3 0x8020d800 0x0 0x4000>, - <0x3 0x8020da00 0x0 0x4000>, - <0x3 0x82700000 0x0 0x114000>; - interrupts = , - , - , - , - , - , - , - , - , - , - , - , - ; - status = "disabled"; - }; - - dt5_esm: esm@55a67c000 { - compatible = "apple,t8142-esm", "apple,esm"; - reg = <0x5 0x5a67c000 0x0 0x4000>; - interrupts = , - ; - iommus = <&dt5_dart_sep 2>; - status = "disabled"; - }; - - dt5_aon_ptd: aon-ptd@38c840000 { - compatible = "apple,t8142-aon-ptd", "apple,aon-ptd"; - reg = <0x3 0x8c840000 0x0 0x4000>, - <0x3 0x8c850000 0x0 0x4000>, - <0x3 0x8c858000 0x0 0x4000>, - <0x3 0x8c860000 0x0 0x4000>; - interrupts = , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - ; - interrupt-controller; - #interrupt-cells = <1>; - #address-cells = <0>; - status = "disabled"; - }; - - dt5_rsm: rsm@389825000 { - compatible = "apple,t8142-rsm", "apple,rsm"; - reg = <0x3 0x89825000 0x0 0x4000>, - <0x3 0x898c0000 0x0 0x4>; - interrupts = ; - iommus = <&dt5_dart_rsm 0>; - status = "disabled"; - }; - - dt5_hib_exclave_watchdog: secure-watchdog@5d82b0000 { - compatible = "apple,t8142-secure-watchdog", "apple,secure-watchdog"; - reg = <0x5 0xd82b0000 0x0 0x4000>; - status = "disabled"; - }; -}; - -#include "t8142-scaler-v23.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8142-j813-inventory.dtsi b/arch/arm64/boot/dts/apple/t8142-j813-inventory.dtsi deleted file mode 100644 index 50d1b5cda1112..0000000000000 --- a/arch/arm64/boot/dts/apple/t8142-j813-inventory.dtsi +++ /dev/null @@ -1,409 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only OR MIT -/* Hardware resources only. Ownership and driver enables require qualification. */ - -&{/soc} { - - dt5_dart_apciec0: iommu@404000000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x4000000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_acio0: iommu@401a80000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x1a80000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_apciec1: iommu@40c000000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0xc000000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_acio1: iommu@409a80000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x9a80000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_sep: iommu@308b80000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x8b80000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_sio: iommu@3a5060000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xa5060000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_rsm: iommu@3899a0000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x899a0000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_disp0_isoc: iommu@286180000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x2 0x86180000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dcpext0: iommu@506340000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x5 0x6340000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dispext0: iommu@506300000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x5 0x6300000 0x0 0xc000>, - <0x5 0x6314000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dispext0_isoc: iommu@506180000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x5 0x6180000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dcpext1: iommu@3aa340000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xaa340000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dispext1: iommu@3aa300000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xaa300000 0x0 0xc000>, - <0x3 0xaa314000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dispext1_isoc: iommu@3aa180000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xaa180000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_scaler: iommu@305260000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x5260000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - /* A dedicated scaler-DART gate mapping is not published by this ADT. */ - status = "disabled"; - }; - - dt5_dart_jpeg: iommu@301020000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x1020000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_apr: iommu@3a1020000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xa1020000 0x0 0xc000>, - <0x3 0xa1034000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_scdc: iommu@3a1040000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xa1040000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_apcie0_piodma: dma-controller@488030000 { - compatible = "apple,t8142-pcie-piodma", "apple,pcie-piodma"; - reg = <0x4 0x88030000 0x0 0x4000>, - <0x4 0x88034000 0x0 0x4000>, - <0x4 0x88038000 0x0 0x4000>; - interrupts = ; - iommus = <&dart_apcie0 17>; - status = "disabled"; - }; - - dt5_apciec0_piodma: dma-controller@404068000 { - compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; - reg = <0x4 0x4068000 0x0 0x4000>, - <0x4 0x406c000 0x0 0x4000>, - <0x4 0x4070000 0x0 0x4000>, - <0x4 0x403c000 0x0 0x4000>; - interrupts = ; - iommus = <&dt5_dart_apciec0 254>; - status = "disabled"; - }; - - dt5_apciec1_piodma: dma-controller@40c068000 { - compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; - reg = <0x4 0xc068000 0x0 0x4000>, - <0x4 0xc06c000 0x0 0x4000>, - <0x4 0xc070000 0x0 0x4000>, - <0x4 0xc03c000 0x0 0x4000>; - interrupts = ; - iommus = <&dt5_dart_apciec1 254>; - status = "disabled"; - }; - - dt5_aic_timebase: aic-timebase@591180000 { - compatible = "apple,t8142-aic-timebase", "apple,aic-timebase"; - reg = <0x5 0x91180000 0x0 0x1000>; - status = "disabled"; - }; - - dt5_error_handler: error-handler@308d00000 { - compatible = "apple,t8142-error-handler", "apple,soc-error-handler"; - reg = <0x3 0x8d00000 0x0 0x40000>, - <0x3 0x8900000 0x0 0x8000>, - <0x3 0x80000000 0x0 0x3c000>, - <0x3 0x80728000 0x0 0x4000>, - <0x3 0x80768000 0x0 0x4000>, - <0x3 0x882c8000 0x0 0x4000>, - <0x3 0x82000000 0x0 0x1000000>, - <0x3 0x803d0000 0x0 0x4000>, - <0x2 0x20000000 0x0 0x140000>, - <0x2 0x21000000 0x0 0x3c000>, - <0x2 0x21200000 0x0 0x3c000>, - <0x2 0x21400000 0x0 0x3c000>, - <0x2 0x21600000 0x0 0x3c000>, - <0x2 0x21800000 0x0 0x3c000>, - <0x2 0x21a00000 0x0 0x3c000>, - <0x2 0x21c00000 0x0 0x3c000>, - <0x2 0x21e00000 0x0 0x3c000>, - <0x2 0x4f000000 0x0 0x8000>, - <0x2 0x50000000 0x0 0x8000>, - <0x2 0x51000000 0x0 0x8000>, - <0x2 0x52000000 0x0 0x8000>, - <0x2 0x53000000 0x0 0x8000>, - <0x2 0x54000000 0x0 0x8000>, - <0x2 0x55000000 0x0 0x8000>, - <0x2 0x56000000 0x0 0x8000>, - <0x2 0x5f000000 0x0 0x8000>, - <0x2 0x6f000000 0x0 0x8000>, - <0x2 0x57000000 0x0 0x1000000>, - <0x2 0x58000000 0x0 0x1000000>, - <0x2 0x59000000 0x0 0x1000000>, - <0x3 0x80770000 0x0 0x4000>, - <0x3 0x80771000 0x0 0x4000>, - <0x2 0x5b000000 0x0 0x24000>; - interrupts = , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - ; - status = "disabled"; - }; - - dt5_aop_exclave_mailbox: mailbox@5e067c000 { - compatible = "apple,t8142-secure-mailbox", "apple,secure-mailbox"; - reg = <0x5 0xe067c000 0x0 0x4000>; - interrupts = , - ; - iommus = <&aop_dart 1>; - status = "disabled"; - }; - - dt5_esm: esm@55a67c000 { - compatible = "apple,t8142-esm", "apple,esm"; - reg = <0x5 0x5a67c000 0x0 0x4000>; - interrupts = , - ; - iommus = <&dt5_dart_sep 2>; - status = "disabled"; - }; - - dt5_aon_ptd: aon-ptd@38c840000 { - compatible = "apple,t8142-aon-ptd", "apple,aon-ptd"; - reg = <0x3 0x8c840000 0x0 0x4000>, - <0x3 0x8c850000 0x0 0x4000>, - <0x3 0x8c858000 0x0 0x4000>, - <0x3 0x8c860000 0x0 0x4000>; - interrupts = , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - ; - interrupt-controller; - #interrupt-cells = <1>; - #address-cells = <0>; - status = "disabled"; - }; - - dt5_rsm: rsm@389825000 { - compatible = "apple,t8142-rsm", "apple,rsm"; - reg = <0x3 0x89825000 0x0 0x4000>, - <0x3 0x898c0000 0x0 0x4>; - interrupts = ; - iommus = <&dt5_dart_rsm 0>; - status = "disabled"; - }; - - dt5_hib_exclave_watchdog: secure-watchdog@5d82b0000 { - compatible = "apple,t8142-secure-watchdog", "apple,secure-watchdog"; - reg = <0x5 0xd82b0000 0x0 0x4000>; - status = "disabled"; - }; - - dt5_event_log_handler: event-log@380700000 { - compatible = "apple,t8142-event-log", "apple,soc-event-log"; - reg = <0x3 0x80700000 0x0 0xd0000>, - <0x3 0x88280000 0x0 0x80000>, - <0x3 0x80000000 0x0 0x3c000>, - <0x3 0x88200000 0x0 0x2c000>, - <0x3 0x8028c000 0x0 0x4000>, - <0x3 0x80280000 0x0 0x8000>, - <0x4 0x21878000 0x0 0x4000>, - <0x4 0x21868000 0x0 0x8000>, - <0x3 0x80340000 0x0 0xc000>, - <0x3 0x80350000 0x0 0xc000>, - <0x3 0x80208000 0x0 0x4000>, - <0x3 0x80208400 0x0 0x4000>, - <0x3 0x8020a400 0x0 0x4000>, - <0x3 0x8020a600 0x0 0x4000>, - <0x3 0x8020a700 0x0 0x4000>, - <0x3 0x8020a800 0x0 0x4000>, - <0x3 0x8020aa00 0x0 0x4000>, - <0x3 0x8020ab00 0x0 0x4000>, - <0x3 0x8020ac00 0x0 0x4000>, - <0x3 0x8020ae00 0x0 0x4000>, - <0x3 0x8020af00 0x0 0x4000>, - <0x3 0x8020b000 0x0 0x4000>, - <0x3 0x8020b200 0x0 0x4000>, - <0x3 0x8020b300 0x0 0x4000>, - <0x3 0x8020b400 0x0 0x4000>, - <0x3 0x8020b600 0x0 0x4000>, - <0x3 0x8020b700 0x0 0x4000>, - <0x3 0x8020b800 0x0 0x4000>, - <0x3 0x8020ba00 0x0 0x4000>, - <0x3 0x8020bb00 0x0 0x4000>, - <0x3 0x8020bc00 0x0 0x4000>, - <0x3 0x8020be00 0x0 0x4000>, - <0x3 0x8020bf00 0x0 0x4000>, - <0x3 0x8020c000 0x0 0x4000>, - <0x3 0x8020c200 0x0 0x4000>, - <0x3 0x8020c300 0x0 0x4000>, - <0x3 0x8020c400 0x0 0x4000>, - <0x3 0x8020c600 0x0 0x4000>, - <0x3 0x8020c700 0x0 0x4000>, - <0x3 0x8020c800 0x0 0x4000>, - <0x3 0x8020ca00 0x0 0x4000>, - <0x3 0x8020cb00 0x0 0x4000>, - <0x3 0x8020cc00 0x0 0x4000>, - <0x3 0x8020ce00 0x0 0x4000>, - <0x3 0x8020d000 0x0 0x4000>, - <0x3 0x8020d200 0x0 0x4000>, - <0x3 0x8020d400 0x0 0x4000>, - <0x3 0x8020d600 0x0 0x4000>, - <0x3 0x8020d800 0x0 0x4000>, - <0x3 0x8020da00 0x0 0x4000>, - <0x3 0x82700000 0x0 0x114000>; - interrupts = , - , - , - , - , - , - , - , - , - , - , - , - ; - /* Shared status windows do not grant AP ownership. */ - status = "disabled"; - }; -}; - -#include "t8142-scaler-v23.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8142-j815-inventory.dtsi b/arch/arm64/boot/dts/apple/t8142-j815-inventory.dtsi deleted file mode 100644 index 41138bd7bab06..0000000000000 --- a/arch/arm64/boot/dts/apple/t8142-j815-inventory.dtsi +++ /dev/null @@ -1,484 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only OR MIT -/* Hardware resources only. Ownership and driver enables require qualification. */ - -&{/soc} { - - dt5_dart_apcie0: iommu@488000000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x88000000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_apciec0: iommu@404000000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x4000000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_acio0: iommu@401a80000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x1a80000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_apciec1: iommu@40c000000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0xc000000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_acio1: iommu@409a80000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x9a80000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_aop: iommu@390fc0000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x90fc0000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_pmp: iommu@380300000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x80300000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_sep: iommu@308b80000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x8b80000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_sio: iommu@3a5060000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xa5060000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_rsm: iommu@3899a0000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x899a0000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_mtp: iommu@394800000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x94800000 0x0 0xc000>, - <0x3 0x94810000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_usb0: iommu@402f00000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x2f00000 0x0 0xc000>, - <0x4 0x2f80000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_usb1: iommu@40af00000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0xaf00000 0x0 0xc000>, - <0x4 0xaf80000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dcp: iommu@286340000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x2 0x86340000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_disp0: iommu@286300000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x2 0x86300000 0x0 0xc000>, - <0x2 0x86314000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_disp0_isoc: iommu@286180000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x2 0x86180000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dcpext0: iommu@506340000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x5 0x6340000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dispext0: iommu@506300000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x5 0x6300000 0x0 0xc000>, - <0x5 0x6314000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dispext0_isoc: iommu@506180000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x5 0x6180000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dcpext1: iommu@3aa340000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xaa340000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dispext1: iommu@3aa300000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xaa300000 0x0 0xc000>, - <0x3 0xaa314000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dispext1_isoc: iommu@3aa180000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xaa180000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_scaler: iommu@305260000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x5260000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - /* A dedicated scaler-DART gate mapping is not published by this ADT. */ - status = "disabled"; - }; - - dt5_dart_jpeg: iommu@301020000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x1020000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_avd: iommu@501020000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x5 0x1020000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_apr: iommu@3a1020000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xa1020000 0x0 0xc000>, - <0x3 0xa1034000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_scdc: iommu@3a1040000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xa1040000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_apcie0_piodma: dma-controller@488030000 { - compatible = "apple,t8142-pcie-piodma", "apple,pcie-piodma"; - reg = <0x4 0x88030000 0x0 0x4000>, - <0x4 0x88034000 0x0 0x4000>, - <0x4 0x88038000 0x0 0x4000>; - interrupts = ; - iommus = <&dt5_dart_apcie0 17>; - status = "disabled"; - }; - - dt5_apciec0_piodma: dma-controller@404068000 { - compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; - reg = <0x4 0x4068000 0x0 0x4000>, - <0x4 0x406c000 0x0 0x4000>, - <0x4 0x4070000 0x0 0x4000>, - <0x4 0x403c000 0x0 0x4000>; - interrupts = ; - iommus = <&dt5_dart_apciec0 254>; - status = "disabled"; - }; - - dt5_apciec1_piodma: dma-controller@40c068000 { - compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; - reg = <0x4 0xc068000 0x0 0x4000>, - <0x4 0xc06c000 0x0 0x4000>, - <0x4 0xc070000 0x0 0x4000>, - <0x4 0xc03c000 0x0 0x4000>; - interrupts = ; - iommus = <&dt5_dart_apciec1 254>; - status = "disabled"; - }; - - dt5_aic_timebase: aic-timebase@591180000 { - compatible = "apple,t8142-aic-timebase", "apple,aic-timebase"; - reg = <0x5 0x91180000 0x0 0x1000>; - status = "disabled"; - }; - - dt5_error_handler: error-handler@308d00000 { - compatible = "apple,t8142-error-handler", "apple,soc-error-handler"; - reg = <0x3 0x8d00000 0x0 0x40000>, - <0x3 0x8900000 0x0 0x8000>, - <0x3 0x80000000 0x0 0x3c000>, - <0x3 0x80728000 0x0 0x4000>, - <0x3 0x80768000 0x0 0x4000>, - <0x3 0x882c8000 0x0 0x4000>, - <0x3 0x82000000 0x0 0x1000000>, - <0x3 0x803d0000 0x0 0x4000>, - <0x2 0x20000000 0x0 0x140000>, - <0x2 0x21000000 0x0 0x3c000>, - <0x2 0x21200000 0x0 0x3c000>, - <0x2 0x21400000 0x0 0x3c000>, - <0x2 0x21600000 0x0 0x3c000>, - <0x2 0x21800000 0x0 0x3c000>, - <0x2 0x21a00000 0x0 0x3c000>, - <0x2 0x21c00000 0x0 0x3c000>, - <0x2 0x21e00000 0x0 0x3c000>, - <0x2 0x4f000000 0x0 0x8000>, - <0x2 0x50000000 0x0 0x8000>, - <0x2 0x51000000 0x0 0x8000>, - <0x2 0x52000000 0x0 0x8000>, - <0x2 0x53000000 0x0 0x8000>, - <0x2 0x54000000 0x0 0x8000>, - <0x2 0x55000000 0x0 0x8000>, - <0x2 0x56000000 0x0 0x8000>, - <0x2 0x5f000000 0x0 0x8000>, - <0x2 0x6f000000 0x0 0x8000>, - <0x2 0x57000000 0x0 0x1000000>, - <0x2 0x58000000 0x0 0x1000000>, - <0x2 0x59000000 0x0 0x1000000>, - <0x3 0x80770000 0x0 0x4000>, - <0x3 0x80771000 0x0 0x4000>, - <0x2 0x5b000000 0x0 0x24000>; - interrupts = , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - ; - status = "disabled"; - }; - - dt5_aop_exclave_mailbox: mailbox@5e067c000 { - compatible = "apple,t8142-secure-mailbox", "apple,secure-mailbox"; - reg = <0x5 0xe067c000 0x0 0x4000>; - interrupts = , - ; - iommus = <&dt5_dart_aop 1>; - status = "disabled"; - }; - - dt5_event_log_handler: event-log@380700000 { - compatible = "apple,t8142-event-log", "apple,soc-event-log"; - reg = <0x3 0x80700000 0x0 0xd0000>, - <0x3 0x88280000 0x0 0x80000>, - <0x3 0x80000000 0x0 0x3c000>, - <0x3 0x88200000 0x0 0x2c000>, - <0x3 0x8028c000 0x0 0x4000>, - <0x3 0x80280000 0x0 0x8000>, - <0x4 0x21878000 0x0 0x4000>, - <0x4 0x21868000 0x0 0x8000>, - <0x3 0x80340000 0x0 0xc000>, - <0x3 0x80350000 0x0 0xc000>, - <0x3 0x80208000 0x0 0x4000>, - <0x3 0x80208400 0x0 0x4000>, - <0x3 0x8020a400 0x0 0x4000>, - <0x3 0x8020a600 0x0 0x4000>, - <0x3 0x8020a700 0x0 0x4000>, - <0x3 0x8020a800 0x0 0x4000>, - <0x3 0x8020aa00 0x0 0x4000>, - <0x3 0x8020ab00 0x0 0x4000>, - <0x3 0x8020ac00 0x0 0x4000>, - <0x3 0x8020ae00 0x0 0x4000>, - <0x3 0x8020af00 0x0 0x4000>, - <0x3 0x8020b000 0x0 0x4000>, - <0x3 0x8020b200 0x0 0x4000>, - <0x3 0x8020b300 0x0 0x4000>, - <0x3 0x8020b400 0x0 0x4000>, - <0x3 0x8020b600 0x0 0x4000>, - <0x3 0x8020b700 0x0 0x4000>, - <0x3 0x8020b800 0x0 0x4000>, - <0x3 0x8020ba00 0x0 0x4000>, - <0x3 0x8020bb00 0x0 0x4000>, - <0x3 0x8020bc00 0x0 0x4000>, - <0x3 0x8020be00 0x0 0x4000>, - <0x3 0x8020bf00 0x0 0x4000>, - <0x3 0x8020c000 0x0 0x4000>, - <0x3 0x8020c200 0x0 0x4000>, - <0x3 0x8020c300 0x0 0x4000>, - <0x3 0x8020c400 0x0 0x4000>, - <0x3 0x8020c600 0x0 0x4000>, - <0x3 0x8020c700 0x0 0x4000>, - <0x3 0x8020c800 0x0 0x4000>, - <0x3 0x8020ca00 0x0 0x4000>, - <0x3 0x8020cb00 0x0 0x4000>, - <0x3 0x8020cc00 0x0 0x4000>, - <0x3 0x8020ce00 0x0 0x4000>, - <0x3 0x8020d000 0x0 0x4000>, - <0x3 0x8020d200 0x0 0x4000>, - <0x3 0x8020d400 0x0 0x4000>, - <0x3 0x8020d600 0x0 0x4000>, - <0x3 0x8020d800 0x0 0x4000>, - <0x3 0x8020da00 0x0 0x4000>, - <0x3 0x82700000 0x0 0x114000>; - interrupts = , - , - , - , - , - , - , - , - , - , - , - , - ; - status = "disabled"; - }; - - dt5_esm: esm@55a67c000 { - compatible = "apple,t8142-esm", "apple,esm"; - reg = <0x5 0x5a67c000 0x0 0x4000>; - interrupts = , - ; - iommus = <&dt5_dart_sep 2>; - status = "disabled"; - }; - - dt5_aon_ptd: aon-ptd@38c840000 { - compatible = "apple,t8142-aon-ptd", "apple,aon-ptd"; - reg = <0x3 0x8c840000 0x0 0x4000>, - <0x3 0x8c850000 0x0 0x4000>, - <0x3 0x8c858000 0x0 0x4000>, - <0x3 0x8c860000 0x0 0x4000>; - interrupts = , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - ; - interrupt-controller; - #interrupt-cells = <1>; - #address-cells = <0>; - status = "disabled"; - }; - - dt5_rsm: rsm@389825000 { - compatible = "apple,t8142-rsm", "apple,rsm"; - reg = <0x3 0x89825000 0x0 0x4000>, - <0x3 0x898c0000 0x0 0x4>; - interrupts = ; - iommus = <&dt5_dart_rsm 0>; - status = "disabled"; - }; - - dt5_hib_exclave_watchdog: secure-watchdog@5d82b0000 { - compatible = "apple,t8142-secure-watchdog", "apple,secure-watchdog"; - reg = <0x5 0xd82b0000 0x0 0x4000>; - status = "disabled"; - }; -}; - -#include "t8142-scaler-v23.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8142-scaler-v23.dtsi b/arch/arm64/boot/dts/apple/t8142-scaler-v23.dtsi deleted file mode 100644 index 8d140dc3112b9..0000000000000 --- a/arch/arm64/boot/dts/apple/t8142-scaler-v23.dtsi +++ /dev/null @@ -1,124 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only OR MIT -/* Firmware/descriptor scaler family. No direct-MMIO scaler driver fallback. */ - -&pmgr { - dt5_ps_msr: power-controller@2a8 { - compatible = "apple,t8142-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x2a8 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "msr"; - status = "disabled"; - }; - dt5_ps_msr_ase_core: power-controller@320 { - compatible = "apple,t8142-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x320 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "msr-ase-core"; - power-domains = <&dt5_ps_msr>; - status = "disabled"; - }; -}; - -&{/soc} { - dt5_peripheral_clocks: clock-controller@380700000 { - compatible = "apple,t8142-pmgr-clocks", "apple,pmgr-clocks"; - reg = <0x3 0x80700000 0x0 0xd0000>, - <0x3 0x88280000 0x0 0x80000>, - <0x3 0x80000000 0x0 0x3c000>, - <0x3 0x88200000 0x0 0x2c000>, - <0x3 0x88004000 0x0 0x1000>, - <0x2 0x10e20000 0x0 0x1268>, - <0x2 0x10f00000 0x0 0x40088>, - <0x2 0x10e40000 0x0 0xc020>, - <0x2 0x10e50000 0x0 0x9048>, - <0x2 0x10e70000 0x0 0xffe8>, - <0x2 0x10050000 0x0 0x9010>, - <0x2 0x10150000 0x0 0x9010>, - <0x2 0x10250000 0x0 0x9010>, - <0x2 0x10350000 0x0 0x9010>, - <0x2 0x10450000 0x0 0x9010>, - <0x2 0x10550000 0x0 0x9010>, - <0x2 0x11e20000 0x0 0x12e8>, - <0x2 0x11f00000 0x0 0x40088>, - <0x2 0x11e40000 0x0 0xc020>, - <0x2 0x11e50000 0x0 0x9048>, - <0x2 0x11e70000 0x0 0xffe8>, - <0x2 0x11050000 0x0 0x9018>, - <0x2 0x11150000 0x0 0x9018>, - <0x2 0x11250000 0x0 0x9018>, - <0x2 0x11350000 0x0 0x9018>, - <0x3 0x80280000 0x0 0x8000>, - <0x3 0x88700000 0x0 0x4000>, - <0x3 0x88100000 0x0 0xa8000>, - <0x4 0x2195c000 0x0 0x4000>, - <0x4 0x21960000 0x0 0x4000>, - <0x4 0x21974000 0x0 0x4000>, - <0x3 0x80208000 0x0 0x8000>, - <0x3 0x80700000 0x0 0x18000>, - <0x3 0x80728000 0x0 0x4000>, - <0x3 0x80724000 0x0 0x4000>, - <0x3 0x80764000 0x0 0x4000>, - <0x3 0x80780000 0x0 0x4000>, - <0x3 0x80760000 0x0 0x4000>, - <0x3 0x882b8000 0x0 0x10000>, - <0x3 0x882c8000 0x0 0x4000>, - <0x3 0x882d0000 0x0 0x8000>, - <0x3 0x803c0000 0x0 0x20000>, - <0x3 0x80730000 0x0 0x14000>, - <0x2 0x11000000 0x0 0xff4000>, - <0x4 0x21954000 0x0 0x4000>, - <0x3 0x80768000 0x0 0x4000>, - <0x3 0x8002c000 0x0 0x4000>, - <0x3 0x82000000 0x0 0x1000000>, - <0x5 0x80e80000 0x0 0x30000>, - <0x5 0x80ec0000 0x0 0x4000>, - <0x5 0x80ec0000 0x0 0x8000>, - <0x5 0x80e30000 0x0 0x4000>, - <0x5 0x80e30000 0x0 0x8000>, - <0x2 0x10000000 0x0 0xff4000>; - #clock-cells = <1>; - apple,pmgr = <&pmgr>; - status = "disabled"; - }; - - dt5_scaler0: scaler@305000000 { - compatible = "apple,t8142-scaler", "apple,scaler-v23"; - reg = <0x3 0x5000000 0x0 0x14000>, - <0x3 0x5210000 0x0 0x4000>, - <0x3 0x5204000 0x0 0x4000>, - <0x3 0x4000000 0x0 0x8000>, - <0x3 0x52c0000 0x0 0x40000>, - <0x3 0x5340000 0x0 0x14c000>, - <0x3 0x52a0000 0x0 0x4000>, - <0x3 0x5208000 0x0 0x4000>, - <0x3 0x5210000 0x0 0x4000>, - <0x3 0x5220000 0x0 0x4000>; - interrupts = , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - ; - iommus = <&dt5_dart_scaler 0>, <&dt5_dart_scaler 1>; - clocks = <&dt5_peripheral_clocks 399>; - power-domains = <&dt5_ps_msr>, <&dt5_ps_msr_ase_core>; - resets = <&dt5_ps_msr>; - status = "disabled"; - }; -}; From 234da6d0efc57040b1d900fda918fccf13db443d Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 05:38:14 +1100 Subject: [PATCH 10/12] arm64: dts: apple: share T8142 die resources with canonical labels Define disabled die resources once in the SoC includes. Board files select only chassis-specific port instances. Keep the standalone J813 boot profile and its qualified providers, with consistent label spelling. Use the established Apple DT SPDX expression and board identifiers for unverified product names. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../devicetree/bindings/arm/apple.yaml | 8 +- arch/arm64/boot/dts/apple/t8142-j704.dts | 542 +----------------- arch/arm64/boot/dts/apple/t8142-j813-n1.dtsi | 8 +- arch/arm64/boot/dts/apple/t8142-j813.dts | 415 +------------- arch/arm64/boot/dts/apple/t8142-j815.dts | 494 +--------------- .../boot/dts/apple/t8142-peripherals.dtsi | 481 +++++++++++++++- arch/arm64/boot/dts/apple/t8142.dtsi | 83 ++- 7 files changed, 589 insertions(+), 1442 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/apple.yaml b/Documentation/devicetree/bindings/arm/apple.yaml index 9895cf5a44824..4ee0858dc8f3e 100644 --- a/Documentation/devicetree/bindings/arm/apple.yaml +++ b/Documentation/devicetree/bindings/arm/apple.yaml @@ -366,17 +366,17 @@ properties: - description: Apple M5 SoC based platforms items: - enum: - - apple,j704 # MacBook Pro (14-inch, M5) + - apple,j704 # MacBook Pro (J704) - apple,j813 # MacBook Air (13-inch, M5, 2026) - - apple,j815 # MacBook Air (15-inch, M5) + - apple,j815 # MacBook Air (J815) - const: apple,t8142 - const: apple,arm-platform - description: Apple M6 SoC based platforms items: - enum: - - apple,j804 # MacBook Pro (14-inch, M6) - - apple,j833ct # iMac (M6) + - apple,j804 # MacBook Pro (J804) + - apple,j833ct # iMac (J833ct) - apple,j873g # Mac mini (M6) - const: apple,t8152 - const: apple,arm-platform diff --git a/arch/arm64/boot/dts/apple/t8142-j704.dts b/arch/arm64/boot/dts/apple/t8142-j704.dts index 1e4ad021f0dd4..d3a9329dc59ec 100644 --- a/arch/arm64/boot/dts/apple/t8142-j704.dts +++ b/arch/arm64/boot/dts/apple/t8142-j704.dts @@ -1,548 +1,10 @@ -// SPDX-License-Identifier: GPL-2.0-only OR MIT +// SPDX-License-Identifier: GPL-2.0+ OR MIT /dts-v1/; #include "t8142.dtsi" / { - model = "Apple MacBook Pro (14-inch, M5)"; + model = "Apple MacBook Pro (J704)"; compatible = "apple,j704", "apple,t8142", "apple,arm-platform"; chassis-type = "laptop"; }; - -/* Hardware resources only. Ownership and driver enables require qualification. */ - -&{/soc} { - - dt5_dart_apcie2: iommu@48a000000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x8a000000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_apcie0: iommu@488000000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x88000000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_apciec0: iommu@404000000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x4000000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_acio0: iommu@401a80000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x1a80000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_apciec1: iommu@40c000000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0xc000000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_acio1: iommu@409a80000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x9a80000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_apciec3: iommu@41c000000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x1c000000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_acio3: iommu@419a80000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x19a80000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_aop: iommu@390fc0000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x90fc0000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_pmp: iommu@380300000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x80300000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_sep: iommu@308b80000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x8b80000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_sio: iommu@3a5060000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xa5060000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_rsm: iommu@3899a0000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x899a0000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_mtp: iommu@394800000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x94800000 0x0 0xc000>, - <0x3 0x94810000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_usb0: iommu@402f00000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x2f00000 0x0 0xc000>, - <0x4 0x2f80000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_usb1: iommu@40af00000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0xaf00000 0x0 0xc000>, - <0x4 0xaf80000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_usb3: iommu@41af00000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x1af00000 0x0 0xc000>, - <0x4 0x1af80000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dcp: iommu@286340000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x2 0x86340000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_disp0: iommu@286300000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x2 0x86300000 0x0 0xc000>, - <0x2 0x86314000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_disp0_isoc: iommu@286180000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x2 0x86180000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dcpext0: iommu@506340000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x5 0x6340000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dispext0: iommu@506300000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x5 0x6300000 0x0 0xc000>, - <0x5 0x6314000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dispext0_isoc: iommu@506180000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x5 0x6180000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dcpext1: iommu@3aa340000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xaa340000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dispext1: iommu@3aa300000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xaa300000 0x0 0xc000>, - <0x3 0xaa314000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dispext1_isoc: iommu@3aa180000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xaa180000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_scaler: iommu@305260000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x5260000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - /* A dedicated scaler-DART gate mapping is not published by this ADT. */ - status = "disabled"; - }; - - dt5_dart_jpeg: iommu@301020000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x1020000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_avd: iommu@501020000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x5 0x1020000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_apr: iommu@3a1020000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xa1020000 0x0 0xc000>, - <0x3 0xa1034000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_scdc: iommu@3a1040000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xa1040000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_apcie2_piodma: dma-controller@48a030000 { - compatible = "apple,t8142-pcie-piodma", "apple,pcie-piodma"; - reg = <0x4 0x8a030000 0x0 0x4000>, - <0x4 0x8a034000 0x0 0x4000>, - <0x4 0x8a038000 0x0 0x4000>; - interrupts = ; - iommus = <&dt5_dart_apcie2 17>; - status = "disabled"; - }; - - dt5_apcie0_piodma: dma-controller@488030000 { - compatible = "apple,t8142-pcie-piodma", "apple,pcie-piodma"; - reg = <0x4 0x88030000 0x0 0x4000>, - <0x4 0x88034000 0x0 0x4000>, - <0x4 0x88038000 0x0 0x4000>; - interrupts = ; - iommus = <&dt5_dart_apcie0 17>; - status = "disabled"; - }; - - dt5_apciec0_piodma: dma-controller@404068000 { - compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; - reg = <0x4 0x4068000 0x0 0x4000>, - <0x4 0x406c000 0x0 0x4000>, - <0x4 0x4070000 0x0 0x4000>, - <0x4 0x403c000 0x0 0x4000>; - interrupts = ; - iommus = <&dt5_dart_apciec0 254>; - status = "disabled"; - }; - - dt5_apciec1_piodma: dma-controller@40c068000 { - compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; - reg = <0x4 0xc068000 0x0 0x4000>, - <0x4 0xc06c000 0x0 0x4000>, - <0x4 0xc070000 0x0 0x4000>, - <0x4 0xc03c000 0x0 0x4000>; - interrupts = ; - iommus = <&dt5_dart_apciec1 254>; - status = "disabled"; - }; - - dt5_apciec3_piodma: dma-controller@41c068000 { - compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; - reg = <0x4 0x1c068000 0x0 0x4000>, - <0x4 0x1c06c000 0x0 0x4000>, - <0x4 0x1c070000 0x0 0x4000>, - <0x4 0x1c03c000 0x0 0x4000>; - interrupts = ; - iommus = <&dt5_dart_apciec3 254>; - status = "disabled"; - }; - - dt5_aic_timebase: aic-timebase@591180000 { - compatible = "apple,t8142-aic-timebase", "apple,aic-timebase"; - reg = <0x5 0x91180000 0x0 0x1000>; - status = "disabled"; - }; - - dt5_error_handler: error-handler@308d00000 { - compatible = "apple,t8142-error-handler", "apple,soc-error-handler"; - reg = <0x3 0x8d00000 0x0 0x40000>, - <0x3 0x8900000 0x0 0x8000>, - <0x3 0x80000000 0x0 0x3c000>, - <0x3 0x80728000 0x0 0x4000>, - <0x3 0x80768000 0x0 0x4000>, - <0x3 0x882c8000 0x0 0x4000>, - <0x3 0x82000000 0x0 0x1000000>, - <0x3 0x803d0000 0x0 0x4000>, - <0x2 0x20000000 0x0 0x140000>, - <0x2 0x21000000 0x0 0x3c000>, - <0x2 0x21200000 0x0 0x3c000>, - <0x2 0x21400000 0x0 0x3c000>, - <0x2 0x21600000 0x0 0x3c000>, - <0x2 0x21800000 0x0 0x3c000>, - <0x2 0x21a00000 0x0 0x3c000>, - <0x2 0x21c00000 0x0 0x3c000>, - <0x2 0x21e00000 0x0 0x3c000>, - <0x2 0x4f000000 0x0 0x8000>, - <0x2 0x50000000 0x0 0x8000>, - <0x2 0x51000000 0x0 0x8000>, - <0x2 0x52000000 0x0 0x8000>, - <0x2 0x53000000 0x0 0x8000>, - <0x2 0x54000000 0x0 0x8000>, - <0x2 0x55000000 0x0 0x8000>, - <0x2 0x56000000 0x0 0x8000>, - <0x2 0x5f000000 0x0 0x8000>, - <0x2 0x6f000000 0x0 0x8000>, - <0x2 0x57000000 0x0 0x1000000>, - <0x2 0x58000000 0x0 0x1000000>, - <0x2 0x59000000 0x0 0x1000000>, - <0x3 0x80770000 0x0 0x4000>, - <0x3 0x80771000 0x0 0x4000>, - <0x2 0x5b000000 0x0 0x24000>; - interrupts = , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - ; - status = "disabled"; - }; - - dt5_aop_exclave_mailbox: mailbox@5e067c000 { - compatible = "apple,t8142-secure-mailbox", "apple,secure-mailbox"; - reg = <0x5 0xe067c000 0x0 0x4000>; - interrupts = , - ; - iommus = <&dt5_dart_aop 1>; - status = "disabled"; - }; - - dt5_event_log_handler: event-log@380700000 { - compatible = "apple,t8142-event-log", "apple,soc-event-log"; - reg = <0x3 0x80700000 0x0 0xd0000>, - <0x3 0x88280000 0x0 0x80000>, - <0x3 0x80000000 0x0 0x3c000>, - <0x3 0x88200000 0x0 0x2c000>, - <0x3 0x8028c000 0x0 0x4000>, - <0x3 0x80280000 0x0 0x8000>, - <0x4 0x21878000 0x0 0x4000>, - <0x4 0x21868000 0x0 0x8000>, - <0x3 0x80340000 0x0 0xc000>, - <0x3 0x80350000 0x0 0xc000>, - <0x3 0x80208000 0x0 0x4000>, - <0x3 0x80208400 0x0 0x4000>, - <0x3 0x8020a400 0x0 0x4000>, - <0x3 0x8020a600 0x0 0x4000>, - <0x3 0x8020a700 0x0 0x4000>, - <0x3 0x8020a800 0x0 0x4000>, - <0x3 0x8020aa00 0x0 0x4000>, - <0x3 0x8020ab00 0x0 0x4000>, - <0x3 0x8020ac00 0x0 0x4000>, - <0x3 0x8020ae00 0x0 0x4000>, - <0x3 0x8020af00 0x0 0x4000>, - <0x3 0x8020b000 0x0 0x4000>, - <0x3 0x8020b200 0x0 0x4000>, - <0x3 0x8020b300 0x0 0x4000>, - <0x3 0x8020b400 0x0 0x4000>, - <0x3 0x8020b600 0x0 0x4000>, - <0x3 0x8020b700 0x0 0x4000>, - <0x3 0x8020b800 0x0 0x4000>, - <0x3 0x8020ba00 0x0 0x4000>, - <0x3 0x8020bb00 0x0 0x4000>, - <0x3 0x8020bc00 0x0 0x4000>, - <0x3 0x8020be00 0x0 0x4000>, - <0x3 0x8020bf00 0x0 0x4000>, - <0x3 0x8020c000 0x0 0x4000>, - <0x3 0x8020c200 0x0 0x4000>, - <0x3 0x8020c300 0x0 0x4000>, - <0x3 0x8020c400 0x0 0x4000>, - <0x3 0x8020c600 0x0 0x4000>, - <0x3 0x8020c700 0x0 0x4000>, - <0x3 0x8020c800 0x0 0x4000>, - <0x3 0x8020ca00 0x0 0x4000>, - <0x3 0x8020cb00 0x0 0x4000>, - <0x3 0x8020cc00 0x0 0x4000>, - <0x3 0x8020ce00 0x0 0x4000>, - <0x3 0x8020d000 0x0 0x4000>, - <0x3 0x8020d200 0x0 0x4000>, - <0x3 0x8020d400 0x0 0x4000>, - <0x3 0x8020d600 0x0 0x4000>, - <0x3 0x8020d800 0x0 0x4000>, - <0x3 0x8020da00 0x0 0x4000>, - <0x3 0x82700000 0x0 0x114000>; - interrupts = , - , - , - , - , - , - , - , - , - , - , - , - ; - status = "disabled"; - }; - - dt5_esm: esm@55a67c000 { - compatible = "apple,t8142-esm", "apple,esm"; - reg = <0x5 0x5a67c000 0x0 0x4000>; - interrupts = , - ; - iommus = <&dt5_dart_sep 2>; - status = "disabled"; - }; - - dt5_aon_ptd: aon-ptd@38c840000 { - compatible = "apple,t8142-aon-ptd", "apple,aon-ptd"; - reg = <0x3 0x8c840000 0x0 0x4000>, - <0x3 0x8c850000 0x0 0x4000>, - <0x3 0x8c858000 0x0 0x4000>, - <0x3 0x8c860000 0x0 0x4000>; - interrupts = , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - ; - interrupt-controller; - #interrupt-cells = <1>; - #address-cells = <0>; - status = "disabled"; - }; - - dt5_rsm: rsm@389825000 { - compatible = "apple,t8142-rsm", "apple,rsm"; - reg = <0x3 0x89825000 0x0 0x4000>, - <0x3 0x898c0000 0x0 0x4>; - interrupts = ; - iommus = <&dt5_dart_rsm 0>; - status = "disabled"; - }; - - dt5_hib_exclave_watchdog: secure-watchdog@5d82b0000 { - compatible = "apple,t8142-secure-watchdog", "apple,secure-watchdog"; - reg = <0x5 0xd82b0000 0x0 0x4000>; - status = "disabled"; - }; -}; - -#include "t8142-peripherals.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8142-j813-n1.dtsi b/arch/arm64/boot/dts/apple/t8142-j813-n1.dtsi index 43a87da373a91..052491f27233b 100644 --- a/arch/arm64/boot/dts/apple/t8142-j813-n1.dtsi +++ b/arch/arm64/boot/dts/apple/t8142-j813-n1.dtsi @@ -18,9 +18,9 @@ dma-coherent; msi-parent = <&pcie0_msi>; /* N1's three ADT mapper nodes use stream zero. */ - iommu-map = <0x100 &dart_apcie0 0 1>, - <0x101 &dart_apcie0 0 1>, - <0x102 &dart_apcie0 0 1>; + iommu-map = <0x100 &pcie0_dart 0 1>, + <0x101 &pcie0_dart 0 1>, + <0x102 &pcie0_dart 0 1>; }; }; @@ -37,7 +37,7 @@ msi-ranges = <&aic AIC_IRQ 1741 IRQ_TYPE_EDGE_RISING 32>; }; - dart_apcie0: iommu@488000000 { + pcie0_dart: iommu@488000000 { compatible = "apple,t8142-dart", "apple,t8110-dart"; reg = <4 0x88000000 0 0x20000>; interrupt-parent = <&aic>; diff --git a/arch/arm64/boot/dts/apple/t8142-j813.dts b/arch/arm64/boot/dts/apple/t8142-j813.dts index 888711239a238..f75c37bd4f822 100644 --- a/arch/arm64/boot/dts/apple/t8142-j813.dts +++ b/arch/arm64/boot/dts/apple/t8142-j813.dts @@ -405,411 +405,22 @@ #include "t8142-j813-power.dtsi" #include "t8142-j813-audio.dtsi" -/* Hardware resources only. Ownership and driver enables require qualification. */ - -&{/soc} { - - dt5_dart_apciec0: iommu@404000000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x4000000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_acio0: iommu@401a80000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x1a80000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_apciec1: iommu@40c000000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0xc000000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_acio1: iommu@409a80000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x9a80000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_sep: iommu@308b80000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x8b80000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_sio: iommu@3a5060000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xa5060000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_rsm: iommu@3899a0000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x899a0000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_disp0_isoc: iommu@286180000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x2 0x86180000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dcpext0: iommu@506340000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x5 0x6340000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dispext0: iommu@506300000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x5 0x6300000 0x0 0xc000>, - <0x5 0x6314000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dispext0_isoc: iommu@506180000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x5 0x6180000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dcpext1: iommu@3aa340000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xaa340000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dispext1: iommu@3aa300000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xaa300000 0x0 0xc000>, - <0x3 0xaa314000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dispext1_isoc: iommu@3aa180000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xaa180000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_scaler: iommu@305260000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x5260000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - /* A dedicated scaler-DART gate mapping is not published by this ADT. */ - status = "disabled"; - }; - - dt5_dart_jpeg: iommu@301020000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x1020000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_apr: iommu@3a1020000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xa1020000 0x0 0xc000>, - <0x3 0xa1034000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_scdc: iommu@3a1040000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xa1040000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_apcie0_piodma: dma-controller@488030000 { - compatible = "apple,t8142-pcie-piodma", "apple,pcie-piodma"; - reg = <0x4 0x88030000 0x0 0x4000>, - <0x4 0x88034000 0x0 0x4000>, - <0x4 0x88038000 0x0 0x4000>; - interrupts = ; - iommus = <&dart_apcie0 17>; - status = "disabled"; - }; - - dt5_apciec0_piodma: dma-controller@404068000 { - compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; - reg = <0x4 0x4068000 0x0 0x4000>, - <0x4 0x406c000 0x0 0x4000>, - <0x4 0x4070000 0x0 0x4000>, - <0x4 0x403c000 0x0 0x4000>; - interrupts = ; - iommus = <&dt5_dart_apciec0 254>; - status = "disabled"; - }; - - dt5_apciec1_piodma: dma-controller@40c068000 { - compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; - reg = <0x4 0xc068000 0x0 0x4000>, - <0x4 0xc06c000 0x0 0x4000>, - <0x4 0xc070000 0x0 0x4000>, - <0x4 0xc03c000 0x0 0x4000>; - interrupts = ; - iommus = <&dt5_dart_apciec1 254>; - status = "disabled"; - }; - - dt5_aic_timebase: aic-timebase@591180000 { - compatible = "apple,t8142-aic-timebase", "apple,aic-timebase"; - reg = <0x5 0x91180000 0x0 0x1000>; - status = "disabled"; - }; - - dt5_error_handler: error-handler@308d00000 { - compatible = "apple,t8142-error-handler", "apple,soc-error-handler"; - reg = <0x3 0x8d00000 0x0 0x40000>, - <0x3 0x8900000 0x0 0x8000>, - <0x3 0x80000000 0x0 0x3c000>, - <0x3 0x80728000 0x0 0x4000>, - <0x3 0x80768000 0x0 0x4000>, - <0x3 0x882c8000 0x0 0x4000>, - <0x3 0x82000000 0x0 0x1000000>, - <0x3 0x803d0000 0x0 0x4000>, - <0x2 0x20000000 0x0 0x140000>, - <0x2 0x21000000 0x0 0x3c000>, - <0x2 0x21200000 0x0 0x3c000>, - <0x2 0x21400000 0x0 0x3c000>, - <0x2 0x21600000 0x0 0x3c000>, - <0x2 0x21800000 0x0 0x3c000>, - <0x2 0x21a00000 0x0 0x3c000>, - <0x2 0x21c00000 0x0 0x3c000>, - <0x2 0x21e00000 0x0 0x3c000>, - <0x2 0x4f000000 0x0 0x8000>, - <0x2 0x50000000 0x0 0x8000>, - <0x2 0x51000000 0x0 0x8000>, - <0x2 0x52000000 0x0 0x8000>, - <0x2 0x53000000 0x0 0x8000>, - <0x2 0x54000000 0x0 0x8000>, - <0x2 0x55000000 0x0 0x8000>, - <0x2 0x56000000 0x0 0x8000>, - <0x2 0x5f000000 0x0 0x8000>, - <0x2 0x6f000000 0x0 0x8000>, - <0x2 0x57000000 0x0 0x1000000>, - <0x2 0x58000000 0x0 0x1000000>, - <0x2 0x59000000 0x0 0x1000000>, - <0x3 0x80770000 0x0 0x4000>, - <0x3 0x80771000 0x0 0x4000>, - <0x2 0x5b000000 0x0 0x24000>; - interrupts = , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - ; - status = "disabled"; - }; - - dt5_aop_exclave_mailbox: mailbox@5e067c000 { - compatible = "apple,t8142-secure-mailbox", "apple,secure-mailbox"; - reg = <0x5 0xe067c000 0x0 0x4000>; - interrupts = , - ; - iommus = <&aop_dart 1>; - status = "disabled"; - }; +#include "t8142-peripherals.dtsi" - dt5_esm: esm@55a67c000 { - compatible = "apple,t8142-esm", "apple,esm"; - reg = <0x5 0x5a67c000 0x0 0x4000>; - interrupts = , - ; - iommus = <&dt5_dart_sep 2>; - status = "disabled"; - }; +/* This chassis does not expose this peripheral instance. */ +/delete-node/ &pcie2_dart; - dt5_aon_ptd: aon-ptd@38c840000 { - compatible = "apple,t8142-aon-ptd", "apple,aon-ptd"; - reg = <0x3 0x8c840000 0x0 0x4000>, - <0x3 0x8c850000 0x0 0x4000>, - <0x3 0x8c858000 0x0 0x4000>, - <0x3 0x8c860000 0x0 0x4000>; - interrupts = , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - ; - interrupt-controller; - #interrupt-cells = <1>; - #address-cells = <0>; - status = "disabled"; - }; +/* This chassis does not expose this peripheral instance. */ +/delete-node/ &pciec3_dart; - dt5_rsm: rsm@389825000 { - compatible = "apple,t8142-rsm", "apple,rsm"; - reg = <0x3 0x89825000 0x0 0x4000>, - <0x3 0x898c0000 0x0 0x4>; - interrupts = ; - iommus = <&dt5_dart_rsm 0>; - status = "disabled"; - }; +/* This chassis does not expose this peripheral instance. */ +/delete-node/ &acio3_dart; - dt5_hib_exclave_watchdog: secure-watchdog@5d82b0000 { - compatible = "apple,t8142-secure-watchdog", "apple,secure-watchdog"; - reg = <0x5 0xd82b0000 0x0 0x4000>; - status = "disabled"; - }; +/* This chassis does not expose this peripheral instance. */ +/delete-node/ &dwc3_3_dart; - dt5_event_log_handler: event-log@380700000 { - compatible = "apple,t8142-event-log", "apple,soc-event-log"; - reg = <0x3 0x80700000 0x0 0xd0000>, - <0x3 0x88280000 0x0 0x80000>, - <0x3 0x80000000 0x0 0x3c000>, - <0x3 0x88200000 0x0 0x2c000>, - <0x3 0x8028c000 0x0 0x4000>, - <0x3 0x80280000 0x0 0x8000>, - <0x4 0x21878000 0x0 0x4000>, - <0x4 0x21868000 0x0 0x8000>, - <0x3 0x80340000 0x0 0xc000>, - <0x3 0x80350000 0x0 0xc000>, - <0x3 0x80208000 0x0 0x4000>, - <0x3 0x80208400 0x0 0x4000>, - <0x3 0x8020a400 0x0 0x4000>, - <0x3 0x8020a600 0x0 0x4000>, - <0x3 0x8020a700 0x0 0x4000>, - <0x3 0x8020a800 0x0 0x4000>, - <0x3 0x8020aa00 0x0 0x4000>, - <0x3 0x8020ab00 0x0 0x4000>, - <0x3 0x8020ac00 0x0 0x4000>, - <0x3 0x8020ae00 0x0 0x4000>, - <0x3 0x8020af00 0x0 0x4000>, - <0x3 0x8020b000 0x0 0x4000>, - <0x3 0x8020b200 0x0 0x4000>, - <0x3 0x8020b300 0x0 0x4000>, - <0x3 0x8020b400 0x0 0x4000>, - <0x3 0x8020b600 0x0 0x4000>, - <0x3 0x8020b700 0x0 0x4000>, - <0x3 0x8020b800 0x0 0x4000>, - <0x3 0x8020ba00 0x0 0x4000>, - <0x3 0x8020bb00 0x0 0x4000>, - <0x3 0x8020bc00 0x0 0x4000>, - <0x3 0x8020be00 0x0 0x4000>, - <0x3 0x8020bf00 0x0 0x4000>, - <0x3 0x8020c000 0x0 0x4000>, - <0x3 0x8020c200 0x0 0x4000>, - <0x3 0x8020c300 0x0 0x4000>, - <0x3 0x8020c400 0x0 0x4000>, - <0x3 0x8020c600 0x0 0x4000>, - <0x3 0x8020c700 0x0 0x4000>, - <0x3 0x8020c800 0x0 0x4000>, - <0x3 0x8020ca00 0x0 0x4000>, - <0x3 0x8020cb00 0x0 0x4000>, - <0x3 0x8020cc00 0x0 0x4000>, - <0x3 0x8020ce00 0x0 0x4000>, - <0x3 0x8020d000 0x0 0x4000>, - <0x3 0x8020d200 0x0 0x4000>, - <0x3 0x8020d400 0x0 0x4000>, - <0x3 0x8020d600 0x0 0x4000>, - <0x3 0x8020d800 0x0 0x4000>, - <0x3 0x8020da00 0x0 0x4000>, - <0x3 0x82700000 0x0 0x114000>; - interrupts = , - , - , - , - , - , - , - , - , - , - , - , - ; - /* Shared status windows do not grant AP ownership. */ - status = "disabled"; - }; -}; +/* This chassis does not expose this peripheral instance. */ +/delete-node/ &apcie2_piodma; -#include "t8142-peripherals.dtsi" +/* This chassis does not expose this peripheral instance. */ +/delete-node/ &apciec3_piodma; diff --git a/arch/arm64/boot/dts/apple/t8142-j815.dts b/arch/arm64/boot/dts/apple/t8142-j815.dts index 94a8b0ee575ba..7ebc7b95de22d 100644 --- a/arch/arm64/boot/dts/apple/t8142-j815.dts +++ b/arch/arm64/boot/dts/apple/t8142-j815.dts @@ -1,494 +1,28 @@ -// SPDX-License-Identifier: GPL-2.0-only OR MIT +// SPDX-License-Identifier: GPL-2.0+ OR MIT /dts-v1/; #include "t8142.dtsi" / { - model = "Apple MacBook Air (15-inch, M5)"; + model = "Apple MacBook Air (J815)"; compatible = "apple,j815", "apple,t8142", "apple,arm-platform"; chassis-type = "laptop"; }; -/* Hardware resources only. Ownership and driver enables require qualification. */ +/* This chassis does not expose this peripheral instance. */ +/delete-node/ &pcie2_dart; -&{/soc} { +/* This chassis does not expose this peripheral instance. */ +/delete-node/ &pciec3_dart; - dt5_dart_apcie0: iommu@488000000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x88000000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; +/* This chassis does not expose this peripheral instance. */ +/delete-node/ &acio3_dart; - dt5_dart_apciec0: iommu@404000000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x4000000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; +/* This chassis does not expose this peripheral instance. */ +/delete-node/ &dwc3_3_dart; - dt5_dart_acio0: iommu@401a80000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x1a80000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; +/* This chassis does not expose this peripheral instance. */ +/delete-node/ &apcie2_piodma; - dt5_dart_apciec1: iommu@40c000000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0xc000000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_acio1: iommu@409a80000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x9a80000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_aop: iommu@390fc0000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x90fc0000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_pmp: iommu@380300000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x80300000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_sep: iommu@308b80000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x8b80000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_sio: iommu@3a5060000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xa5060000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_rsm: iommu@3899a0000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x899a0000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_mtp: iommu@394800000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x94800000 0x0 0xc000>, - <0x3 0x94810000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_usb0: iommu@402f00000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0x2f00000 0x0 0xc000>, - <0x4 0x2f80000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_usb1: iommu@40af00000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x4 0xaf00000 0x0 0xc000>, - <0x4 0xaf80000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dcp: iommu@286340000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x2 0x86340000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_disp0: iommu@286300000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x2 0x86300000 0x0 0xc000>, - <0x2 0x86314000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_disp0_isoc: iommu@286180000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x2 0x86180000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dcpext0: iommu@506340000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x5 0x6340000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dispext0: iommu@506300000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x5 0x6300000 0x0 0xc000>, - <0x5 0x6314000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dispext0_isoc: iommu@506180000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x5 0x6180000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dcpext1: iommu@3aa340000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xaa340000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dispext1: iommu@3aa300000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xaa300000 0x0 0xc000>, - <0x3 0xaa314000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_dispext1_isoc: iommu@3aa180000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xaa180000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_scaler: iommu@305260000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x5260000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - /* A dedicated scaler-DART gate mapping is not published by this ADT. */ - status = "disabled"; - }; - - dt5_dart_jpeg: iommu@301020000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0x1020000 0x0 0xc000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_avd: iommu@501020000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x5 0x1020000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_apr: iommu@3a1020000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xa1020000 0x0 0xc000>, - <0x3 0xa1034000 0x0 0x4000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_dart_scdc: iommu@3a1040000 { - compatible = "apple,t8142-dart", "apple,t8110-dart"; - reg = <0x3 0xa1040000 0x0 0x20000>; - interrupts = ; - #iommu-cells = <1>; - status = "disabled"; - }; - - dt5_apcie0_piodma: dma-controller@488030000 { - compatible = "apple,t8142-pcie-piodma", "apple,pcie-piodma"; - reg = <0x4 0x88030000 0x0 0x4000>, - <0x4 0x88034000 0x0 0x4000>, - <0x4 0x88038000 0x0 0x4000>; - interrupts = ; - iommus = <&dt5_dart_apcie0 17>; - status = "disabled"; - }; - - dt5_apciec0_piodma: dma-controller@404068000 { - compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; - reg = <0x4 0x4068000 0x0 0x4000>, - <0x4 0x406c000 0x0 0x4000>, - <0x4 0x4070000 0x0 0x4000>, - <0x4 0x403c000 0x0 0x4000>; - interrupts = ; - iommus = <&dt5_dart_apciec0 254>; - status = "disabled"; - }; - - dt5_apciec1_piodma: dma-controller@40c068000 { - compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; - reg = <0x4 0xc068000 0x0 0x4000>, - <0x4 0xc06c000 0x0 0x4000>, - <0x4 0xc070000 0x0 0x4000>, - <0x4 0xc03c000 0x0 0x4000>; - interrupts = ; - iommus = <&dt5_dart_apciec1 254>; - status = "disabled"; - }; - - dt5_aic_timebase: aic-timebase@591180000 { - compatible = "apple,t8142-aic-timebase", "apple,aic-timebase"; - reg = <0x5 0x91180000 0x0 0x1000>; - status = "disabled"; - }; - - dt5_error_handler: error-handler@308d00000 { - compatible = "apple,t8142-error-handler", "apple,soc-error-handler"; - reg = <0x3 0x8d00000 0x0 0x40000>, - <0x3 0x8900000 0x0 0x8000>, - <0x3 0x80000000 0x0 0x3c000>, - <0x3 0x80728000 0x0 0x4000>, - <0x3 0x80768000 0x0 0x4000>, - <0x3 0x882c8000 0x0 0x4000>, - <0x3 0x82000000 0x0 0x1000000>, - <0x3 0x803d0000 0x0 0x4000>, - <0x2 0x20000000 0x0 0x140000>, - <0x2 0x21000000 0x0 0x3c000>, - <0x2 0x21200000 0x0 0x3c000>, - <0x2 0x21400000 0x0 0x3c000>, - <0x2 0x21600000 0x0 0x3c000>, - <0x2 0x21800000 0x0 0x3c000>, - <0x2 0x21a00000 0x0 0x3c000>, - <0x2 0x21c00000 0x0 0x3c000>, - <0x2 0x21e00000 0x0 0x3c000>, - <0x2 0x4f000000 0x0 0x8000>, - <0x2 0x50000000 0x0 0x8000>, - <0x2 0x51000000 0x0 0x8000>, - <0x2 0x52000000 0x0 0x8000>, - <0x2 0x53000000 0x0 0x8000>, - <0x2 0x54000000 0x0 0x8000>, - <0x2 0x55000000 0x0 0x8000>, - <0x2 0x56000000 0x0 0x8000>, - <0x2 0x5f000000 0x0 0x8000>, - <0x2 0x6f000000 0x0 0x8000>, - <0x2 0x57000000 0x0 0x1000000>, - <0x2 0x58000000 0x0 0x1000000>, - <0x2 0x59000000 0x0 0x1000000>, - <0x3 0x80770000 0x0 0x4000>, - <0x3 0x80771000 0x0 0x4000>, - <0x2 0x5b000000 0x0 0x24000>; - interrupts = , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - ; - status = "disabled"; - }; - - dt5_aop_exclave_mailbox: mailbox@5e067c000 { - compatible = "apple,t8142-secure-mailbox", "apple,secure-mailbox"; - reg = <0x5 0xe067c000 0x0 0x4000>; - interrupts = , - ; - iommus = <&dt5_dart_aop 1>; - status = "disabled"; - }; - - dt5_event_log_handler: event-log@380700000 { - compatible = "apple,t8142-event-log", "apple,soc-event-log"; - reg = <0x3 0x80700000 0x0 0xd0000>, - <0x3 0x88280000 0x0 0x80000>, - <0x3 0x80000000 0x0 0x3c000>, - <0x3 0x88200000 0x0 0x2c000>, - <0x3 0x8028c000 0x0 0x4000>, - <0x3 0x80280000 0x0 0x8000>, - <0x4 0x21878000 0x0 0x4000>, - <0x4 0x21868000 0x0 0x8000>, - <0x3 0x80340000 0x0 0xc000>, - <0x3 0x80350000 0x0 0xc000>, - <0x3 0x80208000 0x0 0x4000>, - <0x3 0x80208400 0x0 0x4000>, - <0x3 0x8020a400 0x0 0x4000>, - <0x3 0x8020a600 0x0 0x4000>, - <0x3 0x8020a700 0x0 0x4000>, - <0x3 0x8020a800 0x0 0x4000>, - <0x3 0x8020aa00 0x0 0x4000>, - <0x3 0x8020ab00 0x0 0x4000>, - <0x3 0x8020ac00 0x0 0x4000>, - <0x3 0x8020ae00 0x0 0x4000>, - <0x3 0x8020af00 0x0 0x4000>, - <0x3 0x8020b000 0x0 0x4000>, - <0x3 0x8020b200 0x0 0x4000>, - <0x3 0x8020b300 0x0 0x4000>, - <0x3 0x8020b400 0x0 0x4000>, - <0x3 0x8020b600 0x0 0x4000>, - <0x3 0x8020b700 0x0 0x4000>, - <0x3 0x8020b800 0x0 0x4000>, - <0x3 0x8020ba00 0x0 0x4000>, - <0x3 0x8020bb00 0x0 0x4000>, - <0x3 0x8020bc00 0x0 0x4000>, - <0x3 0x8020be00 0x0 0x4000>, - <0x3 0x8020bf00 0x0 0x4000>, - <0x3 0x8020c000 0x0 0x4000>, - <0x3 0x8020c200 0x0 0x4000>, - <0x3 0x8020c300 0x0 0x4000>, - <0x3 0x8020c400 0x0 0x4000>, - <0x3 0x8020c600 0x0 0x4000>, - <0x3 0x8020c700 0x0 0x4000>, - <0x3 0x8020c800 0x0 0x4000>, - <0x3 0x8020ca00 0x0 0x4000>, - <0x3 0x8020cb00 0x0 0x4000>, - <0x3 0x8020cc00 0x0 0x4000>, - <0x3 0x8020ce00 0x0 0x4000>, - <0x3 0x8020d000 0x0 0x4000>, - <0x3 0x8020d200 0x0 0x4000>, - <0x3 0x8020d400 0x0 0x4000>, - <0x3 0x8020d600 0x0 0x4000>, - <0x3 0x8020d800 0x0 0x4000>, - <0x3 0x8020da00 0x0 0x4000>, - <0x3 0x82700000 0x0 0x114000>; - interrupts = , - , - , - , - , - , - , - , - , - , - , - , - ; - status = "disabled"; - }; - - dt5_esm: esm@55a67c000 { - compatible = "apple,t8142-esm", "apple,esm"; - reg = <0x5 0x5a67c000 0x0 0x4000>; - interrupts = , - ; - iommus = <&dt5_dart_sep 2>; - status = "disabled"; - }; - - dt5_aon_ptd: aon-ptd@38c840000 { - compatible = "apple,t8142-aon-ptd", "apple,aon-ptd"; - reg = <0x3 0x8c840000 0x0 0x4000>, - <0x3 0x8c850000 0x0 0x4000>, - <0x3 0x8c858000 0x0 0x4000>, - <0x3 0x8c860000 0x0 0x4000>; - interrupts = , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - ; - interrupt-controller; - #interrupt-cells = <1>; - #address-cells = <0>; - status = "disabled"; - }; - - dt5_rsm: rsm@389825000 { - compatible = "apple,t8142-rsm", "apple,rsm"; - reg = <0x3 0x89825000 0x0 0x4000>, - <0x3 0x898c0000 0x0 0x4>; - interrupts = ; - iommus = <&dt5_dart_rsm 0>; - status = "disabled"; - }; - - dt5_hib_exclave_watchdog: secure-watchdog@5d82b0000 { - compatible = "apple,t8142-secure-watchdog", "apple,secure-watchdog"; - reg = <0x5 0xd82b0000 0x0 0x4000>; - status = "disabled"; - }; -}; - -#include "t8142-peripherals.dtsi" +/* This chassis does not expose this peripheral instance. */ +/delete-node/ &apciec3_piodma; diff --git a/arch/arm64/boot/dts/apple/t8142-peripherals.dtsi b/arch/arm64/boot/dts/apple/t8142-peripherals.dtsi index 8d140dc3112b9..45c77929417c2 100644 --- a/arch/arm64/boot/dts/apple/t8142-peripherals.dtsi +++ b/arch/arm64/boot/dts/apple/t8142-peripherals.dtsi @@ -1,8 +1,467 @@ -// SPDX-License-Identifier: GPL-2.0-only OR MIT -/* Firmware/descriptor scaler family. No direct-MMIO scaler driver fallback. */ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* Shared SoC resources; firmware ownership and enables need qualification. */ + +&{/soc} { + pcie2_dart: iommu@48a000000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x8a000000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + pciec0_dart: iommu@404000000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x4000000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + acio0_dart: iommu@401a80000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x1a80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + pciec1_dart: iommu@40c000000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0xc000000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + acio1_dart: iommu@409a80000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x9a80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + pciec3_dart: iommu@41c000000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x1c000000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + acio3_dart: iommu@419a80000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x19a80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + sep_dart: iommu@308b80000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x8b80000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + sio_dart: iommu@3a5060000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xa5060000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + rsm_dart: iommu@3899a0000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x899a0000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dwc3_3_dart: iommu@41af00000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x1af00000 0x0 0xc000>, + <0x4 0x1af80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + disp0_isoc_dart: iommu@286180000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x2 0x86180000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dcpext0_dart: iommu@506340000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x6340000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dispext0_dart: iommu@506300000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x6300000 0x0 0xc000>, + <0x5 0x6314000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dispext0_isoc_dart: iommu@506180000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x6180000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dcpext1_dart: iommu@3aa340000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xaa340000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dispext1_dart: iommu@3aa300000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xaa300000 0x0 0xc000>, + <0x3 0xaa314000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dispext1_isoc_dart: iommu@3aa180000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xaa180000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + scaler0_dart: iommu@305260000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x5260000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + /* A dedicated scaler-DART gate mapping is not published by this ADT. */ + status = "disabled"; + }; + + jpeg_dart: iommu@301020000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x1020000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + apr_dart: iommu@3a1020000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xa1020000 0x0 0xc000>, + <0x3 0xa1034000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + scdc_dart: iommu@3a1040000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0xa1040000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + apcie2_piodma: dma-controller@48a030000 { + compatible = "apple,t8142-pcie-piodma", "apple,pcie-piodma"; + reg = <0x4 0x8a030000 0x0 0x4000>, + <0x4 0x8a034000 0x0 0x4000>, + <0x4 0x8a038000 0x0 0x4000>; + interrupts = ; + iommus = <&pcie2_dart 17>; + status = "disabled"; + }; + + apcie0_piodma: dma-controller@488030000 { + compatible = "apple,t8142-pcie-piodma", "apple,pcie-piodma"; + reg = <0x4 0x88030000 0x0 0x4000>, + <0x4 0x88034000 0x0 0x4000>, + <0x4 0x88038000 0x0 0x4000>; + interrupts = ; + iommus = <&pcie0_dart 17>; + status = "disabled"; + }; + + apciec0_piodma: dma-controller@404068000 { + compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; + reg = <0x4 0x4068000 0x0 0x4000>, + <0x4 0x406c000 0x0 0x4000>, + <0x4 0x4070000 0x0 0x4000>, + <0x4 0x403c000 0x0 0x4000>; + interrupts = ; + iommus = <&pciec0_dart 254>; + status = "disabled"; + }; + + apciec1_piodma: dma-controller@40c068000 { + compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; + reg = <0x4 0xc068000 0x0 0x4000>, + <0x4 0xc06c000 0x0 0x4000>, + <0x4 0xc070000 0x0 0x4000>, + <0x4 0xc03c000 0x0 0x4000>; + interrupts = ; + iommus = <&pciec1_dart 254>; + status = "disabled"; + }; + + apciec3_piodma: dma-controller@41c068000 { + compatible = "apple,t8142-pciec-piodma", "apple,pciec-piodma"; + reg = <0x4 0x1c068000 0x0 0x4000>, + <0x4 0x1c06c000 0x0 0x4000>, + <0x4 0x1c070000 0x0 0x4000>, + <0x4 0x1c03c000 0x0 0x4000>; + interrupts = ; + iommus = <&pciec3_dart 254>; + status = "disabled"; + }; + + aic_timebase: aic-timebase@591180000 { + compatible = "apple,t8142-aic-timebase", "apple,aic-timebase"; + reg = <0x5 0x91180000 0x0 0x1000>; + status = "disabled"; + }; + + error_handler: error-handler@308d00000 { + compatible = "apple,t8142-error-handler", "apple,soc-error-handler"; + reg = <0x3 0x8d00000 0x0 0x40000>, + <0x3 0x8900000 0x0 0x8000>, + <0x3 0x80000000 0x0 0x3c000>, + <0x3 0x80728000 0x0 0x4000>, + <0x3 0x80768000 0x0 0x4000>, + <0x3 0x882c8000 0x0 0x4000>, + <0x3 0x82000000 0x0 0x1000000>, + <0x3 0x803d0000 0x0 0x4000>, + <0x2 0x20000000 0x0 0x140000>, + <0x2 0x21000000 0x0 0x3c000>, + <0x2 0x21200000 0x0 0x3c000>, + <0x2 0x21400000 0x0 0x3c000>, + <0x2 0x21600000 0x0 0x3c000>, + <0x2 0x21800000 0x0 0x3c000>, + <0x2 0x21a00000 0x0 0x3c000>, + <0x2 0x21c00000 0x0 0x3c000>, + <0x2 0x21e00000 0x0 0x3c000>, + <0x2 0x4f000000 0x0 0x8000>, + <0x2 0x50000000 0x0 0x8000>, + <0x2 0x51000000 0x0 0x8000>, + <0x2 0x52000000 0x0 0x8000>, + <0x2 0x53000000 0x0 0x8000>, + <0x2 0x54000000 0x0 0x8000>, + <0x2 0x55000000 0x0 0x8000>, + <0x2 0x56000000 0x0 0x8000>, + <0x2 0x5f000000 0x0 0x8000>, + <0x2 0x6f000000 0x0 0x8000>, + <0x2 0x57000000 0x0 0x1000000>, + <0x2 0x58000000 0x0 0x1000000>, + <0x2 0x59000000 0x0 0x1000000>, + <0x3 0x80770000 0x0 0x4000>, + <0x3 0x80771000 0x0 0x4000>, + <0x2 0x5b000000 0x0 0x24000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + /* Shared status windows do not grant AP ownership. */ + status = "disabled"; + }; + + aop2_secure_mbox: mailbox@5e067c000 { + compatible = "apple,t8142-secure-mailbox", "apple,secure-mailbox"; + reg = <0x5 0xe067c000 0x0 0x4000>; + interrupts = , + ; + iommus = <&aop_dart 1>; + status = "disabled"; + }; + + event_log_handler: event-log@380700000 { + compatible = "apple,t8142-event-log", "apple,soc-event-log"; + reg = <0x3 0x80700000 0x0 0xd0000>, + <0x3 0x88280000 0x0 0x80000>, + <0x3 0x80000000 0x0 0x3c000>, + <0x3 0x88200000 0x0 0x2c000>, + <0x3 0x8028c000 0x0 0x4000>, + <0x3 0x80280000 0x0 0x8000>, + <0x4 0x21878000 0x0 0x4000>, + <0x4 0x21868000 0x0 0x8000>, + <0x3 0x80340000 0x0 0xc000>, + <0x3 0x80350000 0x0 0xc000>, + <0x3 0x80208000 0x0 0x4000>, + <0x3 0x80208400 0x0 0x4000>, + <0x3 0x8020a400 0x0 0x4000>, + <0x3 0x8020a600 0x0 0x4000>, + <0x3 0x8020a700 0x0 0x4000>, + <0x3 0x8020a800 0x0 0x4000>, + <0x3 0x8020aa00 0x0 0x4000>, + <0x3 0x8020ab00 0x0 0x4000>, + <0x3 0x8020ac00 0x0 0x4000>, + <0x3 0x8020ae00 0x0 0x4000>, + <0x3 0x8020af00 0x0 0x4000>, + <0x3 0x8020b000 0x0 0x4000>, + <0x3 0x8020b200 0x0 0x4000>, + <0x3 0x8020b300 0x0 0x4000>, + <0x3 0x8020b400 0x0 0x4000>, + <0x3 0x8020b600 0x0 0x4000>, + <0x3 0x8020b700 0x0 0x4000>, + <0x3 0x8020b800 0x0 0x4000>, + <0x3 0x8020ba00 0x0 0x4000>, + <0x3 0x8020bb00 0x0 0x4000>, + <0x3 0x8020bc00 0x0 0x4000>, + <0x3 0x8020be00 0x0 0x4000>, + <0x3 0x8020bf00 0x0 0x4000>, + <0x3 0x8020c000 0x0 0x4000>, + <0x3 0x8020c200 0x0 0x4000>, + <0x3 0x8020c300 0x0 0x4000>, + <0x3 0x8020c400 0x0 0x4000>, + <0x3 0x8020c600 0x0 0x4000>, + <0x3 0x8020c700 0x0 0x4000>, + <0x3 0x8020c800 0x0 0x4000>, + <0x3 0x8020ca00 0x0 0x4000>, + <0x3 0x8020cb00 0x0 0x4000>, + <0x3 0x8020cc00 0x0 0x4000>, + <0x3 0x8020ce00 0x0 0x4000>, + <0x3 0x8020d000 0x0 0x4000>, + <0x3 0x8020d200 0x0 0x4000>, + <0x3 0x8020d400 0x0 0x4000>, + <0x3 0x8020d600 0x0 0x4000>, + <0x3 0x8020d800 0x0 0x4000>, + <0x3 0x8020da00 0x0 0x4000>, + <0x3 0x82700000 0x0 0x114000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + ; + /* Shared status windows do not grant AP ownership. */ + status = "disabled"; + }; + + esm: esm@55a67c000 { + compatible = "apple,t8142-esm", "apple,esm"; + reg = <0x5 0x5a67c000 0x0 0x4000>; + interrupts = , + ; + iommus = <&sep_dart 2>; + status = "disabled"; + }; + + aon_ptd: aon-ptd@38c840000 { + compatible = "apple,t8142-aon-ptd", "apple,aon-ptd"; + reg = <0x3 0x8c840000 0x0 0x4000>, + <0x3 0x8c850000 0x0 0x4000>, + <0x3 0x8c858000 0x0 0x4000>, + <0x3 0x8c860000 0x0 0x4000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + interrupt-controller; + #interrupt-cells = <1>; + #address-cells = <0>; + status = "disabled"; + }; + + rsm: rsm@389825000 { + compatible = "apple,t8142-rsm", "apple,rsm"; + reg = <0x3 0x89825000 0x0 0x4000>, + <0x3 0x898c0000 0x0 0x4>; + interrupts = ; + iommus = <&rsm_dart 0>; + status = "disabled"; + }; + + hib_watchdog: secure-watchdog@5d82b0000 { + compatible = "apple,t8142-secure-watchdog", "apple,secure-watchdog"; + reg = <0x5 0xd82b0000 0x0 0x4000>; + status = "disabled"; + }; +}; &pmgr { - dt5_ps_msr: power-controller@2a8 { + ps_msr: power-controller@2a8 { compatible = "apple,t8142-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; reg = <0x2a8 4>; #power-domain-cells = <0>; @@ -10,19 +469,19 @@ label = "msr"; status = "disabled"; }; - dt5_ps_msr_ase_core: power-controller@320 { + ps_msr_ase_core: power-controller@320 { compatible = "apple,t8142-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; reg = <0x320 4>; #power-domain-cells = <0>; #reset-cells = <0>; label = "msr-ase-core"; - power-domains = <&dt5_ps_msr>; + power-domains = <&ps_msr>; status = "disabled"; }; }; &{/soc} { - dt5_peripheral_clocks: clock-controller@380700000 { + peripheral_clocks: clock-controller@380700000 { compatible = "apple,t8142-pmgr-clocks", "apple,pmgr-clocks"; reg = <0x3 0x80700000 0x0 0xd0000>, <0x3 0x88280000 0x0 0x80000>, @@ -83,7 +542,7 @@ status = "disabled"; }; - dt5_scaler0: scaler@305000000 { + scaler0: scaler@305000000 { compatible = "apple,t8142-scaler", "apple,scaler-v23"; reg = <0x3 0x5000000 0x0 0x14000>, <0x3 0x5210000 0x0 0x4000>, @@ -115,10 +574,10 @@ , , ; - iommus = <&dt5_dart_scaler 0>, <&dt5_dart_scaler 1>; - clocks = <&dt5_peripheral_clocks 399>; - power-domains = <&dt5_ps_msr>, <&dt5_ps_msr_ase_core>; - resets = <&dt5_ps_msr>; + iommus = <&scaler0_dart 0>, <&scaler0_dart 1>; + clocks = <&peripheral_clocks 399>; + power-domains = <&ps_msr>, <&ps_msr_ase_core>; + resets = <&ps_msr>; status = "disabled"; }; }; diff --git a/arch/arm64/boot/dts/apple/t8142.dtsi b/arch/arm64/boot/dts/apple/t8142.dtsi index 866e117062893..bc4840d4efea1 100644 --- a/arch/arm64/boot/dts/apple/t8142.dtsi +++ b/arch/arm64/boot/dts/apple/t8142.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0-only OR MIT +// SPDX-License-Identifier: GPL-2.0+ OR MIT /* * Common hardware inventory for boards without a qualified boot profile. * Firmware fills RAM and CPU release addresses. Keep new devices disabled; @@ -182,3 +182,84 @@ status = "disabled"; }; }; + +/* Providers also supplied by the existing standalone boot profile. */ +&{/soc} { + pcie0_dart: iommu@488000000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x88000000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + aop_dart: iommu@390fc0000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x90fc0000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + pmp_dart: iommu@380300000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x80300000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + mtp_dart: iommu@394800000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x3 0x94800000 0x0 0xc000>, + <0x3 0x94810000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dwc3_0_dart: iommu@402f00000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0x2f00000 0x0 0xc000>, + <0x4 0x2f80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dwc3_1_dart: iommu@40af00000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x4 0xaf00000 0x0 0xc000>, + <0x4 0xaf80000 0x0 0xc000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dcp_dart: iommu@286340000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x2 0x86340000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + disp0_dart: iommu@286300000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x2 0x86300000 0x0 0xc000>, + <0x2 0x86314000 0x0 0x4000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + avd_dart: iommu@501020000 { + compatible = "apple,t8142-dart", "apple,t8110-dart"; + reg = <0x5 0x1020000 0x0 0x20000>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; +}; + +#include "t8142-peripherals.dtsi" From 52aca6f5b029cd878554927c4769595e797a8aba Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 05:39:14 +1100 Subject: [PATCH 11/12] arm64: dts: apple: clarify T8142 boot and chassis selections Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- arch/arm64/boot/dts/apple/t8142-j813.dts | 7 +------ arch/arm64/boot/dts/apple/t8142-j815.dts | 7 +------ arch/arm64/boot/dts/apple/t8142.dtsi | 2 +- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t8142-j813.dts b/arch/arm64/boot/dts/apple/t8142-j813.dts index f75c37bd4f822..7016d4ed1210c 100644 --- a/arch/arm64/boot/dts/apple/t8142-j813.dts +++ b/arch/arm64/boot/dts/apple/t8142-j813.dts @@ -407,20 +407,15 @@ #include "t8142-peripherals.dtsi" -/* This chassis does not expose this peripheral instance. */ +/* Peripheral instances not exposed by this chassis. */ /delete-node/ &pcie2_dart; -/* This chassis does not expose this peripheral instance. */ /delete-node/ &pciec3_dart; -/* This chassis does not expose this peripheral instance. */ /delete-node/ &acio3_dart; -/* This chassis does not expose this peripheral instance. */ /delete-node/ &dwc3_3_dart; -/* This chassis does not expose this peripheral instance. */ /delete-node/ &apcie2_piodma; -/* This chassis does not expose this peripheral instance. */ /delete-node/ &apciec3_piodma; diff --git a/arch/arm64/boot/dts/apple/t8142-j815.dts b/arch/arm64/boot/dts/apple/t8142-j815.dts index 7ebc7b95de22d..0fb6fd4aab480 100644 --- a/arch/arm64/boot/dts/apple/t8142-j815.dts +++ b/arch/arm64/boot/dts/apple/t8142-j815.dts @@ -9,20 +9,15 @@ chassis-type = "laptop"; }; -/* This chassis does not expose this peripheral instance. */ +/* Peripheral instances not exposed by this chassis. */ /delete-node/ &pcie2_dart; -/* This chassis does not expose this peripheral instance. */ /delete-node/ &pciec3_dart; -/* This chassis does not expose this peripheral instance. */ /delete-node/ &acio3_dart; -/* This chassis does not expose this peripheral instance. */ /delete-node/ &dwc3_3_dart; -/* This chassis does not expose this peripheral instance. */ /delete-node/ &apcie2_piodma; -/* This chassis does not expose this peripheral instance. */ /delete-node/ &apciec3_piodma; diff --git a/arch/arm64/boot/dts/apple/t8142.dtsi b/arch/arm64/boot/dts/apple/t8142.dtsi index bc4840d4efea1..9bf8a297f31be 100644 --- a/arch/arm64/boot/dts/apple/t8142.dtsi +++ b/arch/arm64/boot/dts/apple/t8142.dtsi @@ -183,7 +183,7 @@ }; }; -/* Providers also supplied by the existing standalone boot profile. */ +/* Native interfaces shared by the hardware-only board descriptions. */ &{/soc} { pcie0_dart: iommu@488000000 { compatible = "apple,t8142-dart", "apple,t8110-dart"; From 2da01320bdbc19edc37bc796f185e763038a00b6 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 05:59:56 +1100 Subject: [PATCH 12/12] arm64: dts: apple: retain disabled T8142 die instances Keep all native SoC resources described even when a chassis does not expose their ports. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- arch/arm64/boot/dts/apple/t8142-j813.dts | 13 +------------ arch/arm64/boot/dts/apple/t8142-j815.dts | 13 +------------ 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t8142-j813.dts b/arch/arm64/boot/dts/apple/t8142-j813.dts index 7016d4ed1210c..59788190b1933 100644 --- a/arch/arm64/boot/dts/apple/t8142-j813.dts +++ b/arch/arm64/boot/dts/apple/t8142-j813.dts @@ -407,15 +407,4 @@ #include "t8142-peripherals.dtsi" -/* Peripheral instances not exposed by this chassis. */ -/delete-node/ &pcie2_dart; - -/delete-node/ &pciec3_dart; - -/delete-node/ &acio3_dart; - -/delete-node/ &dwc3_3_dart; - -/delete-node/ &apcie2_piodma; - -/delete-node/ &apciec3_piodma; +/* Unexposed chassis port instances remain described and disabled. */ diff --git a/arch/arm64/boot/dts/apple/t8142-j815.dts b/arch/arm64/boot/dts/apple/t8142-j815.dts index 0fb6fd4aab480..383ad27316095 100644 --- a/arch/arm64/boot/dts/apple/t8142-j815.dts +++ b/arch/arm64/boot/dts/apple/t8142-j815.dts @@ -9,15 +9,4 @@ chassis-type = "laptop"; }; -/* Peripheral instances not exposed by this chassis. */ -/delete-node/ &pcie2_dart; - -/delete-node/ &pciec3_dart; - -/delete-node/ &acio3_dart; - -/delete-node/ &dwc3_3_dart; - -/delete-node/ &apcie2_piodma; - -/delete-node/ &apciec3_piodma; +/* Unexposed chassis port instances remain described and disabled. */