From 20366a7088d1a3e6444279a3c02cbc7bb5bb54c3 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 00:20:58 +1100 Subject: [PATCH 01/10] arm64: dts: apple: describe disabled T8132 resources and codecs Describe media engines, translation filters, DMA and peripheral buses while retaining the integration CPU frequency and idle policy. Add disabled board codec endpoints using existing bindings. Reuse generic binding contracts with compatible-specific resource layouts. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../devicetree/bindings/arm/apple.yaml | 4 +- .../bindings/clock/apple,pmgr-clocks.yaml | 104 +++++ .../devicetree/bindings/crypto/apple,aes.yaml | 103 +++++ .../bindings/display/apple,dcp-expert.yaml | 79 ++++ .../bindings/display/apple,dpin.yaml | 78 ++++ .../bindings/dma/apple,pcie-piodma.yaml | 88 ++++ .../bindings/dma/apple,pciec-piodma.yaml | 88 ++++ .../devicetree/bindings/iommu/apple,dapf.yaml | 43 ++ .../bindings/iommu/apple,dart-smmu.yaml | 43 ++ .../devicetree/bindings/iommu/apple,gapf.yaml | 43 ++ .../devicetree/bindings/media/apple,jpeg.yaml | 147 +++++-- .../bindings/media/apple,prores.yaml | 142 +++++-- .../bindings/media/apple,scaler.yaml | 117 +++++ .../bindings/media/apple,t8140-ave.yaml | 187 +++++--- .../devicetree/bindings/pwm/apple,pwm.yaml | 53 +++ .../bindings/soc/apple/apple,aft.yaml | 43 ++ .../bindings/soc/apple/apple,aon-ptd.yaml | 103 +++++ .../bindings/soc/apple/apple,cpu-debug.yaml | 79 ++++ .../bindings/soc/apple/apple,dwi.yaml | 93 ++++ .../devicetree/bindings/spmi/apple,spmi.yaml | 6 +- .../boot/dts/apple/t8132-j604-audio.dtsi | 84 ++++ arch/arm64/boot/dts/apple/t8132-j604.dts | 2 + .../boot/dts/apple/t8132-j623-audio.dtsi | 66 +++ arch/arm64/boot/dts/apple/t8132-j623.dts | 2 + .../boot/dts/apple/t8132-j624-audio.dtsi | 66 +++ arch/arm64/boot/dts/apple/t8132-j624.dts | 2 + .../boot/dts/apple/t8132-j715-audio.dtsi | 84 ++++ arch/arm64/boot/dts/apple/t8132-j715.dts | 2 + .../boot/dts/apple/t8132-j773g-audio.dtsi | 39 ++ arch/arm64/boot/dts/apple/t8132-j773g.dts | 2 + .../dts/apple/t8132-peripheral-buses.dtsi | 85 ++++ .../boot/dts/apple/t8132-peripherals.dtsi | 401 ++++++++++++++++++ arch/arm64/boot/dts/apple/t8132.dtsi | 4 + 33 files changed, 2325 insertions(+), 157 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml create mode 100644 Documentation/devicetree/bindings/crypto/apple,aes.yaml create mode 100644 Documentation/devicetree/bindings/display/apple,dcp-expert.yaml create mode 100644 Documentation/devicetree/bindings/display/apple,dpin.yaml create mode 100644 Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml create mode 100644 Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml create mode 100644 Documentation/devicetree/bindings/iommu/apple,dapf.yaml create mode 100644 Documentation/devicetree/bindings/iommu/apple,dart-smmu.yaml create mode 100644 Documentation/devicetree/bindings/iommu/apple,gapf.yaml create mode 100644 Documentation/devicetree/bindings/media/apple,scaler.yaml create mode 100644 Documentation/devicetree/bindings/pwm/apple,pwm.yaml create mode 100644 Documentation/devicetree/bindings/soc/apple/apple,aft.yaml create mode 100644 Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml create mode 100644 Documentation/devicetree/bindings/soc/apple/apple,cpu-debug.yaml create mode 100644 Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml create mode 100644 arch/arm64/boot/dts/apple/t8132-j604-audio.dtsi create mode 100644 arch/arm64/boot/dts/apple/t8132-j623-audio.dtsi create mode 100644 arch/arm64/boot/dts/apple/t8132-j624-audio.dtsi create mode 100644 arch/arm64/boot/dts/apple/t8132-j715-audio.dtsi create mode 100644 arch/arm64/boot/dts/apple/t8132-j773g-audio.dtsi create mode 100644 arch/arm64/boot/dts/apple/t8132-peripheral-buses.dtsi create mode 100644 arch/arm64/boot/dts/apple/t8132-peripherals.dtsi diff --git a/Documentation/devicetree/bindings/arm/apple.yaml b/Documentation/devicetree/bindings/arm/apple.yaml index f0061e05acbef..19972afe6eb3d 100644 --- a/Documentation/devicetree/bindings/arm/apple.yaml +++ b/Documentation/devicetree/bindings/arm/apple.yaml @@ -357,8 +357,8 @@ properties: - apple,j604 # MacBook Pro (14-inch, M4, 2024) - apple,j623 # iMac (24-inch, 2x USB-C, M4, 2024) - apple,j624 # iMac (24-inch, 4x USB-C, M4, 2024) - - apple,j713 # MacBook Air (13-inch, M3, 2025) - - apple,j715 # MacBook Air (15-inch, M3, 2025) + - apple,j713 # MacBook Air (13-inch, M4, 2025) + - apple,j715 # MacBook Air (15-inch, M4, 2025) - apple,j773g # Mac mini (M4, 2024) - const: apple,t8132 - const: apple,arm-platform diff --git a/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml b/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml new file mode 100644 index 0000000000000..ff2b04cec515b --- /dev/null +++ b/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml @@ -0,0 +1,104 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/clock/apple,pmgr-clocks.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple PMGR peripheral clock selectors + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Peripheral input clocks managed by the SoC power manager. The clock + specifier is the SoC clock selector from the hardware description. It is + separate from a PMGR device/power-gate ID. Rates may change with performance + state and must not be represented as fixed clocks sampled at one boot. + The provider remains disabled until a generation-specific clock driver + can resolve selectors and coordinate ownership with firmware. + +select: + properties: + compatible: + contains: + enum: + - apple,t6041-pmgr-clocks + - apple,t8140-pmgr-clocks + - apple,t8132-pmgr-clocks + required: + - compatible + +allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t8132-pmgr-clocks + required: + - compatible + then: + properties: + compatible: + items: + - const: apple,t8132-pmgr-clocks + - const: apple,pmgr-clocks + + '#clock-cells': + const: 1 + + required: + - compatible + - '#clock-cells' + + additionalProperties: false + else: + properties: + compatible: + items: + - enum: + - apple,t6041-pmgr-clocks + - apple,t8140-pmgr-clocks + - const: apple,pmgr-clocks + + reg: + description: PMGR control apertures in hardware-description order. + minItems: 44 + maxItems: 63 + + '#clock-cells': + const: 1 + + apple,pmgr: + $ref: /schemas/types.yaml#/definitions/phandle + description: Primary PMGR syscon. Additional control banks are described by reg. + + required: + - reg + - compatible + - '#clock-cells' + - apple,pmgr + + allOf: + - if: + properties: + compatible: + contains: + const: apple,t6041-pmgr-clocks + then: + properties: + reg: + minItems: 63 + maxItems: 63 + - if: + properties: + compatible: + contains: + const: apple,t8140-pmgr-clocks + then: + properties: + reg: + minItems: 44 + maxItems: 44 + + additionalProperties: false diff --git a/Documentation/devicetree/bindings/crypto/apple,aes.yaml b/Documentation/devicetree/bindings/crypto/apple,aes.yaml new file mode 100644 index 0000000000000..ceedd32be134a --- /dev/null +++ b/Documentation/devicetree/bindings/crypto/apple,aes.yaml @@ -0,0 +1,103 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/crypto/apple,aes.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple AES engine + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + AES hardware attached to the SIO DART. The register banks are the + engine, shared control and auxiliary control windows, in that order. + +select: + properties: + compatible: + contains: + enum: + - apple,t6041-aes + - apple,t8140-aes + - apple,t8132-aes + required: + - compatible + +allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t8132-aes + required: + - compatible + then: + properties: + compatible: + items: + - enum: + - apple,t8132-aes + - const: apple,aes + + reg: + minItems: 3 + maxItems: 3 + + interrupts: + minItems: 1 + maxItems: 1 + + power-domains: + minItems: 1 + maxItems: 1 + + iommus: + minItems: 1 + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - power-domains + - iommus + + additionalProperties: false + else: + properties: + compatible: + oneOf: + - items: + - const: apple,t6041-aes + - const: apple,aes + - items: + - const: apple,t8140-aes + - const: apple,aes + + reg: + minItems: 3 + maxItems: 3 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 1 + maxItems: 1 + + power-domains: + minItems: 1 + maxItems: 1 + + iommus: + minItems: 1 + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - power-domains + - iommus + + additionalProperties: false diff --git a/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml b/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml new file mode 100644 index 0000000000000..cf91ff82a2991 --- /dev/null +++ b/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml @@ -0,0 +1,79 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/apple,dcp-expert.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple display expert control registers + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Display control and timing register apertures associated with a display + coprocessor. These registers can be shared with firmware-owned display + blocks and must not be accessed without an ownership handoff. + +select: + properties: + compatible: + contains: + enum: + - apple,t6041-dcp-expert + - apple,t8140-dcp-expert + - apple,t8132-dcp-expert + required: + - compatible + +allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t8132-dcp-expert + required: + - compatible + then: + properties: + compatible: + items: + - enum: + - apple,t8132-dcp-expert + - const: apple,dcp-expert + + reg: + minItems: 2 + maxItems: 2 + + required: + - compatible + - reg + + additionalProperties: false + else: + properties: + compatible: + oneOf: + - items: + - const: apple,t6041-dcp-expert + - const: apple,dcp-expert + - items: + - const: apple,t8140-dcp-expert + - const: apple,dcp-expert + + reg: + minItems: 3 + maxItems: 17 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 1 + maxItems: 1 + + required: + - compatible + - reg + - interrupts + + additionalProperties: false diff --git a/Documentation/devicetree/bindings/display/apple,dpin.yaml b/Documentation/devicetree/bindings/display/apple,dpin.yaml new file mode 100644 index 0000000000000..014f53b60bc82 --- /dev/null +++ b/Documentation/devicetree/bindings/display/apple,dpin.yaml @@ -0,0 +1,78 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/apple,dpin.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple DisplayPort tunnel ingress + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + DisplayPort ingress registers and interrupt for a USB4 display tunnel. + +select: + properties: + compatible: + contains: + enum: + - apple,t6041-dpin + - apple,t8132-dpin + required: + - compatible + +allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t8132-dpin + required: + - compatible + then: + properties: + compatible: + items: + - enum: + - apple,t8132-dpin + - const: apple,dpin + + reg: + minItems: 1 + maxItems: 1 + + interrupts: + minItems: 1 + maxItems: 1 + + required: + - compatible + - reg + - interrupts + + additionalProperties: false + else: + properties: + compatible: + oneOf: + - items: + - const: apple,t6041-dpin + - const: apple,dpin + + reg: + minItems: 1 + maxItems: 1 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 1 + maxItems: 1 + + required: + - compatible + - reg + - interrupts + + additionalProperties: false diff --git a/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml b/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml new file mode 100644 index 0000000000000..dad43a69a71fe --- /dev/null +++ b/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml @@ -0,0 +1,88 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/dma/apple,pcie-piodma.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple PCIe PIODMA engine + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + PCIe auxiliary DMA register banks and completion interrupt. The stream + is distinct from the PCIe endpoint streams in the same DART. + +select: + properties: + compatible: + contains: + enum: + - apple,t6041-pcie-piodma + - apple,t8132-pcie-piodma + required: + - compatible + +allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t8132-pcie-piodma + required: + - compatible + then: + properties: + compatible: + items: + - enum: + - apple,t8132-pcie-piodma + - const: apple,pcie-piodma + + reg: + minItems: 3 + maxItems: 3 + + interrupts: + minItems: 1 + maxItems: 1 + + iommus: + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - iommus + + additionalProperties: false + else: + properties: + compatible: + oneOf: + - items: + - const: apple,t6041-pcie-piodma + - const: apple,pcie-piodma + + reg: + minItems: 3 + maxItems: 3 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 1 + maxItems: 1 + + iommus: + minItems: 1 + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - iommus + + additionalProperties: false diff --git a/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml b/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml new file mode 100644 index 0000000000000..560b49eb08159 --- /dev/null +++ b/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml @@ -0,0 +1,88 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/dma/apple,pciec-piodma.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple PCIe tunnel PIODMA engine + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + PCIe tunnel auxiliary DMA register banks and completion interrupt. Its + stream is distinct from the tunnel endpoint streams in the same DART. + +select: + properties: + compatible: + contains: + enum: + - apple,t6041-pciec-piodma + - apple,t8132-pciec-piodma + required: + - compatible + +allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t8132-pciec-piodma + required: + - compatible + then: + properties: + compatible: + items: + - enum: + - apple,t8132-pciec-piodma + - const: apple,pciec-piodma + + reg: + minItems: 4 + maxItems: 4 + + interrupts: + minItems: 1 + maxItems: 1 + + iommus: + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - iommus + + additionalProperties: false + else: + properties: + compatible: + oneOf: + - items: + - const: apple,t6041-pciec-piodma + - const: apple,pciec-piodma + + reg: + minItems: 4 + maxItems: 4 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 1 + maxItems: 1 + + iommus: + minItems: 1 + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - iommus + + additionalProperties: false diff --git a/Documentation/devicetree/bindings/iommu/apple,dapf.yaml b/Documentation/devicetree/bindings/iommu/apple,dapf.yaml new file mode 100644 index 0000000000000..d5637a060feb1 --- /dev/null +++ b/Documentation/devicetree/bindings/iommu/apple,dapf.yaml @@ -0,0 +1,43 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/iommu/apple,dapf.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple M4 base SoC DMA address protection filter + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Hardware resources of the M4 base SoC DMA address protection filter. + The interface is described for discovery and must remain disabled until + its ownership, initialization and shutdown are supported. Register windows + are listed in hardware resource order; firmware configuration and tuning + data are supplied by the boot firmware rather than this binding. + +select: + properties: + compatible: + contains: + enum: + - apple,t8132-dapf + required: + - compatible + +properties: + compatible: + items: + - enum: + - apple,t8132-dapf + - const: apple,dapf + + reg: + minItems: 1 + maxItems: 1 + +required: + - compatible + - reg + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/iommu/apple,dart-smmu.yaml b/Documentation/devicetree/bindings/iommu/apple,dart-smmu.yaml new file mode 100644 index 0000000000000..cc2e2382852bc --- /dev/null +++ b/Documentation/devicetree/bindings/iommu/apple,dart-smmu.yaml @@ -0,0 +1,43 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/iommu/apple,dart-smmu.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple M4 base SoC system MMU companion interface + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Hardware resources of the M4 base SoC system MMU companion interface. + The interface is described for discovery and must remain disabled until + its ownership, initialization and shutdown are supported. Register windows + are listed in hardware resource order; firmware configuration and tuning + data are supplied by the boot firmware rather than this binding. + +select: + properties: + compatible: + contains: + enum: + - apple,t8132-dart-smmu + required: + - compatible + +properties: + compatible: + items: + - enum: + - apple,t8132-dart-smmu + - const: apple,dart-smmu + + reg: + minItems: 1 + maxItems: 1 + +required: + - compatible + - reg + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/iommu/apple,gapf.yaml b/Documentation/devicetree/bindings/iommu/apple,gapf.yaml new file mode 100644 index 0000000000000..1dcf32e31c8e4 --- /dev/null +++ b/Documentation/devicetree/bindings/iommu/apple,gapf.yaml @@ -0,0 +1,43 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/iommu/apple,gapf.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple M4 base SoC global address protection filter + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Hardware resources of the M4 base SoC global address protection filter. + The interface is described for discovery and must remain disabled until + its ownership, initialization and shutdown are supported. Register windows + are listed in hardware resource order; firmware configuration and tuning + data are supplied by the boot firmware rather than this binding. + +select: + properties: + compatible: + contains: + enum: + - apple,t8132-gapf + required: + - compatible + +properties: + compatible: + items: + - enum: + - apple,t8132-gapf + - const: apple,gapf + + reg: + minItems: 1 + maxItems: 1 + +required: + - compatible + - reg + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/media/apple,jpeg.yaml b/Documentation/devicetree/bindings/media/apple,jpeg.yaml index 056e1d33c00fd..7dab8e2586674 100644 --- a/Documentation/devicetree/bindings/media/apple,jpeg.yaml +++ b/Documentation/devicetree/bindings/media/apple,jpeg.yaml @@ -19,61 +19,118 @@ description: | the engine's 32-bit buffer pointer registers. T8140 engines take 64-bit buffer addresses and use their DART's full window. -properties: - compatible: - enum: - - apple,t6041-jpeg - - apple,t8140-jpeg - - reg: - maxItems: 1 - - interrupts: - maxItems: 1 - - iommus: - maxItems: 1 - - power-domains: - minItems: 1 - items: - - description: The engine's power domain - - description: Performance request held while the engine works - - power-domain-names: - minItems: 1 - items: - - const: core - - const: perf - - apple,dma-range: - $ref: /schemas/types.yaml#/definitions/uint64-array - items: - - const: 0x10000000000 - - const: 0x100000000 - description: Device-visible DMA window, as a 64-bit base and size. - Only for engines with 32-bit buffer pointers. - -required: - - compatible - - reg - - interrupts - - iommus - - power-domains +select: + properties: + compatible: + contains: + enum: + - apple,t6041-jpeg + - apple,t8140-jpeg + - apple,t8132-jpeg + required: + - compatible allOf: - if: properties: compatible: - const: apple,t6041-jpeg + contains: + enum: + - apple,t8132-jpeg + required: + - compatible then: + properties: + compatible: + items: + - enum: + - apple,t8132-jpeg + - const: apple,jpeg + + reg: + minItems: 1 + maxItems: 1 + + interrupts: + minItems: 1 + maxItems: 1 + + power-domains: + minItems: 1 + maxItems: 1 + + iommus: + minItems: 1 + maxItems: 1 + + clocks: + minItems: 1 + maxItems: 2 + required: - - apple,dma-range + - compatible + - reg + - interrupts + - power-domains + - iommus + + additionalProperties: false else: properties: - apple,dma-range: false + compatible: + enum: + - apple,t6041-jpeg + - apple,t8140-jpeg + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + iommus: + maxItems: 1 + + power-domains: + minItems: 1 + items: + - description: The engine's power domain + - description: Performance request held while the engine works + + power-domain-names: + minItems: 1 + items: + - const: core + - const: perf + + apple,dma-range: + $ref: /schemas/types.yaml#/definitions/uint64-array + items: + - const: 0x10000000000 + - const: 0x100000000 + description: Device-visible DMA window, as a 64-bit base and size. + Only for engines with 32-bit buffer pointers. -additionalProperties: false + required: + - compatible + - reg + - interrupts + - iommus + - power-domains + + allOf: + - if: + properties: + compatible: + const: apple,t6041-jpeg + then: + required: + - apple,dma-range + else: + properties: + apple,dma-range: false + + additionalProperties: false examples: - | diff --git a/Documentation/devicetree/bindings/media/apple,prores.yaml b/Documentation/devicetree/bindings/media/apple,prores.yaml index 07afac17ef2ee..1774c4c2ccef1 100644 --- a/Documentation/devicetree/bindings/media/apple,prores.yaml +++ b/Documentation/devicetree/bindings/media/apple,prores.yaml @@ -14,51 +14,103 @@ description: | descriptors in a DMA ring; the engine signals completion with an interrupt. It has no firmware. Its power domain also resets it. -properties: - compatible: - const: apple,t8140-prores - - reg: - items: - - description: Engine registers - - description: Wrapper registers - - reg-names: - items: - - const: core - - const: wrapper - - interrupts: - minItems: 1 - maxItems: 2 - - iommus: - maxItems: 1 - - power-domains: - minItems: 1 - items: - - description: The engine's power domain - - description: Performance request held while the engine works - - power-domain-names: - minItems: 1 - items: - - const: core - - const: perf - - resets: - maxItems: 1 - -required: - - compatible - - reg - - reg-names - - interrupts - - iommus - - power-domains - -additionalProperties: false +select: + properties: + compatible: + contains: + enum: + - apple,t8140-prores + - apple,t8132-prores + required: + - compatible + +allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t8132-prores + required: + - compatible + then: + properties: + compatible: + items: + - enum: + - apple,t8132-prores + - const: apple,prores + + reg: + minItems: 3 + maxItems: 3 + + interrupts: + minItems: 2 + maxItems: 2 + + power-domains: + minItems: 1 + maxItems: 1 + + iommus: + minItems: 1 + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - power-domains + - iommus + + additionalProperties: false + else: + properties: + compatible: + const: apple,t8140-prores + + reg: + items: + - description: Engine registers + - description: Wrapper registers + + reg-names: + items: + - const: core + - const: wrapper + + interrupts: + minItems: 1 + maxItems: 2 + + iommus: + maxItems: 1 + + power-domains: + minItems: 1 + items: + - description: The engine's power domain + - description: Performance request held while the engine works + + power-domain-names: + minItems: 1 + items: + - const: core + - const: perf + + resets: + maxItems: 1 + + required: + - compatible + - reg + - reg-names + - interrupts + - iommus + - power-domains + + additionalProperties: false examples: - | diff --git a/Documentation/devicetree/bindings/media/apple,scaler.yaml b/Documentation/devicetree/bindings/media/apple,scaler.yaml new file mode 100644 index 0000000000000..a1d21526658dd --- /dev/null +++ b/Documentation/devicetree/bindings/media/apple,scaler.yaml @@ -0,0 +1,117 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/apple,scaler.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple image scaler + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + The image scaler and its companion DMA registers. The two DART streams + carry image data and PIODMA transfers. Firmware performance votes are + not fixed clock rates and are not encoded as clock-frequency values. + +select: + properties: + compatible: + contains: + enum: + - apple,t6041-scaler + - apple,t8140-scaler + - apple,t8132-scaler + required: + - compatible + +allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t8132-scaler + required: + - compatible + then: + properties: + compatible: + items: + - enum: + - apple,t8132-scaler + - const: apple,scaler + + reg: + minItems: 4 + maxItems: 4 + + interrupts: + minItems: 2 + maxItems: 2 + + power-domains: + minItems: 1 + maxItems: 2 + + iommus: + minItems: 1 + maxItems: 2 + + clocks: + minItems: 1 + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - power-domains + - iommus + + additionalProperties: false + else: + properties: + compatible: + oneOf: + - items: + - const: apple,t6041-scaler + - const: apple,scaler + - items: + - const: apple,t8140-scaler + - const: apple,scaler + + reg: + minItems: 4 + maxItems: 4 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 2 + maxItems: 2 + + power-domains: + minItems: 2 + maxItems: 2 + + iommus: + minItems: 2 + maxItems: 2 + + clocks: + minItems: 1 + maxItems: 1 + + resets: + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - power-domains + - resets + - iommus + - clocks + + additionalProperties: false diff --git a/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml b/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml index dadb98b19f822..dd37dd32447b0 100644 --- a/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml +++ b/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml @@ -14,67 +14,126 @@ description: | preloaded by the bootloader. Its two DART instances translate the same stream. The bootloader supplies two reserved firmware regions and their IOVA mappings. -properties: - compatible: - enum: - - apple,t6000-ave - - apple,t6041-ave - - apple,t8112-ave - - apple,t8140-ave - - reg: - items: - - description: Codec registers - - description: Mailbox registers - - description: Coprocessor registers - - reg-names: - items: - - const: codec - - const: mailbox - - const: coproc - - interrupts: - items: - - description: Mailbox, raised when the firmware posts to a host ring - - description: Codec interrupt handled by the firmware - - description: Codec interrupt handled by the firmware - - description: Codec interrupt handled by the firmware - - description: Codec interrupt handled by the firmware - - power-domains: - minItems: 5 - maxItems: 6 - - power-domain-names: - minItems: 5 - items: - - const: dma - - const: pipe4 - - const: pipe5 - - const: me0 - - const: me1 - - const: perf - description: | - A performance floor the encoder needs to run at full speed, held - while the encoder is powered (for example the SoC rail floor of a - PMC). - - iommus: - maxItems: 2 - - memory-region: - items: - - description: Preloaded firmware text - - description: Preloaded firmware data - -required: - - compatible - - reg - - reg-names - - interrupts - - power-domains - - power-domain-names - - iommus - -additionalProperties: false +select: + properties: + compatible: + contains: + enum: + - apple,t6000-ave + - apple,t6041-ave + - apple,t8112-ave + - apple,t8140-ave + - apple,t8132-ave + required: + - compatible + +allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t8132-ave + required: + - compatible + then: + properties: + compatible: + items: + - enum: + - apple,t8132-ave + - const: apple,ave + + reg: + minItems: 5 + maxItems: 5 + + interrupts: + minItems: 5 + maxItems: 5 + + power-domains: + minItems: 1 + maxItems: 6 + + iommus: + minItems: 1 + maxItems: 2 + + clocks: + minItems: 1 + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - power-domains + - iommus + + additionalProperties: false + else: + properties: + compatible: + enum: + - apple,t6000-ave + - apple,t6041-ave + - apple,t8112-ave + - apple,t8140-ave + + reg: + items: + - description: Codec registers + - description: Mailbox registers + - description: Coprocessor registers + + reg-names: + items: + - const: codec + - const: mailbox + - const: coproc + + interrupts: + items: + - description: Mailbox, raised when the firmware posts to a host ring + - description: Codec interrupt handled by the firmware + - description: Codec interrupt handled by the firmware + - description: Codec interrupt handled by the firmware + - description: Codec interrupt handled by the firmware + + power-domains: + minItems: 5 + maxItems: 6 + + power-domain-names: + minItems: 5 + items: + - const: dma + - const: pipe4 + - const: pipe5 + - const: me0 + - const: me1 + - const: perf + description: | + A performance floor the encoder needs to run at full speed, held + while the encoder is powered (for example the SoC rail floor of a + PMC). + + iommus: + maxItems: 2 + + memory-region: + items: + - description: Preloaded firmware text + - description: Preloaded firmware data + + required: + - compatible + - reg + - reg-names + - interrupts + - power-domains + - power-domain-names + - iommus + + additionalProperties: false diff --git a/Documentation/devicetree/bindings/pwm/apple,pwm.yaml b/Documentation/devicetree/bindings/pwm/apple,pwm.yaml new file mode 100644 index 0000000000000..280a017a63018 --- /dev/null +++ b/Documentation/devicetree/bindings/pwm/apple,pwm.yaml @@ -0,0 +1,53 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/pwm/apple,pwm.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple M4 base SoC PWM controller + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Hardware resources of the M4 base SoC PWM controller. + The interface is described for discovery and must remain disabled until + its ownership, initialization and shutdown are supported. Register windows + are listed in hardware resource order; firmware configuration and tuning + data are supplied by the boot firmware rather than this binding. + +select: + properties: + compatible: + contains: + enum: + - apple,t8132-pwm + required: + - compatible + +properties: + compatible: + items: + - enum: + - apple,t8132-pwm + - const: apple,pwm + + reg: + minItems: 1 + maxItems: 1 + + interrupts: + minItems: 1 + maxItems: 1 + + power-domains: + minItems: 1 + maxItems: 1 + +required: + - compatible + - reg + - interrupts + - power-domains + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,aft.yaml b/Documentation/devicetree/bindings/soc/apple/apple,aft.yaml new file mode 100644 index 0000000000000..b2aefbcf15fad --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,aft.yaml @@ -0,0 +1,43 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/soc/apple/apple,aft.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple M4 base SoC fabric trace interface + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Hardware resources of the M4 base SoC fabric trace interface. + The interface is described for discovery and must remain disabled until + its ownership, initialization and shutdown are supported. Register windows + are listed in hardware resource order; firmware configuration and tuning + data are supplied by the boot firmware rather than this binding. + +select: + properties: + compatible: + contains: + enum: + - apple,t8132-aft + required: + - compatible + +properties: + compatible: + items: + - enum: + - apple,t8132-aft + - const: apple,aft + + reg: + minItems: 1 + maxItems: 1 + +required: + - compatible + - reg + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml b/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml new file mode 100644 index 0000000000000..538f63aa4e13d --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml @@ -0,0 +1,103 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/soc/apple/apple,aon-ptd.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple always-on power telemetry interrupt router + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Always-on power telemetry register banks and upstream interrupts. The + firmware owns the telemetry data and interrupt routing at boot. + +select: + properties: + compatible: + contains: + enum: + - apple,t6041-aon-ptd + - apple,t8140-aon-ptd + - apple,t8132-aon-ptd + required: + - compatible + +allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t8132-aon-ptd + required: + - compatible + then: + properties: + compatible: + items: + - enum: + - apple,t8132-aon-ptd + - const: apple,aon-ptd + + reg: + minItems: 4 + maxItems: 4 + + interrupts: + minItems: 32 + maxItems: 32 + + '#address-cells': + const: 0 + '#interrupt-cells': + const: 1 + interrupt-controller: true + + required: + - compatible + - reg + - interrupts + - interrupt-controller + - '#interrupt-cells' + - '#address-cells' + + additionalProperties: false + else: + properties: + compatible: + oneOf: + - items: + - const: apple,t6041-aon-ptd + - const: apple,aon-ptd + - items: + - const: apple,t8140-aon-ptd + - const: apple,aon-ptd + + reg: + minItems: 4 + maxItems: 4 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 32 + maxItems: 32 + + interrupt-controller: true + + '#interrupt-cells': + description: Firmware telemetry source identifier, plus flags on T8140. + enum: [1, 2] + + '#address-cells': + const: 0 + + required: + - compatible + - reg + - interrupts + - interrupt-controller + - '#interrupt-cells' + + additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,cpu-debug.yaml b/Documentation/devicetree/bindings/soc/apple/apple,cpu-debug.yaml new file mode 100644 index 0000000000000..6c02a181939f5 --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,cpu-debug.yaml @@ -0,0 +1,79 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/soc/apple/apple,cpu-debug.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple processor debug interface + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Processor debug register apertures. Access ownership must be established + before a debugger accesses this block. + +select: + properties: + compatible: + contains: + enum: + - apple,t6041-cpu-debug + - apple,t8132-cpu-debug + required: + - compatible + +allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t8132-cpu-debug + required: + - compatible + then: + properties: + compatible: + items: + - enum: + - apple,t8132-cpu-debug + - const: apple,cpu-debug + + reg: + minItems: 2 + maxItems: 2 + + interrupts: + minItems: 1 + maxItems: 1 + + required: + - compatible + - reg + - interrupts + + additionalProperties: false + else: + properties: + compatible: + oneOf: + - items: + - const: apple,t6041-cpu-debug + - const: apple,cpu-debug + + reg: + minItems: 2 + maxItems: 2 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 1 + maxItems: 1 + + required: + - compatible + - reg + - interrupts + + additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml b/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml new file mode 100644 index 0000000000000..dd73483d7edf4 --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml @@ -0,0 +1,93 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/soc/apple/apple,dwi.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple DWI controller + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + DWI hardware register window and interrupt. Register programming and + firmware ownership must be qualified before enabling the controller. + +select: + properties: + compatible: + contains: + enum: + - apple,t6041-dwi + - apple,t8140-dwi + - apple,t8132-dwi + required: + - compatible + +allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t8132-dwi + required: + - compatible + then: + properties: + compatible: + items: + - enum: + - apple,t8132-dwi + - const: apple,dwi + + reg: + minItems: 1 + maxItems: 1 + + interrupts: + minItems: 1 + maxItems: 1 + + power-domains: + minItems: 1 + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - power-domains + + additionalProperties: false + else: + properties: + compatible: + oneOf: + - items: + - const: apple,t6041-dwi + - const: apple,dwi + - items: + - const: apple,t8140-dwi + - const: apple,dwi + + reg: + minItems: 1 + maxItems: 1 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 1 + maxItems: 1 + + power-domains: + minItems: 1 + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - power-domains + + additionalProperties: false diff --git a/Documentation/devicetree/bindings/spmi/apple,spmi.yaml b/Documentation/devicetree/bindings/spmi/apple,spmi.yaml index 0b35a017bb808..9bd5d535a0fc2 100644 --- a/Documentation/devicetree/bindings/spmi/apple,spmi.yaml +++ b/Documentation/devicetree/bindings/spmi/apple,spmi.yaml @@ -39,7 +39,11 @@ properties: - const: apple,t8142-spmi reg: - maxItems: 1 + minItems: 1 + items: + - description: SPMI command interface + - description: SPMI interrupt interface + - description: SPMI auxiliary interface interrupts: maxItems: 1 diff --git a/arch/arm64/boot/dts/apple/t8132-j604-audio.dtsi b/arch/arm64/boot/dts/apple/t8132-j604-audio.dtsi new file mode 100644 index 0000000000000..87f67b94c6cdc --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8132-j604-audio.dtsi @@ -0,0 +1,84 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* J604 audio endpoints. Routing and protection qualification remain separate. */ + +#include +#include + +/ { + speaker_sdz: regulator-speaker-sdz { + compatible = "regulator-fixed"; + regulator-name = "speaker-sdz"; + gpios = <&pinctrl_ap 15 GPIO_ACTIVE_HIGH>; + enable-active-high; + status = "disabled"; + }; +}; + +&i2c1 { + jack_codec: codec@4b { + compatible = "cirrus,cs42l84"; + reg = <0x4b>; + reset-gpios = <&pinctrl_nub 17 GPIO_ACTIVE_HIGH>; + interrupts-extended = <&pinctrl_ap 98 IRQ_TYPE_LEVEL_LOW>; + #sound-dai-cells = <0>; + status = "disabled"; + }; +}; + +&i2c3 { + audio_speaker: codec@38 { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x38>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + interrupts-extended = <&pinctrl_ap 14 IRQ_TYPE_LEVEL_LOW>; + status = "disabled"; + }; + + audio_speaker_left_woofer_2: codec@39 { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x39>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + status = "disabled"; + }; + + audio_speaker_left_tweeter: codec@3a { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x3a>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + status = "disabled"; + }; + + audio_speaker_right_woofer_1: codec@3b { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x3b>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + status = "disabled"; + }; + + audio_speaker_right_woofer_2: codec@3c { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x3c>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + status = "disabled"; + }; + + audio_speaker_right_tweeter: codec@3d { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x3d>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + status = "disabled"; + }; + +}; diff --git a/arch/arm64/boot/dts/apple/t8132-j604.dts b/arch/arm64/boot/dts/apple/t8132-j604.dts index 8a065a6f47a7b..ddf4899e473f8 100644 --- a/arch/arm64/boot/dts/apple/t8132-j604.dts +++ b/arch/arm64/boot/dts/apple/t8132-j604.dts @@ -34,3 +34,5 @@ &fpwm1 { status = "okay"; }; + +#include "t8132-j604-audio.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8132-j623-audio.dtsi b/arch/arm64/boot/dts/apple/t8132-j623-audio.dtsi new file mode 100644 index 0000000000000..a2ac5784d78c9 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8132-j623-audio.dtsi @@ -0,0 +1,66 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* J623 audio endpoints. Routing and protection qualification remain separate. */ + +#include +#include + +/ { + speaker_sdz: regulator-speaker-sdz { + compatible = "regulator-fixed"; + regulator-name = "speaker-sdz"; + gpios = <&pinctrl_ap 15 GPIO_ACTIVE_HIGH>; + enable-active-high; + status = "disabled"; + }; +}; + +&i2c1 { + jack_codec: codec@4b { + compatible = "cirrus,cs42l84"; + reg = <0x4b>; + reset-gpios = <&pinctrl_nub 17 GPIO_ACTIVE_HIGH>; + interrupts-extended = <&pinctrl_ap 98 IRQ_TYPE_LEVEL_LOW>; + #sound-dai-cells = <0>; + status = "disabled"; + }; +}; + +&i2c3 { + audio_speaker: codec@38 { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x38>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + interrupts-extended = <&pinctrl_ap 14 IRQ_TYPE_LEVEL_LOW>; + status = "disabled"; + }; + + audio_speaker_left_tweeter: codec@39 { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x39>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + status = "disabled"; + }; + + audio_speaker_right_woofer: codec@3b { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x3b>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + status = "disabled"; + }; + + audio_speaker_right_tweeter: codec@3c { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x3c>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + status = "disabled"; + }; + +}; diff --git a/arch/arm64/boot/dts/apple/t8132-j623.dts b/arch/arm64/boot/dts/apple/t8132-j623.dts index 9b94a6ae74a20..e6b3bce6cdacc 100644 --- a/arch/arm64/boot/dts/apple/t8132-j623.dts +++ b/arch/arm64/boot/dts/apple/t8132-j623.dts @@ -17,3 +17,5 @@ model = "Apple iMac (24-inch, 2x USB-C, M4, 2024)"; chassis-type = "all-in-one"; }; + +#include "t8132-j623-audio.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8132-j624-audio.dtsi b/arch/arm64/boot/dts/apple/t8132-j624-audio.dtsi new file mode 100644 index 0000000000000..a7f91b5276e63 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8132-j624-audio.dtsi @@ -0,0 +1,66 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* J624 audio endpoints. Routing and protection qualification remain separate. */ + +#include +#include + +/ { + speaker_sdz: regulator-speaker-sdz { + compatible = "regulator-fixed"; + regulator-name = "speaker-sdz"; + gpios = <&pinctrl_ap 15 GPIO_ACTIVE_HIGH>; + enable-active-high; + status = "disabled"; + }; +}; + +&i2c1 { + jack_codec: codec@4b { + compatible = "cirrus,cs42l84"; + reg = <0x4b>; + reset-gpios = <&pinctrl_nub 17 GPIO_ACTIVE_HIGH>; + interrupts-extended = <&pinctrl_ap 98 IRQ_TYPE_LEVEL_LOW>; + #sound-dai-cells = <0>; + status = "disabled"; + }; +}; + +&i2c3 { + audio_speaker: codec@38 { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x38>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + interrupts-extended = <&pinctrl_ap 14 IRQ_TYPE_LEVEL_LOW>; + status = "disabled"; + }; + + audio_speaker_left_tweeter: codec@39 { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x39>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + status = "disabled"; + }; + + audio_speaker_right_woofer: codec@3b { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x3b>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + status = "disabled"; + }; + + audio_speaker_right_tweeter: codec@3c { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x3c>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + status = "disabled"; + }; + +}; diff --git a/arch/arm64/boot/dts/apple/t8132-j624.dts b/arch/arm64/boot/dts/apple/t8132-j624.dts index 37e1a46f89b84..115d9a47913f6 100644 --- a/arch/arm64/boot/dts/apple/t8132-j624.dts +++ b/arch/arm64/boot/dts/apple/t8132-j624.dts @@ -17,3 +17,5 @@ model = "Apple iMac (24-inch, 4x USB-C, M4, 2024)"; chassis-type = "all-in-one"; }; + +#include "t8132-j624-audio.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8132-j715-audio.dtsi b/arch/arm64/boot/dts/apple/t8132-j715-audio.dtsi new file mode 100644 index 0000000000000..55d87d672de6b --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8132-j715-audio.dtsi @@ -0,0 +1,84 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* J715 audio endpoints. Routing and protection qualification remain separate. */ + +#include +#include + +/ { + speaker_sdz: regulator-speaker-sdz { + compatible = "regulator-fixed"; + regulator-name = "speaker-sdz"; + gpios = <&pinctrl_ap 15 GPIO_ACTIVE_HIGH>; + enable-active-high; + status = "disabled"; + }; +}; + +&i2c1 { + jack_codec: codec@4b { + compatible = "cirrus,cs42l84"; + reg = <0x4b>; + reset-gpios = <&pinctrl_nub 17 GPIO_ACTIVE_HIGH>; + interrupts-extended = <&pinctrl_ap 98 IRQ_TYPE_LEVEL_LOW>; + #sound-dai-cells = <0>; + status = "disabled"; + }; +}; + +&i2c3 { + audio_speaker: codec@38 { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x38>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + interrupts-extended = <&pinctrl_ap 14 IRQ_TYPE_LEVEL_LOW>; + status = "disabled"; + }; + + audio_speaker_left_woofer_2: codec@3a { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x3a>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + status = "disabled"; + }; + + audio_speaker_left_tweeter: codec@39 { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x39>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + status = "disabled"; + }; + + audio_speaker_right_woofer_1: codec@3b { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x3b>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + status = "disabled"; + }; + + audio_speaker_right_woofer_2: codec@3d { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x3d>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + status = "disabled"; + }; + + audio_speaker_right_tweeter: codec@3c { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x3c>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + status = "disabled"; + }; + +}; diff --git a/arch/arm64/boot/dts/apple/t8132-j715.dts b/arch/arm64/boot/dts/apple/t8132-j715.dts index 1a387d273e8ff..4b66f453b71da 100644 --- a/arch/arm64/boot/dts/apple/t8132-j715.dts +++ b/arch/arm64/boot/dts/apple/t8132-j715.dts @@ -34,3 +34,5 @@ &fpwm1 { status = "okay"; }; + +#include "t8132-j715-audio.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8132-j773g-audio.dtsi b/arch/arm64/boot/dts/apple/t8132-j773g-audio.dtsi new file mode 100644 index 0000000000000..32131af267c34 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8132-j773g-audio.dtsi @@ -0,0 +1,39 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* J773G audio endpoints. Routing and protection qualification remain separate. */ + +#include +#include + +/ { + speaker_sdz: regulator-speaker-sdz { + compatible = "regulator-fixed"; + regulator-name = "speaker-sdz"; + gpios = <&pinctrl_ap 15 GPIO_ACTIVE_HIGH>; + enable-active-high; + status = "disabled"; + }; +}; + +&i2c1 { + jack_codec: codec@4b { + compatible = "cirrus,cs42l84"; + reg = <0x4b>; + reset-gpios = <&pinctrl_nub 17 GPIO_ACTIVE_HIGH>; + interrupts-extended = <&pinctrl_ap 98 IRQ_TYPE_LEVEL_LOW>; + #sound-dai-cells = <0>; + status = "disabled"; + }; +}; + +&i2c3 { + audio_speaker: codec@38 { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x38>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + interrupts-extended = <&pinctrl_ap 14 IRQ_TYPE_LEVEL_LOW>; + status = "disabled"; + }; + +}; diff --git a/arch/arm64/boot/dts/apple/t8132-j773g.dts b/arch/arm64/boot/dts/apple/t8132-j773g.dts index 2f16f8e62c06c..92541604cd719 100644 --- a/arch/arm64/boot/dts/apple/t8132-j773g.dts +++ b/arch/arm64/boot/dts/apple/t8132-j773g.dts @@ -24,3 +24,5 @@ &framebuffer0 { power-domains = <&ps_dispext0_fe>, <&ps_dptx_phy>; }; + +#include "t8132-j773g-audio.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8132-peripheral-buses.dtsi b/arch/arm64/boot/dts/apple/t8132-peripheral-buses.dtsi new file mode 100644 index 0000000000000..2554025a5ca13 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8132-peripheral-buses.dtsi @@ -0,0 +1,85 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* Unclaimed T8132 peripheral buses. */ + +&soc { + spi4: spi@3ad110000 { + compatible = "apple,t8132-spi", "apple,t8103-spi"; + reg = <0x3 0xad110000 0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + clocks = <&peripheral_clocks 422>; + power-domains = <&ps_spi4>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + nub_spmi_a1: spmi@388a08000 { + compatible = "apple,t8132-spmi", "apple,t8103-spmi"; + reg = <0x3 0x88a08000 0 0x4000>, + <0x3 0x88a04000 0 0x4000>, + <0x3 0x88a00000 0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + interrupt-controller; + #interrupt-cells = <2>; + #address-cells = <2>; + #size-cells = <0>; + status = "disabled"; + }; + + aop_spmi0: spmi@390914000 { + compatible = "apple,t8132-spmi", "apple,t8103-spmi"; + reg = <0x3 0x90914000 0 0x4000>, + <0x3 0x90904000 0 0x4000>, + <0x3 0x90900000 0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + interrupt-controller; + #interrupt-cells = <2>; + #address-cells = <2>; + #size-cells = <0>; + status = "disabled"; + }; + + nub_spmi1: spmi@388614000 { + compatible = "apple,t8132-spmi", "apple,t8103-spmi"; + reg = <0x3 0x88614000 0 0x4000>, + <0x3 0x88604000 0 0x4000>, + <0x3 0x88600000 0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + interrupt-controller; + #interrupt-cells = <2>; + #address-cells = <2>; + #size-cells = <0>; + status = "disabled"; + }; + + aop_spmi1: spmi@390b14000 { + compatible = "apple,t8132-spmi", "apple,t8103-spmi"; + reg = <0x3 0x90b14000 0 0x4000>, + <0x3 0x90b04000 0 0x4000>, + <0x3 0x90b00000 0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + interrupt-controller; + #interrupt-cells = <2>; + #address-cells = <2>; + #size-cells = <0>; + status = "disabled"; + }; + + spi3: spi@3ad10c000 { + compatible = "apple,t8132-spi", "apple,t8103-spi"; + reg = <0x3 0xad10c000 0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + clocks = <&peripheral_clocks 421>; + power-domains = <&ps_spi3>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + +}; diff --git a/arch/arm64/boot/dts/apple/t8132-peripherals.dtsi b/arch/arm64/boot/dts/apple/t8132-peripherals.dtsi new file mode 100644 index 0000000000000..3975e23c8a273 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8132-peripherals.dtsi @@ -0,0 +1,401 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* Additional T8132 hardware interfaces. Keep unclaimed engines disabled. */ + +&soc { + dart_scaler0: iommu@505260000 { + compatible = "apple,t8132-dart", "apple,t8110-dart"; + reg = <0x5 0x05260000 0x0 0x20000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dart_scaler1: filter@38079c000 { + compatible = "apple,t8132-gapf", "apple,gapf"; + reg = <0x3 0x8079c000 0x0 0x4000>; + status = "disabled"; + }; + + dart_jpeg00: iommu@3a5020000 { + compatible = "apple,t8132-dart", "apple,t8110-dart"; + reg = <0x3 0xa5020000 0x0 0xc000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dart_jpeg10: iommu@3a5080000 { + compatible = "apple,t8132-dart", "apple,t8110-dart"; + reg = <0x3 0xa5080000 0x0 0xc000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dart_ave0: iommu@421080000 { + compatible = "apple,t8132-dart", "apple,t8110-dart"; + reg = <0x4 0x21080000 0x0 0xc000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dart_ave1: iommu@4210a0000 { + compatible = "apple,t8132-dart", "apple,t8110-dart"; + reg = <0x4 0x210a0000 0x0 0xc000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dart_ave2: iommu@421094000 { + compatible = "apple,t8132-dart-smmu", "apple,dart-smmu"; + reg = <0x4 0x21094000 0x0 0x4000>; + status = "disabled"; + }; + + dart_ave3: filter@4210b0000 { + compatible = "apple,t8132-dapf", "apple,dapf"; + reg = <0x4 0x210b0000 0x0 0x4000>; + status = "disabled"; + }; + + dart_apr0: iommu@281020000 { + compatible = "apple,t8132-dart", "apple,t8110-dart"; + reg = <0x2 0x81020000 0x0 0xc000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dart_sio0: iommu@3ad060000 { + compatible = "apple,t8132-dart", "apple,t8110-dart"; + reg = <0x3 0xad060000 0x0 0xc000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + dart_aop_companion1: filter@390f10000 { + compatible = "apple,t8132-dapf", "apple,dapf"; + reg = <0x3 0x90f10000 0x0 0x4000>; + status = "disabled"; + }; + + dart_aop_companion2: filter@3882a4000 { + compatible = "apple,t8132-gapf", "apple,gapf"; + reg = <0x3 0x882a4000 0x0 0x4000>; + status = "disabled"; + }; + + dart_mtp_companion1: filter@394810000 { + compatible = "apple,t8132-dapf", "apple,dapf"; + reg = <0x3 0x94810000 0x0 0x4000>; + status = "disabled"; + }; + + dart_disp0_companion1: iommu@30a314000 { + compatible = "apple,t8132-dart-smmu", "apple,dart-smmu"; + reg = <0x3 0x0a314000 0x0 0x4000>; + status = "disabled"; + }; + + dart_dispext0_companion1: iommu@286314000 { + compatible = "apple,t8132-dart-smmu", "apple,dart-smmu"; + reg = <0x2 0x86314000 0x0 0x4000>; + status = "disabled"; + }; + + dart_dispext1_companion1: iommu@48a314000 { + compatible = "apple,t8132-dart-smmu", "apple,dart-smmu"; + reg = <0x4 0x8a314000 0x0 0x4000>; + status = "disabled"; + }; + + dart_isp_companion3: iommu@48e8f4000 { + compatible = "apple,t8132-dart-smmu", "apple,dart-smmu"; + reg = <0x4 0x8e8f4000 0x0 0x4000>; + status = "disabled"; + }; + + dart_isp_companion4: iommu@48e914000 { + compatible = "apple,t8132-dart-smmu", "apple,dart-smmu"; + reg = <0x4 0x8e914000 0x0 0x4000>; + status = "disabled"; + }; + + dart_isp_companion5: filter@48e8d0000 { + compatible = "apple,t8132-dapf", "apple,dapf"; + reg = <0x4 0x8e8d0000 0x0 0x4000>; + status = "disabled"; + }; + + dart_ane_companion3: filter@501810000 { + compatible = "apple,t8132-dapf", "apple,dapf"; + reg = <0x5 0x01810000 0x0 0x4000>; + status = "disabled"; + }; + + apcie0_piodma: dma-controller@490030000 { + compatible = "apple,t8132-pcie-piodma", "apple,pcie-piodma"; + reg = <0x4 0x90030000 0x0 0x4000>, + <0x4 0x90034000 0x0 0x4000>, + <0x4 0x90038000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + iommus = <&dart_apcie0 17>; + }; + + apciec0_piodma: dma-controller@404068000 { + compatible = "apple,t8132-pciec-piodma", "apple,pciec-piodma"; + reg = <0x4 0x04068000 0x0 0x4000>, + <0x4 0x0406c000 0x0 0x4000>, + <0x4 0x04070000 0x0 0x4000>, + <0x4 0x0403c000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + iommus = <&usb4_0_pcie_dart 254>; + }; + + atc0_dpin0: displayport@401e50000 { + compatible = "apple,t8132-dpin", "apple,dpin"; + reg = <0x4 0x01e50000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + atc0_dpin1: displayport@401e58000 { + compatible = "apple,t8132-dpin", "apple,dpin"; + reg = <0x4 0x01e58000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + apciec1_piodma: dma-controller@40c068000 { + compatible = "apple,t8132-pciec-piodma", "apple,pciec-piodma"; + reg = <0x4 0x0c068000 0x0 0x4000>, + <0x4 0x0c06c000 0x0 0x4000>, + <0x4 0x0c070000 0x0 0x4000>, + <0x4 0x0c03c000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + iommus = <&usb4_1_pcie_dart 254>; + }; + + atc1_dpin0: displayport@409e50000 { + compatible = "apple,t8132-dpin", "apple,dpin"; + reg = <0x4 0x09e50000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + atc1_dpin1: displayport@409e58000 { + compatible = "apple,t8132-dpin", "apple,dpin"; + reg = <0x4 0x09e58000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + dwi: dwi@380200000 { + compatible = "apple,t8132-dwi", "apple,dwi"; + reg = <0x3 0x80200000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_dwi>; + status = "disabled"; + }; + + pwm: pwm@3ad040000 { + compatible = "apple,t8132-pwm", "apple,pwm"; + reg = <0x3 0xad040000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_fpwm0>; + status = "disabled"; + }; + + aes: crypto@3ad00c000 { + compatible = "apple,t8132-aes", "apple,aes"; + reg = <0x3 0xad00c000 0x0 0x4000>, + <0x3 0x882dc000 0x0 0x8000>, + <0x3 0x88078000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_aes>; + iommus = <&dart_sio0 1>; + status = "disabled"; + }; + + aon_ptd: interrupt-controller@38c840000 { + compatible = "apple,t8132-aon-ptd", "apple,aon-ptd"; + reg = <0x3 0x8c840000 0x0 0x4000>, + <0x3 0x8c850000 0x0 0x4000>, + <0x3 0x8c858000 0x0 0x4000>, + <0x3 0x8c860000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + interrupt-controller; + #interrupt-cells = <1>; + #address-cells = <0>; + status = "disabled"; + }; + + dcp0_expert: display-sideband@3882b8044 { + compatible = "apple,t8132-dcp-expert", "apple,dcp-expert"; + reg = <0x3 0x882b8044 0x0 0xc>, + <0x3 0x88030000 0x0 0x4>; + status = "disabled"; + }; + + dcpext0_expert: display-sideband@3882b8044 { + compatible = "apple,t8132-dcp-expert", "apple,dcp-expert"; + reg = <0x3 0x882b8044 0x0 0xc>, + <0x3 0x88030000 0x0 0x4>; + status = "disabled"; + }; + + dcpext1_expert: display-sideband@3882b8044 { + compatible = "apple,t8132-dcp-expert", "apple,dcp-expert"; + reg = <0x3 0x882b8044 0x0 0xc>, + <0x3 0x88030000 0x0 0x4>; + status = "disabled"; + }; + + scaler0: scaler@505000000 { + compatible = "apple,t8132-scaler", "apple,scaler"; + reg = <0x5 0x05000000 0x0 0x38000>, + <0x5 0x05210000 0x0 0x4000>, + <0x5 0x05204000 0x0 0x4000>, + <0x5 0x04000000 0x0 0x8000>; + interrupt-parent = <&aic>; + interrupts = , + ; + power-domains = <&ps_msr>, <&ps_msr_ase_core>; + iommus = <&dart_scaler0 0>, <&dart_scaler0 1>; + clocks = <&peripheral_clocks 399>; + status = "disabled"; + }; + + jpeg0: jpeg@3a5000000 { + compatible = "apple,t8132-jpeg", "apple,jpeg"; + reg = <0x3 0xa5000000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_jpg>; + iommus = <&dart_jpeg00 0>; + clocks = <&peripheral_clocks 322>, <&peripheral_clocks 323>; + status = "disabled"; + }; + + jpeg1: jpeg@3a5060000 { + compatible = "apple,t8132-jpeg", "apple,jpeg"; + reg = <0x3 0xa5060000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_jpg>; + iommus = <&dart_jpeg10 0>; + clocks = <&peripheral_clocks 322>, <&peripheral_clocks 323>; + status = "disabled"; + }; + + ave: video-encoder@421100000 { + compatible = "apple,t8132-ave", "apple,ave"; + reg = <0x4 0x21100000 0x0 0x45c000>, + <0x4 0x21800000 0x0 0x800000>, + <0x4 0x21050000 0x0 0x4000>, + <0x3 0x80708000 0x0 0x4000>, + <0x4 0x20000000 0x0 0x1000000>; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + ; + power-domains = <&ps_venc_sys>, <&ps_venc_pipe4>, <&ps_venc_pipe5>, <&ps_venc_me0>, <&ps_venc_me1>, <&ps_venc_dma>; + iommus = <&dart_ave0 0>, <&dart_ave1 0>; + clocks = <&peripheral_clocks 430>; + status = "disabled"; + }; + + apr: video-codec@281000000 { + compatible = "apple,t8132-prores", "apple,prores"; + reg = <0x2 0x81000000 0x0 0x4000>, + <0x2 0x80000000 0x0 0x1000000>, + <0x2 0x810c0000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = , + ; + power-domains = <&ps_scodec>; + iommus = <&dart_apr0 1>; + status = "disabled"; + }; + + dbgCPU: debug@389700000 { + compatible = "apple,t8132-cpu-debug", "apple,cpu-debug"; + reg = <0x3 0x89700000 0x0 0x28000>, + <0x3 0x895c0000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + aft: trace@220180000 { + compatible = "apple,t8132-aft", "apple,aft"; + reg = <0x2 0x20180000 0x0 0xc000>; + status = "disabled"; + }; + +}; + +/ { + peripheral_clocks: clocks { + compatible = "apple,t8132-pmgr-clocks", "apple,pmgr-clocks"; + #clock-cells = <1>; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t8132.dtsi b/arch/arm64/boot/dts/apple/t8132.dtsi index 6ee608983784e..df18126f36def 100644 --- a/arch/arm64/boot/dts/apple/t8132.dtsi +++ b/arch/arm64/boot/dts/apple/t8132.dtsi @@ -1327,3 +1327,7 @@ }; #include "t8132-memory.dtsi" + +#include "t8132-peripherals.dtsi" + +#include "t8132-peripheral-buses.dtsi" From 5aec0a3c9690a6e124131eae4e9dace0a17ebbfa Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 00:21:52 +1100 Subject: [PATCH 02/10] dt-bindings: apple: close conditional resource contracts at the root Declare compatible at the schema root and close composed variants with unevaluatedProperties so every branch remains visible to the binding meta-schema. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../devicetree/bindings/clock/apple,pmgr-clocks.yaml | 6 ++++-- Documentation/devicetree/bindings/crypto/apple,aes.yaml | 6 ++++-- .../devicetree/bindings/display/apple,dcp-expert.yaml | 6 ++++-- Documentation/devicetree/bindings/display/apple,dpin.yaml | 6 ++++-- .../devicetree/bindings/dma/apple,pcie-piodma.yaml | 6 ++++-- .../devicetree/bindings/dma/apple,pciec-piodma.yaml | 6 ++++-- Documentation/devicetree/bindings/media/apple,jpeg.yaml | 7 +++++-- Documentation/devicetree/bindings/media/apple,prores.yaml | 7 +++++-- Documentation/devicetree/bindings/media/apple,scaler.yaml | 6 ++++-- .../devicetree/bindings/media/apple,t8140-ave.yaml | 6 ++++-- .../devicetree/bindings/soc/apple/apple,aon-ptd.yaml | 6 ++++-- .../devicetree/bindings/soc/apple/apple,cpu-debug.yaml | 6 ++++-- Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml | 6 ++++-- 13 files changed, 54 insertions(+), 26 deletions(-) diff --git a/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml b/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml index ff2b04cec515b..72af63f8c51bf 100644 --- a/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml +++ b/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml @@ -28,6 +28,9 @@ select: required: - compatible +properties: + compatible: true + allOf: - if: properties: @@ -51,7 +54,6 @@ allOf: - compatible - '#clock-cells' - additionalProperties: false else: properties: compatible: @@ -101,4 +103,4 @@ allOf: minItems: 44 maxItems: 44 - additionalProperties: false +unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/crypto/apple,aes.yaml b/Documentation/devicetree/bindings/crypto/apple,aes.yaml index ceedd32be134a..50103060ca238 100644 --- a/Documentation/devicetree/bindings/crypto/apple,aes.yaml +++ b/Documentation/devicetree/bindings/crypto/apple,aes.yaml @@ -24,6 +24,9 @@ select: required: - compatible +properties: + compatible: true + allOf: - if: properties: @@ -64,7 +67,6 @@ allOf: - power-domains - iommus - additionalProperties: false else: properties: compatible: @@ -100,4 +102,4 @@ allOf: - power-domains - iommus - additionalProperties: false +unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml b/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml index cf91ff82a2991..ce2d21a998997 100644 --- a/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml +++ b/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml @@ -25,6 +25,9 @@ select: required: - compatible +properties: + compatible: true + allOf: - if: properties: @@ -50,7 +53,6 @@ allOf: - compatible - reg - additionalProperties: false else: properties: compatible: @@ -76,4 +78,4 @@ allOf: - reg - interrupts - additionalProperties: false +unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/display/apple,dpin.yaml b/Documentation/devicetree/bindings/display/apple,dpin.yaml index 014f53b60bc82..ca06c55b87478 100644 --- a/Documentation/devicetree/bindings/display/apple,dpin.yaml +++ b/Documentation/devicetree/bindings/display/apple,dpin.yaml @@ -22,6 +22,9 @@ select: required: - compatible +properties: + compatible: true + allOf: - if: properties: @@ -52,7 +55,6 @@ allOf: - reg - interrupts - additionalProperties: false else: properties: compatible: @@ -75,4 +77,4 @@ allOf: - reg - interrupts - additionalProperties: false +unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml b/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml index dad43a69a71fe..56e3d12545fcd 100644 --- a/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml +++ b/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml @@ -23,6 +23,9 @@ select: required: - compatible +properties: + compatible: true + allOf: - if: properties: @@ -57,7 +60,6 @@ allOf: - interrupts - iommus - additionalProperties: false else: properties: compatible: @@ -85,4 +87,4 @@ allOf: - interrupts - iommus - additionalProperties: false +unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml b/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml index 560b49eb08159..0e634c76e7a5c 100644 --- a/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml +++ b/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml @@ -23,6 +23,9 @@ select: required: - compatible +properties: + compatible: true + allOf: - if: properties: @@ -57,7 +60,6 @@ allOf: - interrupts - iommus - additionalProperties: false else: properties: compatible: @@ -85,4 +87,4 @@ allOf: - interrupts - iommus - additionalProperties: false +unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/media/apple,jpeg.yaml b/Documentation/devicetree/bindings/media/apple,jpeg.yaml index 7dab8e2586674..4ab55ae8ca555 100644 --- a/Documentation/devicetree/bindings/media/apple,jpeg.yaml +++ b/Documentation/devicetree/bindings/media/apple,jpeg.yaml @@ -30,6 +30,9 @@ select: required: - compatible +properties: + compatible: true + allOf: - if: properties: @@ -74,7 +77,6 @@ allOf: - power-domains - iommus - additionalProperties: false else: properties: compatible: @@ -130,7 +132,8 @@ allOf: properties: apple,dma-range: false - additionalProperties: false + +unevaluatedProperties: false examples: - | diff --git a/Documentation/devicetree/bindings/media/apple,prores.yaml b/Documentation/devicetree/bindings/media/apple,prores.yaml index 1774c4c2ccef1..f4f5682232c9b 100644 --- a/Documentation/devicetree/bindings/media/apple,prores.yaml +++ b/Documentation/devicetree/bindings/media/apple,prores.yaml @@ -24,6 +24,9 @@ select: required: - compatible +properties: + compatible: true + allOf: - if: properties: @@ -64,7 +67,6 @@ allOf: - power-domains - iommus - additionalProperties: false else: properties: compatible: @@ -110,7 +112,8 @@ allOf: - iommus - power-domains - additionalProperties: false + +unevaluatedProperties: false examples: - | diff --git a/Documentation/devicetree/bindings/media/apple,scaler.yaml b/Documentation/devicetree/bindings/media/apple,scaler.yaml index a1d21526658dd..7bfdc9186c8cd 100644 --- a/Documentation/devicetree/bindings/media/apple,scaler.yaml +++ b/Documentation/devicetree/bindings/media/apple,scaler.yaml @@ -25,6 +25,9 @@ select: required: - compatible +properties: + compatible: true + allOf: - if: properties: @@ -69,7 +72,6 @@ allOf: - power-domains - iommus - additionalProperties: false else: properties: compatible: @@ -114,4 +116,4 @@ allOf: - iommus - clocks - additionalProperties: false +unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml b/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml index dd37dd32447b0..d4b298e10b808 100644 --- a/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml +++ b/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml @@ -27,6 +27,9 @@ select: required: - compatible +properties: + compatible: true + allOf: - if: properties: @@ -71,7 +74,6 @@ allOf: - power-domains - iommus - additionalProperties: false else: properties: compatible: @@ -136,4 +138,4 @@ allOf: - power-domain-names - iommus - additionalProperties: false +unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml b/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml index 538f63aa4e13d..8bbae84402259 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml @@ -24,6 +24,9 @@ select: required: - compatible +properties: + compatible: true + allOf: - if: properties: @@ -63,7 +66,6 @@ allOf: - '#interrupt-cells' - '#address-cells' - additionalProperties: false else: properties: compatible: @@ -100,4 +102,4 @@ allOf: - interrupt-controller - '#interrupt-cells' - additionalProperties: false +unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,cpu-debug.yaml b/Documentation/devicetree/bindings/soc/apple/apple,cpu-debug.yaml index 6c02a181939f5..3534851967ac2 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,cpu-debug.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,cpu-debug.yaml @@ -23,6 +23,9 @@ select: required: - compatible +properties: + compatible: true + allOf: - if: properties: @@ -53,7 +56,6 @@ allOf: - reg - interrupts - additionalProperties: false else: properties: compatible: @@ -76,4 +78,4 @@ allOf: - reg - interrupts - additionalProperties: false +unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml b/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml index dd73483d7edf4..326222250a664 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml @@ -24,6 +24,9 @@ select: required: - compatible +properties: + compatible: true + allOf: - if: properties: @@ -59,7 +62,6 @@ allOf: - interrupts - power-domains - additionalProperties: false else: properties: compatible: @@ -90,4 +92,4 @@ allOf: - interrupts - power-domains - additionalProperties: false +unevaluatedProperties: false From 269b22e0e08b9687cc15dfc6d50fa83b1174cf55 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 00:28:47 +1100 Subject: [PATCH 03/10] arm64: dts: apple: describe disabled T8132 platform error resources Add all 23 platform-error and 55 event-log register banks with their 34 and 12 interrupts. The preferred live J604, J713 and J773 descriptions agree with the sibling templates. Extend the existing EDAC contract while preserving the previous generations. Do not copy event policy, metadata tables or firmware tuning. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../edac/apple,soc-error-handler.yaml | 180 ++++++++++++------ .../boot/dts/apple/t8132-error-handlers.dtsi | 141 ++++++++++++++ arch/arm64/boot/dts/apple/t8132.dtsi | 2 + 3 files changed, 265 insertions(+), 58 deletions(-) create mode 100644 arch/arm64/boot/dts/apple/t8132-error-handlers.dtsi diff --git a/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml b/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml index 71053bd3841a5..b7c28c5e5271f 100644 --- a/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml +++ b/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml @@ -15,80 +15,144 @@ description: | fatal events latched by peripheral event logs. properties: - compatible: - oneOf: - - items: - - const: apple,t6041-error-handler - - const: apple,soc-error-handler - - items: - - const: apple,t8140-error-handler - - const: apple,soc-error-handler - - items: - - const: apple,t6041-event-log - - const: apple,soc-event-log - - items: - - const: apple,t8140-event-log - - const: apple,soc-event-log - - interrupts: - minItems: 9 - maxItems: 89 - - reg: - minItems: 25 - maxItems: 25 - description: | - T6041 per-source NI0 through NI6 status apertures, in interrupt order. - -required: - - compatible - - interrupts + compatible: true allOf: - if: properties: compatible: contains: - const: apple,t6041-error-handler - then: - properties: - interrupts: - minItems: 89 - maxItems: 89 + enum: + - apple,t8132-error-handler + - apple,t8132-event-log required: - - reg - - if: - properties: - compatible: - contains: - const: apple,t8140-error-handler + - compatible then: - properties: - interrupts: - minItems: 26 - maxItems: 26 - - if: properties: compatible: - contains: - const: apple,t6041-event-log - then: - properties: + oneOf: + - items: + - const: apple,t8132-error-handler + - const: apple,soc-error-handler + - items: + - const: apple,t8132-event-log + - const: apple,soc-event-log + + reg: + minItems: 23 + maxItems: 55 + description: Status apertures in hardware-description order. + interrupts: - minItems: 21 - maxItems: 21 - - if: + minItems: 12 + maxItems: 34 + + required: + - compatible + - reg + - interrupts + + allOf: + - if: + properties: + compatible: + contains: + const: apple,t8132-error-handler + then: + properties: + reg: + minItems: 23 + maxItems: 23 + interrupts: + minItems: 34 + maxItems: 34 + else: + properties: + reg: + minItems: 55 + maxItems: 55 + interrupts: + minItems: 12 + maxItems: 12 + + else: properties: compatible: - contains: - const: apple,t8140-event-log - then: - properties: + oneOf: + - items: + - const: apple,t6041-error-handler + - const: apple,soc-error-handler + - items: + - const: apple,t8140-error-handler + - const: apple,soc-error-handler + - items: + - const: apple,t6041-event-log + - const: apple,soc-event-log + - items: + - const: apple,t8140-event-log + - const: apple,soc-event-log + interrupts: minItems: 9 - maxItems: 9 + maxItems: 89 + + reg: + minItems: 25 + maxItems: 25 + description: | + T6041 per-source NI0 through NI6 status apertures, in interrupt order. + + required: + - compatible + - interrupts + + allOf: + - if: + properties: + compatible: + contains: + const: apple,t6041-error-handler + then: + properties: + interrupts: + minItems: 89 + maxItems: 89 + required: + - reg + - if: + properties: + compatible: + contains: + const: apple,t8140-error-handler + then: + properties: + interrupts: + minItems: 26 + maxItems: 26 + - if: + properties: + compatible: + contains: + const: apple,t6041-event-log + then: + properties: + interrupts: + minItems: 21 + maxItems: 21 + - if: + properties: + compatible: + contains: + const: apple,t8140-event-log + then: + properties: + interrupts: + minItems: 9 + maxItems: 9 + + additionalProperties: false -additionalProperties: false +unevaluatedProperties: false examples: - | diff --git a/arch/arm64/boot/dts/apple/t8132-error-handlers.dtsi b/arch/arm64/boot/dts/apple/t8132-error-handlers.dtsi new file mode 100644 index 0000000000000..55d213f1104c2 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8132-error-handlers.dtsi @@ -0,0 +1,141 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* T8132 platform error and event-log resources. Firmware policy is not copied. */ + +&soc { + soc_errors: error-handler@3a8e00000 { + compatible = "apple,t8132-error-handler", "apple,soc-error-handler"; + reg = <0x3 0xa8e00000 0x0 0x40000>, + <0x3 0xa8a00000 0x0 0x8000>, + <0x3 0x80000000 0x0 0x7c000>, + <0x3 0x80700000 0x0 0xcc000>, + <0x3 0x882c8000 0x0 0x4000>, + <0x3 0x803d0000 0x0 0x4000>, + <0x3 0x82000000 0x0 0x1000000>, + <0x2 0x20000000 0x0 0x2000000>, + <0x2 0x22000000 0x0 0x2000000>, + <0x2 0x60000000 0x0 0x4000>, + <0x2 0x61000000 0x0 0x4000>, + <0x2 0x62000000 0x0 0x4000>, + <0x2 0x63000000 0x0 0x4000>, + <0x2 0x64000000 0x0 0x4000>, + <0x2 0x65000000 0x0 0x4000>, + <0x2 0x66000000 0x0 0x4000>, + <0x2 0x67000000 0x0 0x4000>, + <0x2 0x4f000000 0x0 0x1000000>, + <0x2 0x69000000 0x0 0x20000>, + <0x2 0x68032000 0x0 0x1000>, + <0x2 0x68432000 0x0 0x1000>, + <0x2 0x68832000 0x0 0x1000>, + <0x2 0x68c32000 0x0 0x1000>; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + status = "disabled"; + }; + + soc_events: event-log-handler@380700000 { + compatible = "apple,t8132-event-log", "apple,soc-event-log"; + reg = <0x3 0x80700000 0x0 0xcc000>, + <0x3 0x88280000 0x0 0x80000>, + <0x3 0x80000000 0x0 0x70000>, + <0x3 0x88200000 0x0 0x7c000>, + <0x3 0x80280000 0x0 0x80000>, + <0x3 0x80280000 0x0 0x8000>, + <0x5 0x01878000 0x0 0x4000>, + <0x5 0x01868000 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 0x82800000 0x0 0xbc000>, + <0x3 0x82900000 0x0 0x4000>, + <0x3 0x00e1c000 0x0 0x4000>, + <0x3 0x00e1f800 0x0 0x4000>, + <0x3 0x00e28000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + ; + status = "disabled"; + }; + +}; diff --git a/arch/arm64/boot/dts/apple/t8132.dtsi b/arch/arm64/boot/dts/apple/t8132.dtsi index df18126f36def..453a230e9c712 100644 --- a/arch/arm64/boot/dts/apple/t8132.dtsi +++ b/arch/arm64/boot/dts/apple/t8132.dtsi @@ -1331,3 +1331,5 @@ #include "t8132-peripherals.dtsi" #include "t8132-peripheral-buses.dtsi" + +#include "t8132-error-handlers.dtsi" From 6de4b8e4a92ae4a0394879a32790d0c49a4586df Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 00:30:54 +1100 Subject: [PATCH 04/10] arm64: dts: apple: describe disabled T8132 SIO resources Record both SIO register windows, the ASC mailbox, DART stream, power gate and hardware clock IDs. Reuse the SIO binding and require the unqualified T8132 layout to remain disabled without inventing a firmware channel count. Preserve the existing channel-count requirement on earlier supported layouts. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../devicetree/bindings/dma/apple,sio.yaml | 42 ++++++++++++++++++- arch/arm64/boot/dts/apple/t8132-sio.dtsi | 31 ++++++++++++++ arch/arm64/boot/dts/apple/t8132.dtsi | 2 + 3 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 arch/arm64/boot/dts/apple/t8132-sio.dtsi diff --git a/Documentation/devicetree/bindings/dma/apple,sio.yaml b/Documentation/devicetree/bindings/dma/apple,sio.yaml index 2498a7adaf410..d2af5f0134cfc 100644 --- a/Documentation/devicetree/bindings/dma/apple,sio.yaml +++ b/Documentation/devicetree/bindings/dma/apple,sio.yaml @@ -12,12 +12,41 @@ description: being a pretend DMA controller. The SoC-specific compatible selects the firmware protocol and channel configuration. In particular, apple,t6030-sio requires protocol-10 boot tables before the coprocessor can be started. + The T8132 resource description remains disabled until its channel layout + and firmware handoff are supported; its channel count is not guessed. maintainers: - Martin PoviĊĦer allOf: - $ref: dma-controller.yaml# + - if: + properties: + compatible: + contains: + const: apple,t8132-sio + required: + - compatible + then: + properties: + reg: + minItems: 2 + maxItems: 2 + clocks: + minItems: 3 + maxItems: 3 + status: + const: disabled + required: + - clocks + - status + else: + properties: + reg: + maxItems: 1 + clocks: false + required: + - dma-channels properties: compatible: @@ -29,12 +58,22 @@ properties: - apple,t6030-sio - apple,t8103-sio - apple,t8112-sio + - apple,t8132-sio - const: apple,sio - description: T6041 firmware requires a generation-specific backend. const: apple,t6041-sio reg: - maxItems: 1 + minItems: 1 + maxItems: 2 + description: + Coprocessor register window, followed by an auxiliary window on T8132. + + clocks: + maxItems: 3 + description: Hardware clock identifiers for the T8132 SIO interface. + + status: true '#dma-cells': const: 1 @@ -97,7 +136,6 @@ required: - compatible - reg - '#dma-cells' - - dma-channels - mboxes - iommus - power-domains diff --git a/arch/arm64/boot/dts/apple/t8132-sio.dtsi b/arch/arm64/boot/dts/apple/t8132-sio.dtsi new file mode 100644 index 0000000000000..b9f37423fb9bb --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8132-sio.dtsi @@ -0,0 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* T8132 SIO resources; channel layout and firmware regions require loader support. */ + +&soc { + sio_mbox: mailbox@3ade08000 { + compatible = "apple,t8132-asc-mailbox", "apple,asc-mailbox-v4"; + reg = <0x3 0xade08000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = , + , + , + ; + interrupt-names = "send-empty", "send-not-empty", + "recv-empty", "recv-not-empty"; + #mbox-cells = <0>; + power-domains = <&ps_sio_cpu>; + status = "disabled"; + }; + + sio: dma-controller@3ade00000 { + compatible = "apple,t8132-sio", "apple,sio"; + reg = <0x3 0xade00000 0x0 0x88000>, + <0x3 0xad850000 0x0 0x4000>; + #dma-cells = <1>; + mboxes = <&sio_mbox>; + iommus = <&dart_sio0 0>; + power-domains = <&ps_sio_cpu>; + clocks = <&peripheral_clocks 416>, <&peripheral_clocks 414>, <&peripheral_clocks 415>; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t8132.dtsi b/arch/arm64/boot/dts/apple/t8132.dtsi index 453a230e9c712..c4a6efc34b5c2 100644 --- a/arch/arm64/boot/dts/apple/t8132.dtsi +++ b/arch/arm64/boot/dts/apple/t8132.dtsi @@ -1333,3 +1333,5 @@ #include "t8132-peripheral-buses.dtsi" #include "t8132-error-handlers.dtsi" + +#include "t8132-sio.dtsi" From d7b38d5eec84947bfeb01d5e9451f38c6c4b616f Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 00:34:02 +1100 Subject: [PATCH 05/10] dt-bindings: apple: fix single-entry resource constraints Use maxItems alone for fixed single-entry resources, as required by the DT meta-schema, and remove extra blank lines reported by yamllint. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- Documentation/devicetree/bindings/crypto/apple,aes.yaml | 6 ------ .../devicetree/bindings/display/apple,dcp-expert.yaml | 1 - Documentation/devicetree/bindings/display/apple,dpin.yaml | 4 ---- .../devicetree/bindings/dma/apple,pcie-piodma.yaml | 3 --- .../devicetree/bindings/dma/apple,pciec-piodma.yaml | 3 --- Documentation/devicetree/bindings/iommu/apple,dapf.yaml | 1 - .../devicetree/bindings/iommu/apple,dart-smmu.yaml | 1 - Documentation/devicetree/bindings/iommu/apple,gapf.yaml | 1 - Documentation/devicetree/bindings/media/apple,jpeg.yaml | 5 ----- Documentation/devicetree/bindings/media/apple,prores.yaml | 3 --- Documentation/devicetree/bindings/media/apple,scaler.yaml | 2 -- .../devicetree/bindings/media/apple,t8140-ave.yaml | 1 - Documentation/devicetree/bindings/pwm/apple,pwm.yaml | 3 --- Documentation/devicetree/bindings/soc/apple/apple,aft.yaml | 1 - .../devicetree/bindings/soc/apple/apple,cpu-debug.yaml | 2 -- Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml | 6 ------ 16 files changed, 43 deletions(-) diff --git a/Documentation/devicetree/bindings/crypto/apple,aes.yaml b/Documentation/devicetree/bindings/crypto/apple,aes.yaml index 50103060ca238..421c0e155cd45 100644 --- a/Documentation/devicetree/bindings/crypto/apple,aes.yaml +++ b/Documentation/devicetree/bindings/crypto/apple,aes.yaml @@ -49,15 +49,12 @@ allOf: maxItems: 3 interrupts: - minItems: 1 maxItems: 1 power-domains: - minItems: 1 maxItems: 1 iommus: - minItems: 1 maxItems: 1 required: @@ -84,15 +81,12 @@ allOf: description: Register apertures in hardware-description order. interrupts: - minItems: 1 maxItems: 1 power-domains: - minItems: 1 maxItems: 1 iommus: - minItems: 1 maxItems: 1 required: diff --git a/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml b/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml index ce2d21a998997..1109c9aa92d3d 100644 --- a/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml +++ b/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml @@ -70,7 +70,6 @@ allOf: description: Register apertures in hardware-description order. interrupts: - minItems: 1 maxItems: 1 required: diff --git a/Documentation/devicetree/bindings/display/apple,dpin.yaml b/Documentation/devicetree/bindings/display/apple,dpin.yaml index ca06c55b87478..e546c797823ef 100644 --- a/Documentation/devicetree/bindings/display/apple,dpin.yaml +++ b/Documentation/devicetree/bindings/display/apple,dpin.yaml @@ -43,11 +43,9 @@ allOf: - const: apple,dpin reg: - minItems: 1 maxItems: 1 interrupts: - minItems: 1 maxItems: 1 required: @@ -64,12 +62,10 @@ allOf: - const: apple,dpin reg: - minItems: 1 maxItems: 1 description: Register apertures in hardware-description order. interrupts: - minItems: 1 maxItems: 1 required: diff --git a/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml b/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml index 56e3d12545fcd..71e265a9e6227 100644 --- a/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml +++ b/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml @@ -48,7 +48,6 @@ allOf: maxItems: 3 interrupts: - minItems: 1 maxItems: 1 iommus: @@ -74,11 +73,9 @@ allOf: description: Register apertures in hardware-description order. interrupts: - minItems: 1 maxItems: 1 iommus: - minItems: 1 maxItems: 1 required: diff --git a/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml b/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml index 0e634c76e7a5c..2384c367873df 100644 --- a/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml +++ b/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml @@ -48,7 +48,6 @@ allOf: maxItems: 4 interrupts: - minItems: 1 maxItems: 1 iommus: @@ -74,11 +73,9 @@ allOf: description: Register apertures in hardware-description order. interrupts: - minItems: 1 maxItems: 1 iommus: - minItems: 1 maxItems: 1 required: diff --git a/Documentation/devicetree/bindings/iommu/apple,dapf.yaml b/Documentation/devicetree/bindings/iommu/apple,dapf.yaml index d5637a060feb1..ec1ccaf8faf01 100644 --- a/Documentation/devicetree/bindings/iommu/apple,dapf.yaml +++ b/Documentation/devicetree/bindings/iommu/apple,dapf.yaml @@ -33,7 +33,6 @@ properties: - const: apple,dapf reg: - minItems: 1 maxItems: 1 required: diff --git a/Documentation/devicetree/bindings/iommu/apple,dart-smmu.yaml b/Documentation/devicetree/bindings/iommu/apple,dart-smmu.yaml index cc2e2382852bc..2dc197662868c 100644 --- a/Documentation/devicetree/bindings/iommu/apple,dart-smmu.yaml +++ b/Documentation/devicetree/bindings/iommu/apple,dart-smmu.yaml @@ -33,7 +33,6 @@ properties: - const: apple,dart-smmu reg: - minItems: 1 maxItems: 1 required: diff --git a/Documentation/devicetree/bindings/iommu/apple,gapf.yaml b/Documentation/devicetree/bindings/iommu/apple,gapf.yaml index 1dcf32e31c8e4..60dc0758046fe 100644 --- a/Documentation/devicetree/bindings/iommu/apple,gapf.yaml +++ b/Documentation/devicetree/bindings/iommu/apple,gapf.yaml @@ -33,7 +33,6 @@ properties: - const: apple,gapf reg: - minItems: 1 maxItems: 1 required: diff --git a/Documentation/devicetree/bindings/media/apple,jpeg.yaml b/Documentation/devicetree/bindings/media/apple,jpeg.yaml index 4ab55ae8ca555..7b7a4d7fe5f9f 100644 --- a/Documentation/devicetree/bindings/media/apple,jpeg.yaml +++ b/Documentation/devicetree/bindings/media/apple,jpeg.yaml @@ -51,19 +51,15 @@ allOf: - const: apple,jpeg reg: - minItems: 1 maxItems: 1 interrupts: - minItems: 1 maxItems: 1 power-domains: - minItems: 1 maxItems: 1 iommus: - minItems: 1 maxItems: 1 clocks: @@ -132,7 +128,6 @@ allOf: properties: apple,dma-range: false - unevaluatedProperties: false examples: diff --git a/Documentation/devicetree/bindings/media/apple,prores.yaml b/Documentation/devicetree/bindings/media/apple,prores.yaml index f4f5682232c9b..5a5f429c157be 100644 --- a/Documentation/devicetree/bindings/media/apple,prores.yaml +++ b/Documentation/devicetree/bindings/media/apple,prores.yaml @@ -53,11 +53,9 @@ allOf: maxItems: 2 power-domains: - minItems: 1 maxItems: 1 iommus: - minItems: 1 maxItems: 1 required: @@ -112,7 +110,6 @@ allOf: - iommus - power-domains - unevaluatedProperties: false examples: diff --git a/Documentation/devicetree/bindings/media/apple,scaler.yaml b/Documentation/devicetree/bindings/media/apple,scaler.yaml index 7bfdc9186c8cd..a96b5bfefc1ac 100644 --- a/Documentation/devicetree/bindings/media/apple,scaler.yaml +++ b/Documentation/devicetree/bindings/media/apple,scaler.yaml @@ -62,7 +62,6 @@ allOf: maxItems: 2 clocks: - minItems: 1 maxItems: 1 required: @@ -101,7 +100,6 @@ allOf: maxItems: 2 clocks: - minItems: 1 maxItems: 1 resets: diff --git a/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml b/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml index d4b298e10b808..7785f79b0bbb6 100644 --- a/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml +++ b/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml @@ -64,7 +64,6 @@ allOf: maxItems: 2 clocks: - minItems: 1 maxItems: 1 required: diff --git a/Documentation/devicetree/bindings/pwm/apple,pwm.yaml b/Documentation/devicetree/bindings/pwm/apple,pwm.yaml index 280a017a63018..3a044bb014a08 100644 --- a/Documentation/devicetree/bindings/pwm/apple,pwm.yaml +++ b/Documentation/devicetree/bindings/pwm/apple,pwm.yaml @@ -33,15 +33,12 @@ properties: - const: apple,pwm reg: - minItems: 1 maxItems: 1 interrupts: - minItems: 1 maxItems: 1 power-domains: - minItems: 1 maxItems: 1 required: diff --git a/Documentation/devicetree/bindings/soc/apple/apple,aft.yaml b/Documentation/devicetree/bindings/soc/apple/apple,aft.yaml index b2aefbcf15fad..cbde514ecb979 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,aft.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,aft.yaml @@ -33,7 +33,6 @@ properties: - const: apple,aft reg: - minItems: 1 maxItems: 1 required: diff --git a/Documentation/devicetree/bindings/soc/apple/apple,cpu-debug.yaml b/Documentation/devicetree/bindings/soc/apple/apple,cpu-debug.yaml index 3534851967ac2..14d835cf2dfc9 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,cpu-debug.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,cpu-debug.yaml @@ -48,7 +48,6 @@ allOf: maxItems: 2 interrupts: - minItems: 1 maxItems: 1 required: @@ -70,7 +69,6 @@ allOf: description: Register apertures in hardware-description order. interrupts: - minItems: 1 maxItems: 1 required: diff --git a/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml b/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml index 326222250a664..db40a73c47e8a 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml @@ -45,15 +45,12 @@ allOf: - const: apple,dwi reg: - minItems: 1 maxItems: 1 interrupts: - minItems: 1 maxItems: 1 power-domains: - minItems: 1 maxItems: 1 required: @@ -74,16 +71,13 @@ allOf: - const: apple,dwi reg: - minItems: 1 maxItems: 1 description: Register apertures in hardware-description order. interrupts: - minItems: 1 maxItems: 1 power-domains: - minItems: 1 maxItems: 1 required: From d7297b0f5fc404cdf1f4b42d681e147ce6affa0a Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 01:03:14 +1100 Subject: [PATCH 06/10] arm64: dts: apple: describe disabled T8132 video decoder resources Describe the full decoder aperture, primary DART bank and three DMA streams from the preferred live descriptions, with the hardware clock and physical power domain. Reuse the AVD binding with a disabled full-window variant while preserving existing driver layouts. Select all described AVD and EDAC variants explicitly so conditional resource contracts remain active. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../edac/apple,soc-error-handler.yaml | 14 ++ .../devicetree/bindings/media/apple,avd.yaml | 217 ++++++++++++------ arch/arm64/boot/dts/apple/t8132-avd.dtsi | 25 ++ arch/arm64/boot/dts/apple/t8132.dtsi | 2 + 4 files changed, 187 insertions(+), 71 deletions(-) create mode 100644 arch/arm64/boot/dts/apple/t8132-avd.dtsi diff --git a/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml b/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml index b7c28c5e5271f..ba719e477ffae 100644 --- a/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml +++ b/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml @@ -14,6 +14,20 @@ description: | errors to dedicated platform interrupt groups. A second group reports fatal events latched by peripheral event logs. +select: + properties: + compatible: + contains: + enum: + - apple,t6041-error-handler + - apple,t6041-event-log + - apple,t8132-error-handler + - apple,t8132-event-log + - apple,t8140-error-handler + - apple,t8140-event-log + required: + - compatible + properties: compatible: true diff --git a/Documentation/devicetree/bindings/media/apple,avd.yaml b/Documentation/devicetree/bindings/media/apple,avd.yaml index 1187255b0f474..294717fa3d637 100644 --- a/Documentation/devicetree/bindings/media/apple,avd.yaml +++ b/Documentation/devicetree/bindings/media/apple,avd.yaml @@ -8,88 +8,163 @@ title: Apple AVD (Apple Video Decoder) description: AVD is a video decode block present on all apple silicon devices. + The T8132 full-window description is kept disabled until its firmware, + reset and driver register-layout contracts are qualified. It does not + select the four-window layout used by an enabled decoder driver. maintainers: - Sofus -properties: - compatible: - oneOf: - - items: - - enum: - - apple,t6030-avd - - apple,t6031-avd - - const: apple,t8122-avd - - items: - - const: apple,t6041-max-avd - - const: apple,t6041-avd - - const: apple,t8132-avd - - items: - - const: apple,t6041-avd - - const: apple,t8132-avd - - enum: - - apple,t8103-avd +select: + properties: + compatible: + contains: + enum: - apple,t6000-avd - - apple,t8112-avd - apple,t6020-avd + - apple,t6030-avd + - apple,t6031-avd + - apple,t6041-avd + - apple,t6041-max-avd + - apple,t8103-avd + - apple,t8112-avd - apple,t8122-avd - apple,t8132-avd - apple,t8140-avd - apple,t8142-avd + required: + - compatible - reg: - items: - - description: cm3 code - - description: cm3 sram - - description: mbox registers - - description: decode ctrl registers - - reg-names: - items: - - const: code - - const: sram - - const: mbox - - const: ctrl - - iommus: - minItems: 1 - maxItems: 3 - - power-domains: - minItems: 1 - items: - - description: decoder power state - - description: performance floor (PMC rail or PMP device level) held while decoding - - power-domain-names: - minItems: 1 - items: - - const: core - - const: perf - - resets: - maxItems: 1 - - interrupts: - minItems: 2 - items: - - description: mailbox 0 - - description: mailbox 1 - - description: mailbox 2 - - description: mailbox 3 - - description: flag 0 - - description: flag 1 - -required: - - compatible - - reg - - interrupts - - reg-names - - iommus - - power-domains - - resets - -additionalProperties: false +properties: + compatible: true + +allOf: + - if: + properties: + compatible: + contains: + const: apple,avd + required: + - compatible + then: + properties: + compatible: + items: + - const: apple,t8132-avd + - const: apple,avd + + reg: + maxItems: 1 + description: Complete decoder register aperture. + + interrupts: + minItems: 2 + maxItems: 2 + + iommus: + minItems: 3 + maxItems: 3 + description: Decoder, PIODMA and auxiliary-data streams, in that order. + + power-domains: + maxItems: 1 + + clocks: + maxItems: 1 + + status: + const: disabled + + required: + - compatible + - reg + - interrupts + - iommus + - power-domains + - clocks + - status + + else: + properties: + compatible: + oneOf: + - items: + - enum: + - apple,t6030-avd + - apple,t6031-avd + - const: apple,t8122-avd + - items: + - const: apple,t6041-max-avd + - const: apple,t6041-avd + - const: apple,t8132-avd + - items: + - const: apple,t6041-avd + - const: apple,t8132-avd + - enum: + - apple,t8103-avd + - apple,t6000-avd + - apple,t8112-avd + - apple,t6020-avd + - apple,t8122-avd + - apple,t8132-avd + - apple,t8140-avd + - apple,t8142-avd + + reg: + items: + - description: cm3 code + - description: cm3 sram + - description: mbox registers + - description: decode ctrl registers + + reg-names: + items: + - const: code + - const: sram + - const: mbox + - const: ctrl + + iommus: + minItems: 1 + maxItems: 3 + + power-domains: + minItems: 1 + items: + - description: decoder power state + - description: performance floor (PMC rail or PMP device level) held while decoding + + power-domain-names: + minItems: 1 + items: + - const: core + - const: perf + + resets: + maxItems: 1 + + interrupts: + minItems: 2 + items: + - description: mailbox 0 + - description: mailbox 1 + - description: mailbox 2 + - description: mailbox 3 + - description: flag 0 + - description: flag 1 + + required: + - compatible + - reg + - interrupts + - reg-names + - iommus + - power-domains + - resets + + additionalProperties: false + +unevaluatedProperties: false examples: - | diff --git a/arch/arm64/boot/dts/apple/t8132-avd.dtsi b/arch/arm64/boot/dts/apple/t8132-avd.dtsi new file mode 100644 index 0000000000000..abb3f8b206cd9 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8132-avd.dtsi @@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* T8132 decoder resource windows. The driver register layout is not selected here. */ + +&soc { + avd_dart: iommu@3a1020000 { + compatible = "apple,t8132-dart", "apple,t8110-dart"; + reg = <0x3 0xa1020000 0x0 0x20000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + avd: video-decoder@3a0000000 { + compatible = "apple,t8132-avd", "apple,avd"; + reg = <0x3 0xa0000000 0x0 0x1404000>; + interrupt-parent = <&aic>; + interrupts = , + ; + iommus = <&avd_dart 0>, <&avd_dart 1>, <&avd_dart 2>; + power-domains = <&ps_avd_sys>; + clocks = <&peripheral_clocks 361>; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t8132.dtsi b/arch/arm64/boot/dts/apple/t8132.dtsi index c4a6efc34b5c2..8473b22d1a5cf 100644 --- a/arch/arm64/boot/dts/apple/t8132.dtsi +++ b/arch/arm64/boot/dts/apple/t8132.dtsi @@ -1335,3 +1335,5 @@ #include "t8132-error-handlers.dtsi" #include "t8132-sio.dtsi" + +#include "t8132-avd.dtsi" From feeb58824bec965560f17b6c14807440cf792837 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 01:36:17 +1100 Subject: [PATCH 07/10] arm64: dts: apple: honor the DT2 debug and trace waiver Remove the newly described T8132 debug and trace interfaces under ADDENDUM 3. Keep the merged debug binding unchanged, and share the generic single-bank protection-filter contracts with the T6032 descriptions. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../devicetree/bindings/iommu/apple,dapf.yaml | 2 + .../bindings/iommu/apple,dart-smmu.yaml | 2 + .../bindings/soc/apple/apple,aft.yaml | 42 ---------- .../bindings/soc/apple/apple,cpu-debug.yaml | 84 +++++-------------- .../boot/dts/apple/t8132-peripherals.dtsi | 15 ---- 5 files changed, 24 insertions(+), 121 deletions(-) delete mode 100644 Documentation/devicetree/bindings/soc/apple/apple,aft.yaml diff --git a/Documentation/devicetree/bindings/iommu/apple,dapf.yaml b/Documentation/devicetree/bindings/iommu/apple,dapf.yaml index ec1ccaf8faf01..e5e0b751125c3 100644 --- a/Documentation/devicetree/bindings/iommu/apple,dapf.yaml +++ b/Documentation/devicetree/bindings/iommu/apple,dapf.yaml @@ -21,6 +21,7 @@ select: compatible: contains: enum: + - apple,t6032-dapf - apple,t8132-dapf required: - compatible @@ -29,6 +30,7 @@ properties: compatible: items: - enum: + - apple,t6032-dapf - apple,t8132-dapf - const: apple,dapf diff --git a/Documentation/devicetree/bindings/iommu/apple,dart-smmu.yaml b/Documentation/devicetree/bindings/iommu/apple,dart-smmu.yaml index 2dc197662868c..7bab75d28b87d 100644 --- a/Documentation/devicetree/bindings/iommu/apple,dart-smmu.yaml +++ b/Documentation/devicetree/bindings/iommu/apple,dart-smmu.yaml @@ -21,6 +21,7 @@ select: compatible: contains: enum: + - apple,t6032-dart-smmu - apple,t8132-dart-smmu required: - compatible @@ -29,6 +30,7 @@ properties: compatible: items: - enum: + - apple,t6032-dart-smmu - apple,t8132-dart-smmu - const: apple,dart-smmu diff --git a/Documentation/devicetree/bindings/soc/apple/apple,aft.yaml b/Documentation/devicetree/bindings/soc/apple/apple,aft.yaml deleted file mode 100644 index cbde514ecb979..0000000000000 --- a/Documentation/devicetree/bindings/soc/apple/apple,aft.yaml +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/soc/apple/apple,aft.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Apple M4 base SoC fabric trace interface - -maintainers: - - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> - -description: | - Hardware resources of the M4 base SoC fabric trace interface. - The interface is described for discovery and must remain disabled until - its ownership, initialization and shutdown are supported. Register windows - are listed in hardware resource order; firmware configuration and tuning - data are supplied by the boot firmware rather than this binding. - -select: - properties: - compatible: - contains: - enum: - - apple,t8132-aft - required: - - compatible - -properties: - compatible: - items: - - enum: - - apple,t8132-aft - - const: apple,aft - - reg: - maxItems: 1 - -required: - - compatible - - reg - -additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,cpu-debug.yaml b/Documentation/devicetree/bindings/soc/apple/apple,cpu-debug.yaml index ae163abce897b..da180b772ad2d 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,cpu-debug.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,cpu-debug.yaml @@ -13,68 +13,24 @@ description: | Processor debug register apertures. Access ownership must be established before a debugger accesses this block. -select: - properties: - compatible: - contains: - enum: - - apple,t6041-cpu-debug - - apple,t8132-cpu-debug - required: - - compatible - properties: - compatible: true - -allOf: - - if: - properties: - compatible: - contains: - enum: - - apple,t8132-cpu-debug - required: - - compatible - then: - properties: - compatible: - items: - - enum: - - apple,t8132-cpu-debug - - const: apple,cpu-debug - - reg: - minItems: 2 - maxItems: 2 - - interrupts: - maxItems: 1 - - required: - - compatible - - reg - - interrupts - else: - properties: - compatible: - oneOf: - - items: - - const: apple,t6041-cpu-debug - - const: apple,cpu-debug - - reg: - minItems: 2 - maxItems: 2 - description: Register apertures in hardware-description order. - - interrupts: - maxItems: 1 - - required: - - compatible - - reg - - interrupts - - additionalProperties: false - -unevaluatedProperties: false + compatible: + oneOf: + - items: + - const: apple,t6041-cpu-debug + - const: apple,cpu-debug + + reg: + minItems: 2 + maxItems: 2 + description: Register apertures in hardware-description order. + + interrupts: + maxItems: 1 + +required: + - compatible + - reg + - interrupts + +additionalProperties: false diff --git a/arch/arm64/boot/dts/apple/t8132-peripherals.dtsi b/arch/arm64/boot/dts/apple/t8132-peripherals.dtsi index 3975e23c8a273..d52930e0b9250 100644 --- a/arch/arm64/boot/dts/apple/t8132-peripherals.dtsi +++ b/arch/arm64/boot/dts/apple/t8132-peripherals.dtsi @@ -375,21 +375,6 @@ status = "disabled"; }; - dbgCPU: debug@389700000 { - compatible = "apple,t8132-cpu-debug", "apple,cpu-debug"; - reg = <0x3 0x89700000 0x0 0x28000>, - <0x3 0x895c0000 0x0 0x4000>; - interrupt-parent = <&aic>; - interrupts = ; - status = "disabled"; - }; - - aft: trace@220180000 { - compatible = "apple,t8132-aft", "apple,aft"; - reg = <0x2 0x20180000 0x0 0xc000>; - status = "disabled"; - }; - }; / { From 51ede2ef4fe788a9bbab48dc2fd433f3ee1ce8ed Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 01:38:18 +1100 Subject: [PATCH 08/10] dt-bindings: apple: preserve SIO common property evaluation Keep the common SIO properties and DMA-controller reference at the root, and select only the register layout and channel requirement conditionally. This removes the five new unevaluated-property warnings on existing SIO nodes after the integration merge. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../devicetree/bindings/dma/apple,sio.yaml | 241 +++++++----------- 1 file changed, 89 insertions(+), 152 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/apple,sio.yaml b/Documentation/devicetree/bindings/dma/apple,sio.yaml index b1586791ccbf8..e812b5d58f707 100644 --- a/Documentation/devicetree/bindings/dma/apple,sio.yaml +++ b/Documentation/devicetree/bindings/dma/apple,sio.yaml @@ -12,58 +12,14 @@ description: being a pretend DMA controller. The SoC-specific compatible selects the firmware protocol and channel configuration. In particular, apple,t6030-sio requires protocol-10 boot tables before the coprocessor can be started. + The T8132 full-window description remains disabled until its firmware + channel layout and handoff are qualified. maintainers: - Martin PoviĊĦer -select: - properties: - compatible: - contains: - enum: - - apple,t6000-sio - - apple,t6020-sio - - apple,t6030-sio - - apple,t6041-sio - - apple,t8103-sio - - apple,t8112-sio - - apple,t8132-sio - - apple,t8140-sio - required: - - compatible - -properties: - compatible: true - - apple,sio-firmware-params: - $ref: /schemas/types.yaml#/definitions/uint32-array - description: | - Parameters in the form of opaque key/value pairs that are to be sent to the SIO - coprocesssor once it boots. These parameters can point into the reserved memory - regions (in device address space). - - Note that unlike Apple's firmware, we treat the parameters, and the data they - refer to, as opaque. Apple embed short data blobs into their SIO devicetree node - that describe the DMA-enabled peripherals (presumably with defined semantics). - Their driver processes those blobs and sets up data structure in mapped device - memory, then references this memory in the parameters sent to the SIO. At the - level of description we are opting for in this binding, we assume the job of - constructing those data structures has been done in advance, leaving behind an - opaque list of key/value parameter pairs to be sent by a prospective driver. - - This approach is chosen for two reasons: - - - It means we don't need to try to understand the semantics of Apple's blobs - as long as we know the transformation we need to do from Apple's devicetree - data to SIO data (which can be shoved away into a loader). It also means the - semantics of Apple's blobs (or of something to replace them) need not be part - of the binding and be kept up with Apple's firmware changes in the future. - - - It leaves less work for the driver attaching on this binding. Instead the work - is done upfront in the loader which can be better suited for keeping up with - Apple's firmware changes. - allOf: + - $ref: dma-controller.yaml# - if: properties: compatible: @@ -72,41 +28,22 @@ allOf: required: - compatible then: - allOf: - - $ref: dma-controller.yaml# properties: - compatible: - items: - - const: apple,t8132-sio - - const: apple,sio reg: minItems: 2 maxItems: 2 clocks: minItems: 3 maxItems: 3 - '#dma-cells': - const: 1 - mboxes: - maxItems: 1 - iommus: - maxItems: 1 - power-domains: - maxItems: 1 status: const: disabled required: - - compatible - - reg - clocks - - '#dma-cells' - - mboxes - - iommus - - power-domains - status else: + required: + - dma-channels allOf: - - $ref: dma-controller.yaml# - if: properties: compatible: @@ -122,102 +59,102 @@ allOf: reg: maxItems: 1 - properties: - compatible: - oneOf: - - items: - - enum: - - apple,t6000-sio - - apple,t6020-sio - - apple,t6030-sio - - apple,t8103-sio - - apple,t8112-sio - - apple,t8140-sio - - const: apple,sio - - description: T6041 firmware requires a generation-specific backend. - const: apple,t6041-sio +properties: + compatible: + oneOf: + - items: + - enum: + - apple,t6000-sio + - apple,t6020-sio + - apple,t6030-sio + - apple,t8103-sio + - apple,t8112-sio + - apple,t8132-sio + - apple,t8140-sio + - const: apple,sio + - description: T6041 firmware requires a generation-specific backend. + const: apple,t6041-sio + + reg: + minItems: 1 + maxItems: 3 + description: | + Coprocessor control registers. T8140 also publishes an auxiliary ASC + window and the remaining ASC registers after the mailbox window. + The mailbox registers are described by the mailbox provider. - reg: - minItems: 1 - maxItems: 3 - description: | - Coprocessor control registers. T8140 also publishes an auxiliary ASC - window and the remaining ASC registers after the mailbox window. - The mailbox registers are described by the mailbox provider. + clocks: + minItems: 1 + maxItems: 3 - clocks: - minItems: 1 - maxItems: 3 + status: true - '#dma-cells': - const: 1 - description: - DMA clients specify a single cell that corresponds to the RTKit endpoint - number used for arranging the transfers in question + '#dma-cells': + const: 1 + description: + DMA clients specify a single cell that corresponds to the RTKit endpoint + number used for arranging the transfers in question - dma-channels: - maximum: 128 + dma-channels: + maximum: 128 - mboxes: - maxItems: 1 + mboxes: + maxItems: 1 - iommus: - maxItems: 1 + iommus: + maxItems: 1 - power-domains: - maxItems: 1 + power-domains: + maxItems: 1 - resets: - maxItems: 1 + resets: + maxItems: 1 - memory-region: - minItems: 2 - maxItems: 8 - description: - A number of references to reserved memory regions among which are the DATA/TEXT - sections of coprocessor executable firmware and also auxiliary firmware data - describing the available DMA-enabled peripherals - - apple,sio-firmware-params: - $ref: /schemas/types.yaml#/definitions/uint32-array - description: | - Parameters in the form of opaque key/value pairs that are to be sent to the SIO - coprocesssor once it boots. These parameters can point into the reserved memory - regions (in device address space). - - Note that unlike Apple's firmware, we treat the parameters, and the data they - refer to, as opaque. Apple embed short data blobs into their SIO devicetree node - that describe the DMA-enabled peripherals (presumably with defined semantics). - Their driver processes those blobs and sets up data structure in mapped device - memory, then references this memory in the parameters sent to the SIO. At the - level of description we are opting for in this binding, we assume the job of - constructing those data structures has been done in advance, leaving behind an - opaque list of key/value parameter pairs to be sent by a prospective driver. - - This approach is chosen for two reasons: - - - It means we don't need to try to understand the semantics of Apple's blobs - as long as we know the transformation we need to do from Apple's devicetree - data to SIO data (which can be shoved away into a loader). It also means the - semantics of Apple's blobs (or of something to replace them) need not be part - of the binding and be kept up with Apple's firmware changes in the future. - - - It leaves less work for the driver attaching on this binding. Instead the work - is done upfront in the loader which can be better suited for keeping up with - Apple's firmware changes. + memory-region: + minItems: 2 + maxItems: 8 + description: + A number of references to reserved memory regions among which are the DATA/TEXT + sections of coprocessor executable firmware and also auxiliary firmware data + describing the available DMA-enabled peripherals - required: - - compatible - - reg - - '#dma-cells' - - dma-channels - - mboxes - - iommus - - power-domains + apple,sio-firmware-params: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: | + Parameters in the form of opaque key/value pairs that are to be sent to the SIO + coprocesssor once it boots. These parameters can point into the reserved memory + regions (in device address space). + + Note that unlike Apple's firmware, we treat the parameters, and the data they + refer to, as opaque. Apple embed short data blobs into their SIO devicetree node + that describe the DMA-enabled peripherals (presumably with defined semantics). + Their driver processes those blobs and sets up data structure in mapped device + memory, then references this memory in the parameters sent to the SIO. At the + level of description we are opting for in this binding, we assume the job of + constructing those data structures has been done in advance, leaving behind an + opaque list of key/value parameter pairs to be sent by a prospective driver. + + This approach is chosen for two reasons: + + - It means we don't need to try to understand the semantics of Apple's blobs + as long as we know the transformation we need to do from Apple's devicetree + data to SIO data (which can be shoved away into a loader). It also means the + semantics of Apple's blobs (or of something to replace them) need not be part + of the binding and be kept up with Apple's firmware changes in the future. + + - It leaves less work for the driver attaching on this binding. Instead the work + is done upfront in the loader which can be better suited for keeping up with + Apple's firmware changes. - additionalProperties: false +required: + - compatible + - reg + - '#dma-cells' + - mboxes + - iommus + - power-domains -unevaluatedProperties: false +additionalProperties: false examples: - | From f827d14cb8e0949b945f65d74a37fe10d5c6750a Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 01:43:40 +1100 Subject: [PATCH 09/10] dt-bindings: apple: share M4 and Ultra resource variants Use identical conditional contracts for the common T8132 and T6032 interfaces in their independent family series. Keep the merged integration layouts intact and common custom-property types visible at the schema root. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../bindings/clock/apple,pmgr-clocks.yaml | 98 ++++++---- .../devicetree/bindings/crypto/apple,aes.yaml | 101 +++++++---- .../bindings/display/apple,dpin.yaml | 60 +++++-- .../bindings/dma/apple,pcie-piodma.yaml | 82 ++++++--- .../bindings/dma/apple,pciec-piodma.yaml | 82 ++++++--- .../devicetree/bindings/media/apple,jpeg.yaml | 142 ++++++++++----- .../bindings/media/apple,prores.yaml | 154 ++++++++++------ .../bindings/media/apple,scaler.yaml | 130 +++++++++----- .../bindings/media/apple,t8140-ave.yaml | 169 +++++++++++------- .../bindings/soc/apple/apple,aon-ptd.yaml | 112 ++++++++---- .../bindings/soc/apple/apple,dwi.yaml | 86 ++++++--- 11 files changed, 807 insertions(+), 409 deletions(-) diff --git a/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml b/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml index 982e7195fe042..82b5b83c9a248 100644 --- a/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml +++ b/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml @@ -22,6 +22,7 @@ select: compatible: contains: enum: + - apple,t6032-pmgr-clocks - apple,t6041-pmgr-clocks - apple,t8132-pmgr-clocks - apple,t8140-pmgr-clocks @@ -58,54 +59,77 @@ allOf: - compatible - '#clock-cells' else: - properties: - compatible: - items: - - enum: - - apple,t6041-pmgr-clocks - - apple,t8140-pmgr-clocks - - const: apple,pmgr-clocks - - reg: - description: PMGR control apertures in hardware-description order. - minItems: 44 - maxItems: 63 - - '#clock-cells': - const: 1 - - apple,pmgr: - $ref: /schemas/types.yaml#/definitions/phandle - description: Primary PMGR syscon. Additional control banks are described by reg. - - required: - - reg - - compatible - - '#clock-cells' - - apple,pmgr - allOf: - if: properties: compatible: contains: - const: apple,t6041-pmgr-clocks + enum: + - apple,t6032-pmgr-clocks + required: + - compatible then: - properties: - reg: - minItems: 63 - maxItems: 63 - - if: properties: compatible: - contains: - const: apple,t8140-pmgr-clocks - then: + items: + - const: apple,t6032-pmgr-clocks + - const: apple,pmgr-clocks + + '#clock-cells': + const: 1 + + required: + - compatible + - '#clock-cells' + else: properties: + compatible: + items: + - enum: + - apple,t6041-pmgr-clocks + - apple,t8140-pmgr-clocks + - const: apple,pmgr-clocks + reg: + description: PMGR control apertures in hardware-description order. minItems: 44 - maxItems: 44 + maxItems: 63 - additionalProperties: false + '#clock-cells': + const: 1 + + apple,pmgr: + $ref: /schemas/types.yaml#/definitions/phandle + description: Primary PMGR syscon. Additional control banks are described by reg. + + required: + - reg + - compatible + - '#clock-cells' + - apple,pmgr + + allOf: + - if: + properties: + compatible: + contains: + const: apple,t6041-pmgr-clocks + then: + properties: + reg: + minItems: 63 + maxItems: 63 + - if: + properties: + compatible: + contains: + const: apple,t8140-pmgr-clocks + then: + properties: + reg: + minItems: 44 + maxItems: 44 + + additionalProperties: false unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/crypto/apple,aes.yaml b/Documentation/devicetree/bindings/crypto/apple,aes.yaml index 2bada83fc7efd..bcde9a8e4b040 100644 --- a/Documentation/devicetree/bindings/crypto/apple,aes.yaml +++ b/Documentation/devicetree/bindings/crypto/apple,aes.yaml @@ -18,6 +18,7 @@ select: compatible: contains: enum: + - apple,t6032-aes - apple,t6041-aes - apple,t8132-aes - apple,t8140-aes @@ -64,37 +65,73 @@ allOf: - power-domains - iommus else: - properties: - compatible: - oneOf: - - items: - - const: apple,t6041-aes - - const: apple,aes - - items: - - const: apple,t8140-aes - - const: apple,aes - - reg: - minItems: 3 - maxItems: 3 - description: Register apertures in hardware-description order. - - interrupts: - maxItems: 1 - - power-domains: - maxItems: 1 - - iommus: - maxItems: 1 - - required: - - compatible - - reg - - interrupts - - power-domains - - iommus - - additionalProperties: false + allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t6032-aes + required: + - compatible + then: + properties: + compatible: + items: + - const: apple,t6032-aes + - const: apple,aes + + reg: + minItems: 2 + maxItems: 2 + + interrupts: + maxItems: 1 + + power-domains: + maxItems: 1 + + iommus: + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - power-domains + - iommus + else: + properties: + compatible: + oneOf: + - items: + - const: apple,t6041-aes + - const: apple,aes + - items: + - const: apple,t8140-aes + - const: apple,aes + + reg: + minItems: 3 + maxItems: 3 + description: Register apertures in hardware-description order. + + interrupts: + maxItems: 1 + + power-domains: + maxItems: 1 + + iommus: + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - power-domains + - iommus + + additionalProperties: false unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/display/apple,dpin.yaml b/Documentation/devicetree/bindings/display/apple,dpin.yaml index 5460cdcdcabb2..a645555f0194f 100644 --- a/Documentation/devicetree/bindings/display/apple,dpin.yaml +++ b/Documentation/devicetree/bindings/display/apple,dpin.yaml @@ -17,6 +17,7 @@ select: compatible: contains: enum: + - apple,t6032-dpin - apple,t6041-dpin - apple,t8132-dpin required: @@ -53,25 +54,52 @@ allOf: - reg - interrupts else: - properties: - compatible: - oneOf: - - items: - - const: apple,t6041-dpin - - const: apple,dpin + allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t6032-dpin + required: + - compatible + then: + properties: + compatible: + items: + - const: apple,t6032-dpin + - const: apple,dpin - reg: - maxItems: 1 - description: Register apertures in hardware-description order. + reg: + maxItems: 1 - interrupts: - maxItems: 1 + interrupts: + maxItems: 1 - required: - - compatible - - reg - - interrupts + required: + - compatible + - reg + - interrupts + else: + properties: + compatible: + oneOf: + - items: + - const: apple,t6041-dpin + - const: apple,dpin + + reg: + maxItems: 1 + description: Register apertures in hardware-description order. + + interrupts: + maxItems: 1 + + required: + - compatible + - reg + - interrupts - additionalProperties: false + additionalProperties: false unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml b/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml index 31d44109a5b08..87468fb4cdb15 100644 --- a/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml +++ b/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml @@ -18,6 +18,7 @@ select: compatible: contains: enum: + - apple,t6032-pcie-piodma - apple,t6041-pcie-piodma - apple,t8132-pcie-piodma required: @@ -59,30 +60,61 @@ allOf: - interrupts - iommus else: - properties: - compatible: - oneOf: - - items: - - const: apple,t6041-pcie-piodma - - const: apple,pcie-piodma - - reg: - minItems: 3 - maxItems: 3 - description: Register apertures in hardware-description order. - - interrupts: - maxItems: 1 - - iommus: - maxItems: 1 - - required: - - compatible - - reg - - interrupts - - iommus - - additionalProperties: false + allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t6032-pcie-piodma + required: + - compatible + then: + properties: + compatible: + items: + - const: apple,t6032-pcie-piodma + - const: apple,pcie-piodma + + reg: + minItems: 3 + maxItems: 3 + + interrupts: + maxItems: 1 + + iommus: + maxItems: 1 + + required: + - compatible + - reg + - interrupts + else: + properties: + compatible: + oneOf: + - items: + - const: apple,t6041-pcie-piodma + - const: apple,pcie-piodma + + reg: + minItems: 3 + maxItems: 3 + description: Register apertures in hardware-description order. + + interrupts: + maxItems: 1 + + iommus: + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - iommus + + additionalProperties: false unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml b/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml index 5dc56c117616d..e2ce1316787e0 100644 --- a/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml +++ b/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml @@ -18,6 +18,7 @@ select: compatible: contains: enum: + - apple,t6032-pciec-piodma - apple,t6041-pciec-piodma - apple,t8132-pciec-piodma required: @@ -59,30 +60,61 @@ allOf: - interrupts - iommus else: - properties: - compatible: - oneOf: - - items: - - const: apple,t6041-pciec-piodma - - const: apple,pciec-piodma - - reg: - minItems: 4 - maxItems: 4 - description: Register apertures in hardware-description order. - - interrupts: - maxItems: 1 - - iommus: - maxItems: 1 - - required: - - compatible - - reg - - interrupts - - iommus - - additionalProperties: false + allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t6032-pciec-piodma + required: + - compatible + then: + properties: + compatible: + items: + - const: apple,t6032-pciec-piodma + - const: apple,pciec-piodma + + reg: + minItems: 4 + maxItems: 4 + + interrupts: + maxItems: 1 + + iommus: + maxItems: 1 + + required: + - compatible + - reg + - interrupts + else: + properties: + compatible: + oneOf: + - items: + - const: apple,t6041-pciec-piodma + - const: apple,pciec-piodma + + reg: + minItems: 4 + maxItems: 4 + description: Register apertures in hardware-description order. + + interrupts: + maxItems: 1 + + iommus: + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - iommus + + additionalProperties: false unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/media/apple,jpeg.yaml b/Documentation/devicetree/bindings/media/apple,jpeg.yaml index 7b7a4d7fe5f9f..03389918dd5de 100644 --- a/Documentation/devicetree/bindings/media/apple,jpeg.yaml +++ b/Documentation/devicetree/bindings/media/apple,jpeg.yaml @@ -24,15 +24,24 @@ select: compatible: contains: enum: + - apple,t6032-jpeg - apple,t6041-jpeg - - apple,t8140-jpeg - apple,t8132-jpeg + - apple,t8140-jpeg required: - compatible properties: compatible: true + apple,dma-range: + $ref: /schemas/types.yaml#/definitions/uint64-array + items: + - const: 0x10000000000 + - const: 0x100000000 + description: Device-visible DMA window, as a 64-bit base and size. + Only for engines with 32-bit buffer pointers. + allOf: - if: properties: @@ -72,61 +81,102 @@ allOf: - interrupts - power-domains - iommus - else: - properties: - compatible: - enum: - - apple,t6041-jpeg - - apple,t8140-jpeg - - reg: - maxItems: 1 - - interrupts: - maxItems: 1 + allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t6032-jpeg + required: + - compatible + then: + properties: + compatible: + items: + - const: apple,t6032-jpeg + - const: apple,jpeg - iommus: - maxItems: 1 + reg: + maxItems: 1 - power-domains: - minItems: 1 - items: - - description: The engine's power domain - - description: Performance request held while the engine works + interrupts: + maxItems: 1 - power-domain-names: - minItems: 1 - items: - - const: core - - const: perf + power-domains: + maxItems: 1 - apple,dma-range: - $ref: /schemas/types.yaml#/definitions/uint64-array - items: - - const: 0x10000000000 - - const: 0x100000000 - description: Device-visible DMA window, as a 64-bit base and size. - Only for engines with 32-bit buffer pointers. + iommus: + maxItems: 1 - required: - - compatible - - reg - - interrupts - - iommus - - power-domains + clocks: + minItems: 2 + maxItems: 2 - allOf: - - if: - properties: - compatible: - const: apple,t6041-jpeg - then: required: - - apple,dma-range + - compatible + - reg + - interrupts + - power-domains + - iommus + - clocks else: properties: - apple,dma-range: false + compatible: + enum: + - apple,t6041-jpeg + - apple,t8140-jpeg + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + iommus: + maxItems: 1 + + power-domains: + minItems: 1 + items: + - description: The engine's power domain + - description: Performance request held while the engine works + + power-domain-names: + minItems: 1 + items: + - const: core + - const: perf + + apple,dma-range: + $ref: /schemas/types.yaml#/definitions/uint64-array + items: + - const: 0x10000000000 + - const: 0x100000000 + description: Device-visible DMA window, as a 64-bit base and size. + Only for engines with 32-bit buffer pointers. + + required: + - compatible + - reg + - interrupts + - iommus + - power-domains + + allOf: + - if: + properties: + compatible: + const: apple,t6041-jpeg + then: + required: + - apple,dma-range + else: + properties: + apple,dma-range: false + + additionalProperties: false unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/media/apple,prores.yaml b/Documentation/devicetree/bindings/media/apple,prores.yaml index 13bccf170b049..abedef1132e55 100644 --- a/Documentation/devicetree/bindings/media/apple,prores.yaml +++ b/Documentation/devicetree/bindings/media/apple,prores.yaml @@ -19,6 +19,7 @@ select: compatible: contains: enum: + - apple,t6032-prores - apple,t6041-prores - apple,t8132-prores - apple,t8140-prores @@ -66,82 +67,119 @@ allOf: - power-domains - iommus else: - properties: - compatible: - oneOf: - - const: apple,t8140-prores - - items: - - const: apple,t6041-prores - - const: apple,prores - - reg: - minItems: 2 - maxItems: 3 - description: Engine, wrapper and (on T6041) auxiliary register windows. - - reg-names: - minItems: 2 - items: - - const: core - - const: wrapper - - const: aux - - interrupts: - minItems: 1 - maxItems: 2 - - iommus: - maxItems: 1 - - power-domains: - minItems: 1 - items: - - description: The engine's power domain - - description: Performance request held while the engine works - - power-domain-names: - minItems: 1 - items: - - const: core - - const: perf - - resets: - maxItems: 1 - - required: - - compatible - - reg - - reg-names - - interrupts - - iommus - - power-domains - allOf: - if: properties: compatible: contains: - const: apple,t6041-prores + enum: + - apple,t6032-prores + required: + - compatible then: properties: + compatible: + items: + - const: apple,t6032-prores + - const: apple,prores + reg: - minItems: 3 - maxItems: 3 - reg-names: - minItems: 3 + minItems: 2 maxItems: 3 + interrupts: maxItems: 1 + + power-domains: + maxItems: 1 + + iommus: + minItems: 1 + maxItems: 2 + required: - - resets + - compatible + - reg + - interrupts + - power-domains + - iommus else: properties: + compatible: + oneOf: + - const: apple,t8140-prores + - items: + - const: apple,t6041-prores + - const: apple,prores + reg: - maxItems: 2 + minItems: 2 + maxItems: 3 + description: Engine, wrapper and (on T6041) auxiliary register windows. + reg-names: + minItems: 2 + items: + - const: core + - const: wrapper + - const: aux + + interrupts: + minItems: 1 maxItems: 2 - additionalProperties: false + iommus: + maxItems: 1 + + power-domains: + minItems: 1 + items: + - description: The engine's power domain + - description: Performance request held while the engine works + + power-domain-names: + minItems: 1 + items: + - const: core + - const: perf + + resets: + maxItems: 1 + + required: + - compatible + - reg + - reg-names + - interrupts + - iommus + - power-domains + + allOf: + - if: + properties: + compatible: + contains: + const: apple,t6041-prores + then: + properties: + reg: + minItems: 3 + maxItems: 3 + reg-names: + minItems: 3 + maxItems: 3 + interrupts: + maxItems: 1 + required: + - resets + else: + properties: + reg: + maxItems: 2 + reg-names: + maxItems: 2 + + additionalProperties: false unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/media/apple,scaler.yaml b/Documentation/devicetree/bindings/media/apple,scaler.yaml index f0d03903d393a..f1f6d07448aaa 100644 --- a/Documentation/devicetree/bindings/media/apple,scaler.yaml +++ b/Documentation/devicetree/bindings/media/apple,scaler.yaml @@ -19,6 +19,7 @@ select: compatible: contains: enum: + - apple,t6032-scaler - apple,t6041-scaler - apple,t8132-scaler - apple,t8140-scaler @@ -71,48 +72,91 @@ allOf: - power-domains - iommus else: - properties: - compatible: - oneOf: - - items: - - const: apple,t6041-scaler - - const: apple,scaler - - items: - - const: apple,t8140-scaler - - const: apple,scaler - - reg: - minItems: 4 - maxItems: 4 - description: Register apertures in hardware-description order. - - interrupts: - minItems: 2 - maxItems: 2 - - power-domains: - minItems: 2 - maxItems: 2 - - iommus: - minItems: 2 - maxItems: 2 - - clocks: - maxItems: 1 - - resets: - maxItems: 1 - - required: - - compatible - - reg - - interrupts - - power-domains - - resets - - iommus - - clocks - - additionalProperties: false + allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t6032-scaler + required: + - compatible + then: + properties: + compatible: + items: + - const: apple,t6032-scaler + - const: apple,scaler + + reg: + minItems: 4 + maxItems: 4 + + interrupts: + minItems: 2 + maxItems: 2 + + power-domains: + minItems: 2 + maxItems: 2 + + iommus: + minItems: 2 + maxItems: 2 + + clocks: + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - power-domains + - iommus + - clocks + else: + properties: + compatible: + oneOf: + - items: + - const: apple,t6041-scaler + - const: apple,scaler + - items: + - const: apple,t8140-scaler + - const: apple,scaler + + reg: + minItems: 4 + maxItems: 4 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 2 + maxItems: 2 + + power-domains: + minItems: 2 + maxItems: 2 + + iommus: + minItems: 2 + maxItems: 2 + + clocks: + maxItems: 1 + + resets: + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - power-domains + - resets + - iommus + - clocks + + additionalProperties: false unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml b/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml index 7785f79b0bbb6..2af3f6c3fcf0b 100644 --- a/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml +++ b/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml @@ -20,10 +20,11 @@ select: contains: enum: - apple,t6000-ave + - apple,t6032-ave - apple,t6041-ave - apple,t8112-ave - - apple,t8140-ave - apple,t8132-ave + - apple,t8140-ave required: - compatible @@ -72,69 +73,109 @@ allOf: - interrupts - power-domains - iommus - else: - properties: - compatible: - enum: - - apple,t6000-ave - - apple,t6041-ave - - apple,t8112-ave - - apple,t8140-ave - - reg: - items: - - description: Codec registers - - description: Mailbox registers - - description: Coprocessor registers - - reg-names: - items: - - const: codec - - const: mailbox - - const: coproc - - interrupts: - items: - - description: Mailbox, raised when the firmware posts to a host ring - - description: Codec interrupt handled by the firmware - - description: Codec interrupt handled by the firmware - - description: Codec interrupt handled by the firmware - - description: Codec interrupt handled by the firmware - - power-domains: - minItems: 5 - maxItems: 6 - - power-domain-names: - minItems: 5 - items: - - const: dma - - const: pipe4 - - const: pipe5 - - const: me0 - - const: me1 - - const: perf - description: | - A performance floor the encoder needs to run at full speed, held - while the encoder is powered (for example the SoC rail floor of a - PMC). - - iommus: - maxItems: 2 - - memory-region: - items: - - description: Preloaded firmware text - - description: Preloaded firmware data - - required: - - compatible - - reg - - reg-names - - interrupts - - power-domains - - power-domain-names - - iommus + allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t6032-ave + required: + - compatible + then: + properties: + compatible: + items: + - const: apple,t6032-ave + - const: apple,ave + + reg: + minItems: 5 + maxItems: 5 + + interrupts: + minItems: 5 + maxItems: 5 + + power-domains: + minItems: 5 + maxItems: 6 + + iommus: + minItems: 2 + maxItems: 2 + + required: + - compatible + - reg + - interrupts + - power-domains + - iommus + else: + properties: + compatible: + enum: + - apple,t6000-ave + - apple,t6041-ave + - apple,t8112-ave + - apple,t8140-ave + + reg: + items: + - description: Codec registers + - description: Mailbox registers + - description: Coprocessor registers + + reg-names: + items: + - const: codec + - const: mailbox + - const: coproc + + interrupts: + items: + - description: Mailbox, raised when the firmware posts to a host ring + - description: Codec interrupt handled by the firmware + - description: Codec interrupt handled by the firmware + - description: Codec interrupt handled by the firmware + - description: Codec interrupt handled by the firmware + + power-domains: + minItems: 5 + maxItems: 6 + + power-domain-names: + minItems: 5 + items: + - const: dma + - const: pipe4 + - const: pipe5 + - const: me0 + - const: me1 + - const: perf + description: | + A performance floor the encoder needs to run at full speed, held + while the encoder is powered (for example the SoC rail floor of a + PMC). + + iommus: + maxItems: 2 + + memory-region: + items: + - description: Preloaded firmware text + - description: Preloaded firmware data + + required: + - compatible + - reg + - reg-names + - interrupts + - power-domains + - power-domain-names + - iommus + + additionalProperties: false unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml b/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml index 5de53174414bc..4f73f9eb96a72 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml @@ -18,6 +18,7 @@ select: compatible: contains: enum: + - apple,t6032-aon-ptd - apple,t6041-aon-ptd - apple,t8132-aon-ptd - apple,t8140-aon-ptd @@ -66,41 +67,80 @@ allOf: - '#interrupt-cells' - '#address-cells' else: - properties: - compatible: - oneOf: - - items: - - const: apple,t6041-aon-ptd - - const: apple,aon-ptd - - items: - - const: apple,t8140-aon-ptd - - const: apple,aon-ptd - - reg: - minItems: 4 - maxItems: 4 - description: Register apertures in hardware-description order. - - interrupts: - minItems: 32 - maxItems: 32 - - interrupt-controller: true - - '#interrupt-cells': - description: Firmware telemetry source identifier, plus flags on T8140. - enum: [1, 2] - - '#address-cells': - const: 0 - - required: - - compatible - - reg - - interrupts - - interrupt-controller - - '#interrupt-cells' - - additionalProperties: false + allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t6032-aon-ptd + required: + - compatible + then: + properties: + compatible: + items: + - enum: + - apple,t6032-aon-ptd + - const: apple,aon-ptd + + reg: + minItems: 4 + maxItems: 4 + + interrupts: + minItems: 32 + maxItems: 32 + + '#address-cells': + const: 0 + '#interrupt-cells': + const: 1 + interrupt-controller: true + + required: + - compatible + - reg + - interrupts + - interrupt-controller + - '#interrupt-cells' + - '#address-cells' + else: + properties: + compatible: + oneOf: + - items: + - const: apple,t6041-aon-ptd + - const: apple,aon-ptd + - items: + - const: apple,t8140-aon-ptd + - const: apple,aon-ptd + + reg: + minItems: 4 + maxItems: 4 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 32 + maxItems: 32 + + interrupt-controller: true + + '#interrupt-cells': + description: Firmware telemetry source identifier, plus flags on T8140. + enum: [1, 2] + + '#address-cells': + const: 0 + + required: + - compatible + - reg + - interrupts + - interrupt-controller + - '#interrupt-cells' + + additionalProperties: false unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml b/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml index 5262355ce1afe..e2acaf7567281 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml @@ -18,6 +18,7 @@ select: compatible: contains: enum: + - apple,t6032-dwi - apple,t6041-dwi - apple,t8132-dwi - apple,t8140-dwi @@ -59,32 +60,63 @@ allOf: - interrupts - power-domains else: - properties: - compatible: - oneOf: - - items: - - const: apple,t6041-dwi - - const: apple,dwi - - items: - - const: apple,t8140-dwi - - const: apple,dwi - - reg: - maxItems: 1 - description: Register apertures in hardware-description order. - - interrupts: - maxItems: 1 - - power-domains: - maxItems: 1 - - required: - - compatible - - reg - - interrupts - - power-domains - - additionalProperties: false + allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t6032-dwi + required: + - compatible + then: + properties: + compatible: + items: + - const: apple,t6032-dwi + - const: apple,dwi + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + power-domains: + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - power-domains + else: + properties: + compatible: + oneOf: + - items: + - const: apple,t6041-dwi + - const: apple,dwi + - items: + - const: apple,t8140-dwi + - const: apple,dwi + + reg: + maxItems: 1 + description: Register apertures in hardware-description order. + + interrupts: + maxItems: 1 + + power-domains: + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - power-domains + + additionalProperties: false unevaluatedProperties: false From bdda03025675d25ce65fc8530d3b07ff1408e4f9 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 04:04:39 +1100 Subject: [PATCH 10/10] dt-bindings: apple: sort compatible enum unions Keep all merged M3/M4 and new owned SoC alternatives in sorted, duplicate-free enums while preserving ordered compatible tuples. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- Documentation/devicetree/bindings/crypto/apple,aes.yaml | 2 +- Documentation/devicetree/bindings/display/apple,dcp-expert.yaml | 2 +- Documentation/devicetree/bindings/iommu/apple,dapf.yaml | 2 +- Documentation/devicetree/bindings/iommu/apple,dart-smmu.yaml | 2 +- Documentation/devicetree/bindings/media/apple,jpeg.yaml | 2 +- Documentation/devicetree/bindings/media/apple,prores.yaml | 2 +- Documentation/devicetree/bindings/media/apple,scaler.yaml | 2 +- Documentation/devicetree/bindings/media/apple,t8140-ave.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/crypto/apple,aes.yaml b/Documentation/devicetree/bindings/crypto/apple,aes.yaml index e6541d0cd9dcc..2135ef00e86d5 100644 --- a/Documentation/devicetree/bindings/crypto/apple,aes.yaml +++ b/Documentation/devicetree/bindings/crypto/apple,aes.yaml @@ -147,9 +147,9 @@ allOf: compatible: contains: enum: - - apple,t8122-aes - apple,t6030-aes - apple,t6031-aes + - apple,t8122-aes then: properties: reg: diff --git a/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml b/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml index 1109c9aa92d3d..0d85582addd62 100644 --- a/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml +++ b/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml @@ -20,8 +20,8 @@ select: contains: enum: - apple,t6041-dcp-expert - - apple,t8140-dcp-expert - apple,t8132-dcp-expert + - apple,t8140-dcp-expert required: - compatible diff --git a/Documentation/devicetree/bindings/iommu/apple,dapf.yaml b/Documentation/devicetree/bindings/iommu/apple,dapf.yaml index bb6d750f04bae..2a7262c6c441e 100644 --- a/Documentation/devicetree/bindings/iommu/apple,dapf.yaml +++ b/Documentation/devicetree/bindings/iommu/apple,dapf.yaml @@ -21,10 +21,10 @@ select: compatible: contains: enum: - - apple,t8122-dapf - apple,t6030-dapf - apple,t6031-dapf - apple,t6032-dapf + - apple,t8122-dapf - apple,t8132-dapf required: - compatible diff --git a/Documentation/devicetree/bindings/iommu/apple,dart-smmu.yaml b/Documentation/devicetree/bindings/iommu/apple,dart-smmu.yaml index 2957e71d9dd09..e06b179c79cab 100644 --- a/Documentation/devicetree/bindings/iommu/apple,dart-smmu.yaml +++ b/Documentation/devicetree/bindings/iommu/apple,dart-smmu.yaml @@ -21,10 +21,10 @@ select: compatible: contains: enum: - - apple,t8122-dart-smmu - apple,t6030-dart-smmu - apple,t6031-dart-smmu - apple,t6032-dart-smmu + - apple,t8122-dart-smmu - apple,t8132-dart-smmu required: - compatible diff --git a/Documentation/devicetree/bindings/media/apple,jpeg.yaml b/Documentation/devicetree/bindings/media/apple,jpeg.yaml index 71636eac0f10b..4f1060074ec27 100644 --- a/Documentation/devicetree/bindings/media/apple,jpeg.yaml +++ b/Documentation/devicetree/bindings/media/apple,jpeg.yaml @@ -186,9 +186,9 @@ allOf: compatible: contains: enum: - - apple,t8122-jpeg - apple,t6030-jpeg - apple,t6031-jpeg + - apple,t8122-jpeg then: properties: power-domains: diff --git a/Documentation/devicetree/bindings/media/apple,prores.yaml b/Documentation/devicetree/bindings/media/apple,prores.yaml index b90a7b6b00522..037f23d22a8f5 100644 --- a/Documentation/devicetree/bindings/media/apple,prores.yaml +++ b/Documentation/devicetree/bindings/media/apple,prores.yaml @@ -169,9 +169,9 @@ allOf: compatible: contains: enum: - - apple,t8122-prores - apple,t6030-prores - apple,t6031-prores + - apple,t8122-prores then: properties: reg: diff --git a/Documentation/devicetree/bindings/media/apple,scaler.yaml b/Documentation/devicetree/bindings/media/apple,scaler.yaml index 7bdb66ba8b19e..c8226999f30d0 100644 --- a/Documentation/devicetree/bindings/media/apple,scaler.yaml +++ b/Documentation/devicetree/bindings/media/apple,scaler.yaml @@ -169,9 +169,9 @@ allOf: compatible: contains: enum: - - apple,t8122-scaler - apple,t6030-scaler - apple,t6031-scaler + - apple,t8122-scaler then: properties: reg: diff --git a/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml b/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml index c6531097847c9..8de887ef09492 100644 --- a/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml +++ b/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml @@ -189,9 +189,9 @@ allOf: compatible: contains: enum: - - apple,t8122-ave - apple,t6030-ave - apple,t6031-ave + - apple,t8122-ave then: properties: reg: