From 4c28191ae7b980a7f9afad443eb2066d903115dd Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 01:43:45 +1100 Subject: [PATCH 1/2] arm64: dts: apple: describe disabled T6032 package resources Build the Ultra-only resource descriptions directly on the merged integration foundation, without other task branches. Describe media, DMA, protection-filter, input-adapter and package resources while keeping new hardware disabled. Share the generic resource contracts with T8132 and retain the existing generation layouts. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../bindings/clock/apple,pmgr-clocks.yaml | 131 ++- .../devicetree/bindings/crypto/apple,aes.yaml | 152 +++- .../bindings/display/apple,dpin.yaml | 101 +- .../bindings/dma/apple,pcie-piodma.yaml | 128 ++- .../bindings/dma/apple,pciec-piodma.yaml | 128 ++- .../devicetree/bindings/iommu/apple,dapf.yaml | 44 + .../bindings/iommu/apple,dart-smmu.yaml | 44 + .../devicetree/bindings/media/apple,jpeg.yaml | 181 +++- .../bindings/media/apple,prores.yaml | 212 +++-- .../bindings/media/apple,scaler.yaml | 187 +++- .../bindings/media/apple,t8140-ave.yaml | 227 +++-- .../bindings/soc/apple/apple,aon-ptd.yaml | 165 +++- .../bindings/soc/apple/apple,dwi.yaml | 132 ++- .../bindings/soc/apple/apple,rsm.yaml | 99 +- .../bindings/soc/apple/apple,t8140-mcc.yaml | 83 +- .../boot/dts/apple/t6032-peripherals.dtsi | 861 ++++++++++++++++++ arch/arm64/boot/dts/apple/t6032.dtsi | 2 + 17 files changed, 2446 insertions(+), 431 deletions(-) create mode 100644 Documentation/devicetree/bindings/iommu/apple,dapf.yaml create mode 100644 Documentation/devicetree/bindings/iommu/apple,dart-smmu.yaml create mode 100644 arch/arm64/boot/dts/apple/t6032-peripherals.dtsi diff --git a/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml b/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml index 71e74f7d59a83..82b5b83c9a248 100644 --- a/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml +++ b/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml @@ -17,52 +17,119 @@ description: | The provider remains disabled until a generation-specific clock driver can resolve selectors and coordinate ownership with firmware. -properties: - compatible: - items: - - enum: +select: + properties: + compatible: + contains: + enum: + - apple,t6032-pmgr-clocks - apple,t6041-pmgr-clocks + - apple,t8132-pmgr-clocks - apple,t8140-pmgr-clocks - - const: apple,pmgr-clocks - - reg: - description: PMGR control apertures in hardware-description order. - minItems: 44 - maxItems: 63 + required: + - compatible - '#clock-cells': - const: 1 +properties: + compatible: true 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,t8132-pmgr-clocks + required: + - compatible then: - properties: - reg: - minItems: 63 - maxItems: 63 - - if: properties: compatible: - contains: - const: apple,t8140-pmgr-clocks - then: - properties: - reg: - minItems: 44 - maxItems: 44 + items: + - const: apple,t8132-pmgr-clocks + - const: apple,pmgr-clocks + + '#clock-cells': + const: 1 + + required: + - compatible + - '#clock-cells' + else: + allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t6032-pmgr-clocks + required: + - compatible + then: + properties: + compatible: + 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: 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 -additionalProperties: false +unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/crypto/apple,aes.yaml b/Documentation/devicetree/bindings/crypto/apple,aes.yaml index 1b55625851940..bcde9a8e4b040 100644 --- a/Documentation/devicetree/bindings/crypto/apple,aes.yaml +++ b/Documentation/devicetree/bindings/crypto/apple,aes.yaml @@ -13,35 +13,125 @@ 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,t6032-aes + - apple,t6041-aes + - apple,t8132-aes + - apple,t8140-aes + required: + - compatible + 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 + compatible: true + +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: + maxItems: 1 + + power-domains: + maxItems: 1 + + iommus: + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - power-domains + - iommus + else: + 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 340d078c054d1..a645555f0194f 100644 --- a/Documentation/devicetree/bindings/display/apple,dpin.yaml +++ b/Documentation/devicetree/bindings/display/apple,dpin.yaml @@ -12,23 +12,94 @@ maintainers: description: | DisplayPort ingress registers and interrupt for a USB4 display tunnel. +select: + properties: + compatible: + contains: + enum: + - apple,t6032-dpin + - apple,t6041-dpin + - apple,t8132-dpin + required: + - compatible + properties: - compatible: - oneOf: - - items: - - const: apple,t6041-dpin - - const: apple,dpin + compatible: true + +allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t8132-dpin + required: + - compatible + then: + properties: + compatible: + items: + - enum: + - apple,t8132-dpin + - const: apple,dpin + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + required: + - compatible + - reg + - interrupts + else: + 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 + + interrupts: + maxItems: 1 + + 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. - reg: - maxItems: 1 - description: Register apertures in hardware-description order. + interrupts: + maxItems: 1 - interrupts: - maxItems: 1 + required: + - compatible + - reg + - interrupts -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 530b4f7402804..87468fb4cdb15 100644 --- a/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml +++ b/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml @@ -13,28 +13,108 @@ 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,t6032-pcie-piodma + - apple,t6041-pcie-piodma + - apple,t8132-pcie-piodma + required: + - compatible + 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 + compatible: true + +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: + maxItems: 1 + + iommus: + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - iommus + else: + 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 7381a24bba808..e2ce1316787e0 100644 --- a/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml +++ b/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml @@ -13,28 +13,108 @@ 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,t6032-pciec-piodma + - apple,t6041-pciec-piodma + - apple,t8132-pciec-piodma + required: + - compatible + 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 + compatible: true + +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: + maxItems: 1 + + iommus: + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - iommus + else: + 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/iommu/apple,dapf.yaml b/Documentation/devicetree/bindings/iommu/apple,dapf.yaml new file mode 100644 index 0000000000000..e5e0b751125c3 --- /dev/null +++ b/Documentation/devicetree/bindings/iommu/apple,dapf.yaml @@ -0,0 +1,44 @@ +# 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,t6032-dapf + - apple,t8132-dapf + required: + - compatible + +properties: + compatible: + items: + - enum: + - apple,t6032-dapf + - apple,t8132-dapf + - const: apple,dapf + + reg: + 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..7bab75d28b87d --- /dev/null +++ b/Documentation/devicetree/bindings/iommu/apple,dart-smmu.yaml @@ -0,0 +1,44 @@ +# 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,t6032-dart-smmu + - apple,t8132-dart-smmu + required: + - compatible + +properties: + compatible: + items: + - enum: + - apple,t6032-dart-smmu + - apple,t8132-dart-smmu + - const: apple,dart-smmu + + reg: + 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..03389918dd5de 100644 --- a/Documentation/devicetree/bindings/media/apple,jpeg.yaml +++ b/Documentation/devicetree/bindings/media/apple,jpeg.yaml @@ -19,32 +19,20 @@ 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 +select: + properties: + compatible: + contains: + enum: + - apple,t6032-jpeg + - apple,t6041-jpeg + - apple,t8132-jpeg + - apple,t8140-jpeg + required: + - compatible - power-domain-names: - minItems: 1 - items: - - const: core - - const: perf +properties: + compatible: true apple,dma-range: $ref: /schemas/types.yaml#/definitions/uint64-array @@ -54,26 +42,143 @@ properties: 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: + contains: + enum: + - apple,t8132-jpeg required: - - apple,dma-range - else: + - compatible + then: properties: - apple,dma-range: false + compatible: + items: + - enum: + - apple,t8132-jpeg + - const: apple,jpeg + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 -additionalProperties: false + power-domains: + maxItems: 1 + + iommus: + maxItems: 1 + + clocks: + minItems: 1 + maxItems: 2 + + required: + - compatible + - reg + - interrupts + - power-domains + - iommus + else: + allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t6032-jpeg + required: + - compatible + then: + properties: + compatible: + items: + - const: apple,t6032-jpeg + - const: apple,jpeg + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + power-domains: + maxItems: 1 + + iommus: + maxItems: 1 + + clocks: + minItems: 2 + maxItems: 2 + + required: + - compatible + - reg + - interrupts + - power-domains + - iommus + - clocks + else: + 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 + + allOf: + - if: + properties: + compatible: + const: apple,t6041-jpeg + then: + required: + - apple,dma-range + else: + 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 4124c331a9f8c..abedef1132e55 100644 --- a/Documentation/devicetree/bindings/media/apple,prores.yaml +++ b/Documentation/devicetree/bindings/media/apple,prores.yaml @@ -14,82 +14,174 @@ description: | descriptors in a DMA ring; the engine signals completion with an interrupt. It has no firmware. Its power domain also resets it. +select: + properties: + compatible: + contains: + enum: + - apple,t6032-prores + - apple,t6041-prores + - apple,t8132-prores + - apple,t8140-prores + required: + - compatible + 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 + compatible: true allOf: - if: properties: compatible: contains: - const: apple,t6041-prores + enum: + - apple,t8132-prores + required: + - compatible then: properties: + compatible: + items: + - enum: + - apple,t8132-prores + - const: apple,prores + reg: minItems: 3 maxItems: 3 - reg-names: - minItems: 3 - maxItems: 3 + interrupts: + minItems: 2 + maxItems: 2 + + power-domains: maxItems: 1 + + iommus: + maxItems: 1 + required: - - resets + - compatible + - reg + - interrupts + - power-domains + - iommus else: - properties: - reg: - maxItems: 2 - reg-names: - maxItems: 2 - -additionalProperties: false + allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t6032-prores + required: + - compatible + then: + properties: + compatible: + items: + - const: apple,t6032-prores + - const: apple,prores + + reg: + minItems: 2 + maxItems: 3 + + interrupts: + maxItems: 1 + + power-domains: + maxItems: 1 + + iommus: + minItems: 1 + maxItems: 2 + + required: + - compatible + - reg + - interrupts + - 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 + 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 examples: - | diff --git a/Documentation/devicetree/bindings/media/apple,scaler.yaml b/Documentation/devicetree/bindings/media/apple,scaler.yaml index b5f2f5b0e50eb..f1f6d07448aaa 100644 --- a/Documentation/devicetree/bindings/media/apple,scaler.yaml +++ b/Documentation/devicetree/bindings/media/apple,scaler.yaml @@ -14,46 +14,149 @@ description: | 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,t6032-scaler + - apple,t6041-scaler + - apple,t8132-scaler + - apple,t8140-scaler + required: + - compatible + 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 + compatible: true + +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: + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - power-domains + - iommus + else: + 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 dadb98b19f822..2af3f6c3fcf0b 100644 --- a/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml +++ b/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml @@ -14,67 +14,168 @@ description: | preloaded by the bootloader. Its two DART instances translate the same stream. The bootloader supplies two reserved firmware regions and their IOVA mappings. +select: + properties: + compatible: + contains: + enum: + - apple,t6000-ave + - apple,t6032-ave + - apple,t6041-ave + - apple,t8112-ave + - apple,t8132-ave + - apple,t8140-ave + required: + - compatible + 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 + compatible: true + +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: + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - power-domains + - iommus + else: + 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 13dec59b733fc..4f73f9eb96a72 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml @@ -13,39 +13,134 @@ 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,t6032-aon-ptd + - apple,t6041-aon-ptd + - apple,t8132-aon-ptd + - apple,t8140-aon-ptd + required: + - compatible + 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 + compatible: true + +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' + else: + 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 e067b3f3665b9..e2acaf7567281 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml @@ -13,30 +13,110 @@ 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,t6032-dwi + - apple,t6041-dwi + - apple,t8132-dwi + - apple,t8140-dwi + required: + - compatible + 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 + compatible: true + +allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t8132-dwi + required: + - compatible + then: + properties: + compatible: + items: + - enum: + - apple,t8132-dwi + - const: apple,dwi + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + power-domains: + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - power-domains + else: + 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 diff --git a/Documentation/devicetree/bindings/soc/apple/apple,rsm.yaml b/Documentation/devicetree/bindings/soc/apple/apple,rsm.yaml index 15e3e504b06ba..13db0ffbfbb64 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,rsm.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,rsm.yaml @@ -12,28 +12,79 @@ maintainers: description: | Remote service manager register banks, interrupt and DART stream. +select: + properties: + compatible: + contains: + enum: + - apple,t6032-rsm + - apple,t8140-rsm + required: + - compatible + properties: - compatible: - oneOf: - - items: - - const: apple,t8140-rsm - - const: apple,rsm - - reg: - minItems: 2 - maxItems: 2 - description: Register apertures in hardware-description order. - - interrupts: - maxItems: 1 - - iommus: - maxItems: 1 - -required: - - compatible - - reg - - interrupts - - iommus - -additionalProperties: false + compatible: true + +allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t6032-rsm + required: + - compatible + then: + properties: + compatible: + items: + - const: apple,t6032-rsm + - const: apple,rsm + + 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,t8140-rsm + - const: apple,rsm + + reg: + minItems: 2 + maxItems: 2 + 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/soc/apple/apple,t8140-mcc.yaml b/Documentation/devicetree/bindings/soc/apple/apple,t8140-mcc.yaml index 63767db0cea1a..146cdfc8be894 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,t8140-mcc.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,t8140-mcc.yaml @@ -15,22 +15,20 @@ description: two apertures with two planes each and a multicast cache-enable register; its enabled cache is retained until a dirty-data drain is qualified. -properties: - compatible: - oneOf: - - enum: +select: + properties: + compatible: + contains: + enum: + - apple,t6032-mcc + - apple,t6041-mcc - apple,t8132-mcc - apple,t8140-mcc - - items: - - const: apple,t6041-mcc - - const: apple,t8140-mcc - - reg: - description: Per-plane blocks on T8140, or the two multicast apertures on T8132. - minItems: 1 - maxItems: 32 + required: + - compatible - nonposted-mmio: true +properties: + compatible: true apple,boot-dma-devices: $ref: /schemas/types.yaml#/definitions/phandle-array @@ -40,11 +38,62 @@ properties: Devices that take over DMA the bootloader left running. Cache allocation is enabled only once each of them is bound to its driver. -required: - - compatible - - reg +allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t6032-mcc + required: + - compatible + then: + properties: + compatible: + items: + - const: apple,t6032-mcc + - const: apple,mcc + + reg: + minItems: 20 + maxItems: 20 + + required: + - compatible + - reg + else: + properties: + compatible: + oneOf: + - enum: + - apple,t8132-mcc + - apple,t8140-mcc + - items: + - const: apple,t6041-mcc + - const: apple,t8140-mcc + + reg: + description: Per-plane blocks on T8140, or the two multicast apertures on T8132. + minItems: 1 + maxItems: 32 + + nonposted-mmio: true + + apple,boot-dma-devices: + $ref: /schemas/types.yaml#/definitions/phandle-array + items: + maxItems: 1 + description: + Devices that take over DMA the bootloader left running. Cache allocation + is enabled only once each of them is bound to its driver. + + required: + - compatible + - reg + + additionalProperties: false -additionalProperties: false +unevaluatedProperties: false examples: - | diff --git a/arch/arm64/boot/dts/apple/t6032-peripherals.dtsi b/arch/arm64/boot/dts/apple/t6032-peripherals.dtsi new file mode 100644 index 0000000000000..648e5abf92a71 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t6032-peripherals.dtsi @@ -0,0 +1,861 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* Unclaimed resources of both T6032 dies. */ + +&die0 { + ultra_dart_rsm0: iommu@2a033c000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x2 0xa033c000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_scaler00: iommu@407200000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x4 0x07200000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_scaler10: iommu@3c7200000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x3 0xc7200000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_apr00: iommu@2c5028000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x2 0xc5028000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_apr01: iommu@2c502c000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x2 0xc502c000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_apr10: iommu@287008000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x2 0x87008000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_jpeg00: iommu@2cf004000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x2 0xcf004000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_jpeg10: iommu@2cf00c000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x2 0xcf00c000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_ave00: iommu@285030000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x2 0x85030000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_ave01: iommu@285040000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x2 0x85040000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_ave02: iommu@285020000 { + compatible = "apple,t6032-dart-smmu", "apple,dart-smmu"; + reg = <0x2 0x85020000 0x0 0x4000>; + status = "disabled"; + }; + + ultra_dart_ave03: filter@285044000 { + compatible = "apple,t6032-dapf", "apple,dapf"; + reg = <0x2 0x85044000 0x0 0x4000>; + status = "disabled"; + }; + + ultra_dart_ave10: iommu@3c5030000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x3 0xc5030000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_ave11: iommu@3c5040000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x3 0xc5040000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_ave12: iommu@3c5020000 { + compatible = "apple,t6032-dart-smmu", "apple,dart-smmu"; + reg = <0x3 0xc5020000 0x0 0x4000>; + status = "disabled"; + }; + + ultra_dart_ave13: filter@3c5044000 { + compatible = "apple,t6032-dapf", "apple,dapf"; + reg = <0x3 0xc5044000 0x0 0x4000>; + status = "disabled"; + }; + + ultra_dart_apciec00: iommu@721008000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x7 0x21008000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_apciec10: iommu@b21008000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0xb 0x21008000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_apciec20: iommu@f21008000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0xf 0x21008000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_apciec30: iommu@1321008000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x13 0x21008000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_apcie0_piodma: dma-controller@594010000 { + compatible = "apple,t6032-pcie-piodma", "apple,pcie-piodma"; + reg = <0x5 0x94010000 0x0 0x4000>, + <0x5 0x94014000 0x0 0x4000>, + <0x5 0x94018000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + iommus = <&pcie0_dart_0 15>; + status = "disabled"; + }; + + ultra_apcie1_piodma: dma-controller@595010000 { + compatible = "apple,t6032-pcie-piodma", "apple,pcie-piodma"; + reg = <0x5 0x95010000 0x0 0x4000>, + <0x5 0x95014000 0x0 0x4000>, + <0x5 0x95018000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + iommus = <&pcie0_dart_1 15>; + status = "disabled"; + }; + + ultra_apcie2_piodma: dma-controller@596010000 { + compatible = "apple,t6032-pcie-piodma", "apple,pcie-piodma"; + reg = <0x5 0x96010000 0x0 0x4000>, + <0x5 0x96014000 0x0 0x4000>, + <0x5 0x96018000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + ultra_apcie3_piodma: dma-controller@597010000 { + compatible = "apple,t6032-pcie-piodma", "apple,pcie-piodma"; + reg = <0x5 0x97010000 0x0 0x4000>, + <0x5 0x97014000 0x0 0x4000>, + <0x5 0x97018000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + ultra_apciec0_piodma: dma-controller@722000000 { + compatible = "apple,t6032-pciec-piodma", "apple,pciec-piodma"; + reg = <0x7 0x22000000 0x0 0x4000>, + <0x7 0x22004000 0x0 0x4000>, + <0x7 0x22008000 0x0 0x4000>, + <0x7 0x20008000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + iommus = <&ultra_dart_apciec00 15>; + status = "disabled"; + }; + + ultra_apciec1_piodma: dma-controller@b22000000 { + compatible = "apple,t6032-pciec-piodma", "apple,pciec-piodma"; + reg = <0xb 0x22000000 0x0 0x4000>, + <0xb 0x22004000 0x0 0x4000>, + <0xb 0x22008000 0x0 0x4000>, + <0xb 0x20008000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + iommus = <&ultra_dart_apciec10 15>; + status = "disabled"; + }; + + ultra_apciec2_piodma: dma-controller@f22000000 { + compatible = "apple,t6032-pciec-piodma", "apple,pciec-piodma"; + reg = <0xf 0x22000000 0x0 0x4000>, + <0xf 0x22004000 0x0 0x4000>, + <0xf 0x22008000 0x0 0x4000>, + <0xf 0x20008000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + iommus = <&ultra_dart_apciec20 15>; + status = "disabled"; + }; + + ultra_apciec3_piodma: dma-controller@1322000000 { + compatible = "apple,t6032-pciec-piodma", "apple,pciec-piodma"; + reg = <0x13 0x22000000 0x0 0x4000>, + <0x13 0x22004000 0x0 0x4000>, + <0x13 0x22008000 0x0 0x4000>, + <0x13 0x20008000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + iommus = <&ultra_dart_apciec30 15>; + status = "disabled"; + }; + + ultra_atc0_dpin0: displayport@701e50000 { + compatible = "apple,t6032-dpin", "apple,dpin"; + reg = <0x7 0x01e50000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + ultra_atc0_dpin1: displayport@701e58000 { + compatible = "apple,t6032-dpin", "apple,dpin"; + reg = <0x7 0x01e58000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + ultra_atc1_dpin0: displayport@b01e50000 { + compatible = "apple,t6032-dpin", "apple,dpin"; + reg = <0xb 0x01e50000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + ultra_atc1_dpin1: displayport@b01e58000 { + compatible = "apple,t6032-dpin", "apple,dpin"; + reg = <0xb 0x01e58000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + ultra_atc2_dpin0: displayport@f01e50000 { + compatible = "apple,t6032-dpin", "apple,dpin"; + reg = <0xf 0x01e50000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + ultra_atc2_dpin1: displayport@f01e58000 { + compatible = "apple,t6032-dpin", "apple,dpin"; + reg = <0xf 0x01e58000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + ultra_atc3_dpin0: displayport@1301e50000 { + compatible = "apple,t6032-dpin", "apple,dpin"; + reg = <0x13 0x01e50000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + ultra_atc3_dpin1: displayport@1301e58000 { + compatible = "apple,t6032-dpin", "apple,dpin"; + reg = <0x13 0x01e58000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + ultra_dwi: dwi@2929b0000 { + compatible = "apple,t6032-dwi", "apple,dwi"; + reg = <0x2 0x929b0000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_dwi>; + status = "disabled"; + }; + + ultra_aes: crypto@39100c000 { + compatible = "apple,t6032-aes", "apple,aes"; + reg = <0x3 0x9100c000 0x0 0x4000>, + <0x2 0xa02a0000 0x0 0x8000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_aes>; + iommus = <&sio_dart 1>; + status = "disabled"; + }; + + ultra_aon_ptd: interrupt-controller@2a4dc0000 { + compatible = "apple,t6032-aon-ptd", "apple,aon-ptd"; + reg = <0x2 0xa4dc0000 0x0 0x4000>, + <0x2 0xa4dd0000 0x0 0x4000>, + <0x2 0xa4dd8000 0x0 0x4000>, + <0x2 0xa4de0000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + interrupt-controller; + #interrupt-cells = <1>; + #address-cells = <0>; + status = "disabled"; + }; + + ultra_rsm: rsm@2a0325000 { + compatible = "apple,t6032-rsm", "apple,rsm"; + reg = <0x2 0xa0325000 0x0 0x4000>, + <0x2 0xa03c0000 0x0 0x4>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_debug_gated>; + iommus = <&ultra_dart_rsm0 0>; + status = "disabled"; + }; + + ultra_scaler0: scaler@407000000 { + compatible = "apple,t6032-scaler", "apple,scaler"; + reg = <0x4 0x07000000 0x0 0x30000>, + <0x4 0x07210000 0x0 0x4000>, + <0x4 0x07204000 0x0 0x4000>, + <0x4 0x06000000 0x0 0x8000>; + interrupt-parent = <&aic>; + interrupts = , + ; + power-domains = <&ps_msr0>, <&ps_msr0_ase_core>; + iommus = <&ultra_dart_scaler00 0>, <&ultra_dart_scaler00 1>; + clocks = <&ultra_clocks 414>; + status = "disabled"; + }; + + ultra_scaler1: scaler@3c7000000 { + compatible = "apple,t6032-scaler", "apple,scaler"; + reg = <0x3 0xc7000000 0x0 0x30000>, + <0x3 0xc7210000 0x0 0x4000>, + <0x3 0xc7204000 0x0 0x4000>, + <0x3 0xc6000000 0x0 0x8000>; + interrupt-parent = <&aic>; + interrupts = , + ; + power-domains = <&ps_msr1>, <&ps_msr1_ase_core>; + iommus = <&ultra_dart_scaler10 0>, <&ultra_dart_scaler10 1>; + clocks = <&ultra_clocks 415>; + status = "disabled"; + }; + + ultra_apr0: video-codec@2c5000000 { + compatible = "apple,t6032-prores", "apple,prores"; + reg = <0x2 0xc5000000 0x0 0x4000>, + <0x2 0xc4000000 0x0 0x1000000>, + <0x2 0xc5078000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_scodec>; + iommus = <&ultra_dart_apr00 1>, <&ultra_dart_apr01 1>; + status = "disabled"; + }; + + ultra_apr1: video-codec@287000000 { + compatible = "apple,t6032-prores", "apple,prores"; + reg = <0x2 0x87000000 0x0 0x4000>, + <0x2 0x86000000 0x0 0x1000000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_prores>; + iommus = <&ultra_dart_apr10 0>; + status = "disabled"; + }; + + ultra_jpeg0: jpeg@2cf000000 { + compatible = "apple,t6032-jpeg", "apple,jpeg"; + reg = <0x2 0xcf000000 0x0 0x8000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_jpg>; + iommus = <&ultra_dart_jpeg00 0>; + clocks = <&ultra_clocks 350>, <&ultra_clocks 351>; + status = "disabled"; + }; + + ultra_jpeg1: jpeg@2cf008000 { + compatible = "apple,t6032-jpeg", "apple,jpeg"; + reg = <0x2 0xcf008000 0x0 0x8000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_jpg>; + iommus = <&ultra_dart_jpeg10 0>; + clocks = <&ultra_clocks 350>, <&ultra_clocks 351>; + status = "disabled"; + }; + + ultra_ave0: video-encoder@285100000 { + compatible = "apple,t6032-ave", "apple,ave"; + reg = <0x2 0x85100000 0x0 0x45c000>, + <0x2 0x85800000 0x0 0x800000>, + <0x2 0x85050000 0x0 0x4000>, + <0x2 0x92800430 0x0 0x20c>, + <0x2 0x84000000 0x0 0x1000000>; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + ; + power-domains = <&ps_venc0_sys>, <&ps_venc0_pipe4>, <&ps_venc0_pipe5>, <&ps_venc0_me0>, <&ps_venc0_me1>, <&ps_venc0_dma>; + iommus = <&ultra_dart_ave00 0>, <&ultra_dart_ave01 0>; + status = "disabled"; + }; + + ultra_ave1: video-encoder@3c5100000 { + compatible = "apple,t6032-ave", "apple,ave"; + reg = <0x3 0xc5100000 0x0 0x45c000>, + <0x3 0xc5800000 0x0 0x800000>, + <0x3 0xc5050000 0x0 0x4000>, + <0x2 0x92280510 0x0 0x7b14>, + <0x3 0xc4000000 0x0 0x1000000>; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + ; + power-domains = <&ps_venc1_pipe4>, <&ps_venc1_pipe5>, <&ps_venc1_me0>, <&ps_venc1_me1>, <&ps_venc1_dma>; + iommus = <&ultra_dart_ave10 0>, <&ultra_dart_ave11 0>; + status = "disabled"; + }; + +}; + +&die1 { + ultra_dart_scaler20: iommu@407200000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x4 0x07200000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_scaler30: iommu@3c7200000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x3 0xc7200000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_apr20: iommu@2c5028000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x2 0xc5028000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_apr21: iommu@2c502c000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x2 0xc502c000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_apr30: iommu@287008000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x2 0x87008000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_jpeg20: iommu@2cf004000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x2 0xcf004000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_jpeg30: iommu@2cf00c000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x2 0xcf00c000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_ave20: iommu@285030000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x2 0x85030000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_ave21: iommu@285040000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x2 0x85040000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_ave22: iommu@285020000 { + compatible = "apple,t6032-dart-smmu", "apple,dart-smmu"; + reg = <0x2 0x85020000 0x0 0x4000>; + status = "disabled"; + }; + + ultra_dart_ave23: filter@285044000 { + compatible = "apple,t6032-dapf", "apple,dapf"; + reg = <0x2 0x85044000 0x0 0x4000>; + status = "disabled"; + }; + + ultra_dart_ave30: iommu@3c5030000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x3 0xc5030000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_ave31: iommu@3c5040000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x3 0xc5040000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_ave32: iommu@3c5020000 { + compatible = "apple,t6032-dart-smmu", "apple,dart-smmu"; + reg = <0x3 0xc5020000 0x0 0x4000>; + status = "disabled"; + }; + + ultra_dart_ave33: filter@3c5044000 { + compatible = "apple,t6032-dapf", "apple,dapf"; + reg = <0x3 0xc5044000 0x0 0x4000>; + status = "disabled"; + }; + + ultra_dart_apciec40: iommu@721008000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0x7 0x21008000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_dart_apciec50: iommu@b21008000 { + compatible = "apple,t6031-dart", "apple,t8110-dart"; + reg = <0xb 0x21008000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + ultra_apciec4_piodma: dma-controller@722000000 { + compatible = "apple,t6032-pciec-piodma", "apple,pciec-piodma"; + reg = <0x7 0x22000000 0x0 0x4000>, + <0x7 0x22004000 0x0 0x4000>, + <0x7 0x22008000 0x0 0x4000>, + <0x7 0x20008000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + iommus = <&ultra_dart_apciec40 15>; + status = "disabled"; + }; + + ultra_apciec5_piodma: dma-controller@b22000000 { + compatible = "apple,t6032-pciec-piodma", "apple,pciec-piodma"; + reg = <0xb 0x22000000 0x0 0x4000>, + <0xb 0x22004000 0x0 0x4000>, + <0xb 0x22008000 0x0 0x4000>, + <0xb 0x20008000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + iommus = <&ultra_dart_apciec50 15>; + status = "disabled"; + }; + + ultra_atc4_dpin0: displayport@701e50000 { + compatible = "apple,t6032-dpin", "apple,dpin"; + reg = <0x7 0x01e50000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + ultra_atc4_dpin1: displayport@701e58000 { + compatible = "apple,t6032-dpin", "apple,dpin"; + reg = <0x7 0x01e58000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + ultra_atc5_dpin0: displayport@b01e50000 { + compatible = "apple,t6032-dpin", "apple,dpin"; + reg = <0xb 0x01e50000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + ultra_atc5_dpin1: displayport@b01e58000 { + compatible = "apple,t6032-dpin", "apple,dpin"; + reg = <0xb 0x01e58000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + ultra_scaler2: scaler@407000000 { + compatible = "apple,t6032-scaler", "apple,scaler"; + reg = <0x4 0x07000000 0x0 0x30000>, + <0x4 0x07210000 0x0 0x4000>, + <0x4 0x07204000 0x0 0x4000>, + <0x4 0x06000000 0x0 0x8000>; + interrupt-parent = <&aic>; + interrupts = , + ; + power-domains = <&ps_msr0_die1>, <&ps_msr0_ase_core_die1>; + iommus = <&ultra_dart_scaler20 0>, <&ultra_dart_scaler20 1>; + clocks = <&ultra_clocks 268435870>; + status = "disabled"; + }; + + ultra_scaler3: scaler@3c7000000 { + compatible = "apple,t6032-scaler", "apple,scaler"; + reg = <0x3 0xc7000000 0x0 0x30000>, + <0x3 0xc7210000 0x0 0x4000>, + <0x3 0xc7204000 0x0 0x4000>, + <0x3 0xc6000000 0x0 0x8000>; + interrupt-parent = <&aic>; + interrupts = , + ; + power-domains = <&ps_msr1_die1>, <&ps_msr1_ase_core_die1>; + iommus = <&ultra_dart_scaler30 0>, <&ultra_dart_scaler30 1>; + clocks = <&ultra_clocks 268435871>; + status = "disabled"; + }; + + ultra_apr2: video-codec@2c5000000 { + compatible = "apple,t6032-prores", "apple,prores"; + reg = <0x2 0xc5000000 0x0 0x4000>, + <0x2 0xc4000000 0x0 0x1000000>, + <0x2 0xc5078000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_scodec_die1>; + iommus = <&ultra_dart_apr20 1>, <&ultra_dart_apr21 1>; + status = "disabled"; + }; + + ultra_apr3: video-codec@287000000 { + compatible = "apple,t6032-prores", "apple,prores"; + reg = <0x2 0x87000000 0x0 0x4000>, + <0x2 0x86000000 0x0 0x1000000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_prores_die1>; + iommus = <&ultra_dart_apr30 0>; + status = "disabled"; + }; + + ultra_jpeg2: jpeg@2cf000000 { + compatible = "apple,t6032-jpeg", "apple,jpeg"; + reg = <0x2 0xcf000000 0x0 0x8000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_jpg_die1>; + iommus = <&ultra_dart_jpeg20 0>; + clocks = <&ultra_clocks 268435806>, <&ultra_clocks 268435807>; + status = "disabled"; + }; + + ultra_jpeg3: jpeg@2cf008000 { + compatible = "apple,t6032-jpeg", "apple,jpeg"; + reg = <0x2 0xcf008000 0x0 0x8000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_jpg_die1>; + iommus = <&ultra_dart_jpeg30 0>; + clocks = <&ultra_clocks 268435806>, <&ultra_clocks 268435807>; + status = "disabled"; + }; + + ultra_ave2: video-encoder@285100000 { + compatible = "apple,t6032-ave", "apple,ave"; + reg = <0x2 0x85100000 0x0 0x45c000>, + <0x2 0x85800000 0x0 0x800000>, + <0x2 0x85050000 0x0 0x4000>, + <0x2 0x92800430 0x0 0x20c>, + <0x2 0x84000000 0x0 0x1000000>; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + ; + power-domains = <&ps_venc0_sys_die1>, <&ps_venc0_pipe4_die1>, <&ps_venc0_pipe5_die1>, <&ps_venc0_me0_die1>, <&ps_venc0_me1_die1>, <&ps_venc0_dma_die1>; + iommus = <&ultra_dart_ave20 0>, <&ultra_dart_ave21 0>; + status = "disabled"; + }; + + ultra_ave3: video-encoder@3c5100000 { + compatible = "apple,t6032-ave", "apple,ave"; + reg = <0x3 0xc5100000 0x0 0x45c000>, + <0x3 0xc5800000 0x0 0x800000>, + <0x3 0xc5050000 0x0 0x4000>, + <0x2 0x92280510 0x0 0x7b14>, + <0x3 0xc4000000 0x0 0x1000000>; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + ; + power-domains = <&ps_venc1_pipe4_die1>, <&ps_venc1_pipe5_die1>, <&ps_venc1_me0_die1>, <&ps_venc1_me1_die1>, <&ps_venc1_dma_die1>; + iommus = <&ultra_dart_ave30 0>, <&ultra_dart_ave31 0>; + status = "disabled"; + }; + +}; + +/ { + ultra_mcc: memory-controller@2903c0000 { + compatible = "apple,t6032-mcc", "apple,mcc"; + reg = <0x2 0x903c0000 0x0 0x20000>, + <0x2 0x904d0000 0x0 0x149c>, + <0x2 0x92818000 0x0 0x4000>, + <0x22 0x92818000 0x0 0x4000>, + <0x2 0x20000000 0x0 0x2000000>, + <0x2 0x22000000 0x0 0x2000000>, + <0x2 0x24000000 0x0 0x2000000>, + <0x2 0x26000000 0x0 0x2000000>, + <0x2 0x28000000 0x0 0x2000000>, + <0x2 0x2a000000 0x0 0x2000000>, + <0x2 0x2c000000 0x0 0x2000000>, + <0x2 0x2e000000 0x0 0x2000000>, + <0x22 0x20000000 0x0 0x2000000>, + <0x22 0x22000000 0x0 0x2000000>, + <0x22 0x24000000 0x0 0x2000000>, + <0x22 0x26000000 0x0 0x2000000>, + <0x22 0x28000000 0x0 0x2000000>, + <0x22 0x2a000000 0x0 0x2000000>, + <0x22 0x2c000000 0x0 0x2000000>, + <0x22 0x2e000000 0x0 0x2000000>; + status = "disabled"; + }; + +}; + +/ { + ultra_clocks: clocks { + compatible = "apple,t6032-pmgr-clocks", "apple,pmgr-clocks"; + #clock-cells = <1>; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t6032.dtsi b/arch/arm64/boot/dts/apple/t6032.dtsi index 469cd8cbff72a..4b72abc681a48 100644 --- a/arch/arm64/boot/dts/apple/t6032.dtsi +++ b/arch/arm64/boot/dts/apple/t6032.dtsi @@ -463,3 +463,5 @@ &ps_afr_d2d_1_die1 { status = "okay"; }; + +#include "t6032-peripherals.dtsi" From 5103272685490948e096c069b4e1340bb649acfd Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 04:04:43 +1100 Subject: [PATCH 2/2] dt-bindings: apple: sort the shared compatible enum unions Preserve all merged and new SoC alternatives without changing compatible tuple order. 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/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 +- 7 files changed, 7 insertions(+), 7 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/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: