diff --git a/Documentation/devicetree/bindings/arm/apple.yaml b/Documentation/devicetree/bindings/arm/apple.yaml index 19972afe6eb3d..4ee0858dc8f3e 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 (J704) + - apple,j813 # MacBook Air (13-inch, M5, 2026) + - apple,j815 # MacBook Air (J815) - 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 (J804) + - apple,j833ct # iMac (J833ct) + - apple,j873g # Mac mini (M6) - const: apple,t8152 - const: apple,arm-platform diff --git a/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml b/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml index 2b8450ee54230..31d13c93d120e 100644 --- a/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml +++ b/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml @@ -30,6 +30,7 @@ select: - apple,t8103-pmgr-clocks - apple,t8132-pmgr-clocks - apple,t8140-pmgr-clocks + - apple,t8142-pmgr-clocks required: - compatible @@ -88,18 +89,14 @@ allOf: else: properties: compatible: - oneOf: - - items: - - enum: - - apple,t6041-pmgr-clocks - - apple,t8140-pmgr-clocks - - const: apple,pmgr-clocks - - items: - - const: apple,t8103-pmgr-clocks - - const: apple,pmgr-clocks - - items: - - const: apple,t6000-pmgr-clocks - - const: apple,pmgr-clocks + items: + - enum: + - apple,t6000-pmgr-clocks + - apple,t6041-pmgr-clocks + - apple,t8103-pmgr-clocks + - apple,t8140-pmgr-clocks + - apple,t8142-pmgr-clocks + - const: apple,pmgr-clocks reg: description: PMGR control apertures in hardware-description order. @@ -120,6 +117,16 @@ allOf: - 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/dma/apple,pcie-piodma.yaml b/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml index 99aa37f64119d..1fc76061f0644 100644 --- a/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml +++ b/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml @@ -28,6 +28,8 @@ select: - apple,t8112-pcie-piodma - apple,t8122-pcie-piodma - apple,t8132-pcie-piodma + - apple,t8142-pcie-piodma + - apple,t8152-pcie-piodma required: - compatible @@ -100,20 +102,19 @@ allOf: else: properties: compatible: - oneOf: - - items: - - const: apple,t6041-pcie-piodma - - const: apple,pcie-piodma - - items: - - enum: - - apple,t6020-pcie-piodma - - apple,t6021-pcie-piodma - - apple,t6022-pcie-piodma - - apple,t6030-pcie-piodma - - apple,t6031-pcie-piodma - - apple,t8112-pcie-piodma - - apple,t8122-pcie-piodma - - const: apple,pcie-piodma + items: + - enum: + - apple,t6020-pcie-piodma + - apple,t6021-pcie-piodma + - apple,t6022-pcie-piodma + - apple,t6030-pcie-piodma + - apple,t6031-pcie-piodma + - apple,t6041-pcie-piodma + - apple,t8112-pcie-piodma + - apple,t8122-pcie-piodma + - apple,t8142-pcie-piodma + - apple,t8152-pcie-piodma + - const: apple,pcie-piodma reg: minItems: 3 diff --git a/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml b/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml index 1bbf5359b2b19..ba0f87c3ffbae 100644 --- a/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml +++ b/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml @@ -30,6 +30,8 @@ select: - apple,t8112-pciec-piodma - apple,t8122-pciec-piodma - apple,t8132-pciec-piodma + - apple,t8142-pciec-piodma + - apple,t8152-pciec-piodma required: - compatible @@ -114,6 +116,8 @@ allOf: - apple,t8103-pciec-piodma - apple,t8112-pciec-piodma - apple,t8122-pciec-piodma + - apple,t8142-pciec-piodma + - apple,t8152-pciec-piodma - const: apple,pciec-piodma reg: diff --git a/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml b/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml index 2f8ce57bad574..dfc99661e5b58 100644 --- a/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml +++ b/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml @@ -47,6 +47,10 @@ select: - apple,t8132-event-log - apple,t8140-error-handler - apple,t8140-event-log + - apple,t8142-error-handler + - apple,t8142-event-log + - apple,t8152-error-handler + - apple,t8152-event-log required: - compatible @@ -129,6 +133,8 @@ allOf: - apple,t8112-error-handler - apple,t8122-error-handler - apple,t8140-error-handler + - apple,t8142-error-handler + - apple,t8152-error-handler - const: apple,soc-error-handler - items: - enum: @@ -145,6 +151,8 @@ allOf: - apple,t8112-event-log - apple,t8122-event-log - apple,t8140-event-log + - apple,t8142-event-log + - apple,t8152-event-log - const: apple,soc-event-log power-domains: @@ -168,6 +176,66 @@ allOf: - 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: 112 + 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..6b50540015458 100644 --- a/Documentation/devicetree/bindings/mailbox/apple,secure-mailbox.yaml +++ b/Documentation/devicetree/bindings/mailbox/apple,secure-mailbox.yaml @@ -16,6 +16,12 @@ description: | properties: compatible: oneOf: + - items: + - const: apple,t8152-secure-mailbox + - const: apple,secure-mailbox + - items: + - const: apple,t8142-secure-mailbox + - const: apple,secure-mailbox - items: - const: apple,t8140-secure-mailbox - const: apple,secure-mailbox @@ -26,7 +32,7 @@ properties: interrupts: minItems: 2 - maxItems: 2 + maxItems: 3 iommus: maxItems: 1 @@ -37,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/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/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/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml b/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml index b4f96a4d46135..db9095e79917c 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml @@ -23,6 +23,8 @@ select: - apple,t6041-aon-ptd - apple,t8132-aon-ptd - apple,t8140-aon-ptd + - apple,t8142-aon-ptd + - apple,t8152-aon-ptd required: - compatible @@ -109,17 +111,14 @@ allOf: else: properties: compatible: - oneOf: - - items: - - const: apple,t6041-aon-ptd - - const: apple,aon-ptd - - items: - - const: apple,t8140-aon-ptd - - const: apple,aon-ptd - - items: - - enum: - - apple,t6031-aon-ptd - - const: apple,aon-ptd + items: + - enum: + - apple,t6031-aon-ptd + - apple,t6041-aon-ptd + - apple,t8140-aon-ptd + - apple,t8142-aon-ptd + - apple,t8152-aon-ptd + - const: apple,aon-ptd reg: minItems: 4 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 04a42e9a08070..a357858915714 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,rsm.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,rsm.yaml @@ -22,6 +22,8 @@ select: - apple,t6032-rsm - apple,t8122-rsm - apple,t8140-rsm + - apple,t8142-rsm + - apple,t8152-rsm required: - compatible @@ -66,16 +68,15 @@ allOf: else: properties: compatible: - oneOf: - - items: - - const: apple,t8140-rsm - - const: apple,rsm - - items: - - enum: - - apple,t8122-rsm - - apple,t6030-rsm - - apple,t6031-rsm - - const: apple,rsm + items: + - enum: + - apple,t6030-rsm + - apple,t6031-rsm + - apple,t8122-rsm + - apple,t8140-rsm + - apple,t8142-rsm + - apple,t8152-rsm + - const: apple,rsm reg: minItems: 2 diff --git a/Documentation/devicetree/bindings/timer/apple,aic-timebase.yaml b/Documentation/devicetree/bindings/timer/apple,aic-timebase.yaml index f79b538a6bce6..34bf3ec296b0f 100644 --- a/Documentation/devicetree/bindings/timer/apple,aic-timebase.yaml +++ b/Documentation/devicetree/bindings/timer/apple,aic-timebase.yaml @@ -23,6 +23,8 @@ properties: - apple,t6041-aic-timebase - apple,t8103-aic-timebase - apple,t8112-aic-timebase + - apple,t8142-aic-timebase + - apple,t8152-aic-timebase - const: apple,aic-timebase reg: 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 diff --git a/arch/arm64/boot/dts/apple/Makefile b/arch/arm64/boot/dts/apple/Makefile index fd5a4e19f0c46..f53244534b3b7 100644 --- a/arch/arm64/boot/dts/apple/Makefile +++ b/arch/arm64/boot/dts/apple/Makefile @@ -119,7 +119,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. 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..d3a9329dc59ec --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8142-j704.dts @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/dts-v1/; + +#include "t8142.dtsi" + +/ { + model = "Apple MacBook Pro (J704)"; + compatible = "apple,j704", "apple,t8142", "apple,arm-platform"; + chassis-type = "laptop"; +}; 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 dd1526e6caad1..59788190b1933 100644 --- a/arch/arm64/boot/dts/apple/t8142-j813.dts +++ b/arch/arm64/boot/dts/apple/t8142-j813.dts @@ -404,3 +404,7 @@ #include "t8142-j813-n1.dtsi" #include "t8142-j813-power.dtsi" #include "t8142-j813-audio.dtsi" + +#include "t8142-peripherals.dtsi" + +/* 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 new file mode 100644 index 0000000000000..383ad27316095 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8142-j815.dts @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/dts-v1/; + +#include "t8142.dtsi" + +/ { + model = "Apple MacBook Air (J815)"; + compatible = "apple,j815", "apple,t8142", "apple,arm-platform"; + chassis-type = "laptop"; +}; + +/* Unexposed chassis port instances remain described and disabled. */ 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..45c77929417c2 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8142-peripherals.dtsi @@ -0,0 +1,583 @@ +// 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 { + 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"; + }; + 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 = <&ps_msr>; + status = "disabled"; + }; +}; + +&{/soc} { + 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"; + }; + + 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 = <&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 new file mode 100644 index 0000000000000..9bf8a297f31be --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8142.dtsi @@ -0,0 +1,265 @@ +// 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; + * 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; + #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 = ; + }; + }; +}; + +&{/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"; + }; +}; + +/* Native interfaces shared by the hardware-only board descriptions. */ +&{/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"