diff --git a/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml b/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml index 4b824f33d4928..2b8450ee54230 100644 --- a/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml +++ b/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml @@ -19,59 +19,128 @@ description: | Selectors are scoped by the referenced PMGR; a dual-die platform has one provider per die. +select: + properties: + compatible: + contains: + enum: + - apple,t6000-pmgr-clocks + - apple,t6032-pmgr-clocks + - apple,t6041-pmgr-clocks + - apple,t8103-pmgr-clocks + - apple,t8132-pmgr-clocks + - apple,t8140-pmgr-clocks + required: + - compatible + properties: - compatible: - oneOf: - - items: - - enum: - - apple,t6041-pmgr-clocks - - apple,t8140-pmgr-clocks - - const: apple,pmgr-clocks - - items: - - const: apple,t8103-pmgr-clocks - - const: apple,pmgr-clocks - - items: - - const: apple,t6000-pmgr-clocks - - const: apple,pmgr-clocks - - reg: - description: PMGR control apertures in hardware-description order. - minItems: 44 - maxItems: 63 - - '#clock-cells': - const: 1 + 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 + description: Shared hardware resource metadata. 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: + oneOf: + - items: + - enum: + - apple,t6041-pmgr-clocks + - apple,t8140-pmgr-clocks + - const: apple,pmgr-clocks + - items: + - const: apple,t8103-pmgr-clocks + - const: apple,pmgr-clocks + - items: + - const: apple,t6000-pmgr-clocks + - const: apple,pmgr-clocks + + 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 6c71461657af2..57f7a93b5b284 100644 --- a/Documentation/devicetree/bindings/crypto/apple,aes.yaml +++ b/Documentation/devicetree/bindings/crypto/apple,aes.yaml @@ -13,44 +13,29 @@ description: | AES hardware attached to the SIO DART. The register banks are the engine, shared control and auxiliary control windows, in that order. -properties: - compatible: - items: - - enum: +select: + properties: + compatible: + contains: + enum: - apple,t6000-aes - apple,t6020-aes - apple,t6021-aes - apple,t6022-aes - apple,t6030-aes - apple,t6031-aes + - apple,t6032-aes - apple,t6041-aes - apple,t8103-aes - apple,t8112-aes - apple,t8122-aes + - apple,t8132-aes - apple,t8140-aes - - const: apple,aes - - reg: - minItems: 2 - maxItems: 3 - description: Engine and control banks, with an auxiliary bank on later variants. - - interrupts: - maxItems: 1 - - power-domains: - maxItems: 1 - - iommus: - minItems: 1 - maxItems: 2 + required: + - compatible -required: - - compatible - - reg - - interrupts - - power-domains - - iommus +properties: + compatible: true allOf: - if: @@ -58,35 +43,149 @@ allOf: compatible: contains: enum: - - apple,t6000-aes - - apple,t6020-aes - - apple,t6021-aes - - apple,t6022-aes - - apple,t6030-aes - - apple,t6031-aes - - apple,t8103-aes - - apple,t8112-aes - - apple,t8122-aes + - apple,t8132-aes + required: + - compatible then: properties: - reg: - maxItems: 2 - else: - properties: + compatible: + items: + - enum: + - apple,t8132-aes + - const: apple,aes + reg: minItems: 3 - - if: - properties: - compatible: - contains: - const: apple,t6000-aes - then: - properties: - iommus: - minItems: 2 - else: - properties: + maxItems: 3 + + interrupts: + maxItems: 1 + + power-domains: + maxItems: 1 + iommus: maxItems: 1 -additionalProperties: false + 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: + items: + - enum: + - apple,t6000-aes + - apple,t6020-aes + - apple,t6021-aes + - apple,t6022-aes + - apple,t6030-aes + - apple,t6031-aes + - apple,t6041-aes + - apple,t8103-aes + - apple,t8112-aes + - apple,t8122-aes + - apple,t8140-aes + - const: apple,aes + + reg: + minItems: 2 + maxItems: 3 + description: Engine and control banks, with an auxiliary bank on later variants. + + interrupts: + maxItems: 1 + + power-domains: + maxItems: 1 + + iommus: + minItems: 1 + maxItems: 2 + + required: + - compatible + - reg + - interrupts + - power-domains + - iommus + + allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t6000-aes + - apple,t6020-aes + - apple,t6021-aes + - apple,t6022-aes + - apple,t6030-aes + - apple,t6031-aes + - apple,t8103-aes + - apple,t8112-aes + - apple,t8122-aes + then: + properties: + reg: + maxItems: 2 + else: + properties: + reg: + minItems: 3 + - if: + properties: + compatible: + contains: + const: apple,t6000-aes + then: + properties: + iommus: + minItems: 2 + else: + properties: + iommus: + maxItems: 1 + + additionalProperties: false + +unevaluatedProperties: 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..0d85582addd62 --- /dev/null +++ b/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml @@ -0,0 +1,80 @@ +# 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,t8132-dcp-expert + - apple,t8140-dcp-expert + required: + - compatible + +properties: + compatible: true + +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 + + 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: + maxItems: 1 + + required: + - compatible + - reg + - interrupts + +unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/display/apple,dpin.yaml b/Documentation/devicetree/bindings/display/apple,dpin.yaml index fc75a39315868..bb4ca4c234236 100644 --- a/Documentation/devicetree/bindings/display/apple,dpin.yaml +++ b/Documentation/devicetree/bindings/display/apple,dpin.yaml @@ -12,32 +12,112 @@ maintainers: description: | DisplayPort ingress registers and interrupt for a USB4 display tunnel. -properties: - compatible: - items: - - enum: +select: + properties: + compatible: + contains: + enum: - apple,t6000-dpin - apple,t6020-dpin - apple,t6021-dpin - apple,t6022-dpin - apple,t6030-dpin - apple,t6031-dpin + - apple,t6032-dpin - apple,t6041-dpin - apple,t8103-dpin - apple,t8112-dpin - apple,t8122-dpin - - const: apple,dpin + - apple,t8132-dpin + required: + - compatible + +properties: + 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: + items: + - enum: + - apple,t6000-dpin + - apple,t6020-dpin + - apple,t6021-dpin + - apple,t6022-dpin + - apple,t6030-dpin + - apple,t6031-dpin + - apple,t6041-dpin + - apple,t8103-dpin + - apple,t8112-dpin + - apple,t8122-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 e31c545d9e4a4..99aa37f64119d 100644 --- a/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml +++ b/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml @@ -13,38 +13,125 @@ 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,t6020-pcie-piodma + - apple,t6021-pcie-piodma + - apple,t6022-pcie-piodma + - apple,t6030-pcie-piodma + - apple,t6031-pcie-piodma + - apple,t6032-pcie-piodma + - apple,t6041-pcie-piodma + - apple,t8112-pcie-piodma + - apple,t8122-pcie-piodma + - apple,t8132-pcie-piodma + required: + - compatible + properties: - compatible: - oneOf: - - items: - - const: apple,t6041-pcie-piodma - - const: apple,pcie-piodma - - items: - - enum: - - apple,t6020-pcie-piodma - - apple,t6021-pcie-piodma - - apple,t6022-pcie-piodma - - apple,t6030-pcie-piodma - - apple,t6031-pcie-piodma - - apple,t8112-pcie-piodma - - apple,t8122-pcie-piodma - - const: apple,pcie-piodma - - 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 + - items: + - enum: + - apple,t6020-pcie-piodma + - apple,t6021-pcie-piodma + - apple,t6022-pcie-piodma + - apple,t6030-pcie-piodma + - apple,t6031-pcie-piodma + - apple,t8112-pcie-piodma + - apple,t8122-pcie-piodma + - const: apple,pcie-piodma + + 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 cd1ccf7b4d6aa..1bbf5359b2b19 100644 --- a/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml +++ b/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml @@ -13,37 +13,126 @@ description: | PCIe tunnel auxiliary DMA register banks and completion interrupt. Its stream is distinct from the tunnel endpoint streams in the same DART. -properties: - compatible: - items: - - enum: +select: + properties: + compatible: + contains: + enum: - apple,t6000-pciec-piodma - apple,t6020-pciec-piodma - apple,t6021-pciec-piodma - apple,t6022-pciec-piodma - apple,t6030-pciec-piodma - apple,t6031-pciec-piodma + - apple,t6032-pciec-piodma - apple,t6041-pciec-piodma - apple,t8103-pciec-piodma - apple,t8112-pciec-piodma - apple,t8122-pciec-piodma - - const: apple,pciec-piodma + - apple,t8132-pciec-piodma + required: + - compatible + +properties: + 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: + items: + - enum: + - apple,t6000-pciec-piodma + - apple,t6020-pciec-piodma + - apple,t6021-pciec-piodma + - apple,t6022-pciec-piodma + - apple,t6030-pciec-piodma + - apple,t6031-pciec-piodma + - apple,t6041-pciec-piodma + - apple,t8103-pciec-piodma + - apple,t8112-pciec-piodma + - apple,t8122-pciec-piodma + - const: apple,pciec-piodma + + reg: + minItems: 4 + maxItems: 4 + description: Register apertures in hardware-description order. - reg: - minItems: 4 - maxItems: 4 - description: Register apertures in hardware-description order. + interrupts: + maxItems: 1 - interrupts: - maxItems: 1 + iommus: + maxItems: 1 - iommus: - maxItems: 1 + required: + - compatible + - reg + - interrupts + - iommus -required: - - compatible - - reg - - interrupts - - iommus + additionalProperties: false -additionalProperties: false +unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/dma/apple,sio.yaml b/Documentation/devicetree/bindings/dma/apple,sio.yaml index 4f7c305dd32b6..66e881608d388 100644 --- a/Documentation/devicetree/bindings/dma/apple,sio.yaml +++ b/Documentation/devicetree/bindings/dma/apple,sio.yaml @@ -22,29 +22,53 @@ allOf: properties: compatible: contains: - const: apple,t8140-sio + 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: - if: - properties: - compatible: - contains: - enum: - - apple,t6031-sio - - apple,t8122-sio - then: - properties: - reg: - minItems: 2 - maxItems: 2 - else: - properties: - reg: - maxItems: 1 + required: + - dma-channels + allOf: + - if: + properties: + compatible: + contains: + const: apple,t8140-sio + then: + properties: + reg: + minItems: 3 + maxItems: 3 + else: + if: + properties: + compatible: + contains: + enum: + - apple,t6031-sio + - apple,t8122-sio + then: + properties: + reg: + minItems: 2 + maxItems: 2 + else: + properties: + reg: + maxItems: 1 properties: compatible: @@ -58,6 +82,7 @@ properties: - apple,t8122-sio - apple,t8103-sio - apple,t8112-sio + - apple,t8132-sio - apple,t8140-sio - const: apple,sio - description: T6041 firmware requires a generation-specific backend. @@ -75,6 +100,8 @@ properties: minItems: 1 maxItems: 3 + status: true + '#dma-cells': const: 1 description: @@ -136,7 +163,6 @@ required: - compatible - reg - '#dma-cells' - - dma-channels - mboxes - iommus - power-domains diff --git a/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml b/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml index d5bad948fc099..2f8ce57bad574 100644 --- a/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml +++ b/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml @@ -14,357 +14,456 @@ description: | errors to dedicated platform interrupt groups. A second group reports fatal events latched by peripheral event logs. -properties: - compatible: - oneOf: - - items: - - enum: - - apple,t6000-error-handler - - apple,t6001-error-handler - - apple,t6002-error-handler - - apple,t6020-error-handler - - apple,t6021-error-handler - - apple,t6022-error-handler - - apple,t6030-error-handler - - apple,t6031-error-handler - - apple,t6041-error-handler - - apple,t8103-error-handler - - apple,t8112-error-handler - - apple,t8122-error-handler - - apple,t8140-error-handler - - const: apple,soc-error-handler - - items: - - enum: - - apple,t6000-event-log - - apple,t6001-event-log - - apple,t6002-event-log - - apple,t6020-event-log - - apple,t6021-event-log - - apple,t6022-event-log - - apple,t6030-event-log - - apple,t6031-event-log - - apple,t6041-event-log - - apple,t8103-event-log - - apple,t8112-event-log - - apple,t8122-event-log - - apple,t8140-event-log - - const: apple,soc-event-log - - power-domains: - maxItems: 1 - description: Power domain needed for the associated error-source registers. - - interrupts: - minItems: 9 - maxItems: 322 +select: + properties: + compatible: + contains: + enum: + - apple,t6000-error-handler + - apple,t6000-event-log + - apple,t6001-error-handler + - apple,t6001-event-log + - apple,t6002-error-handler + - apple,t6002-event-log + - apple,t6020-error-handler + - apple,t6020-event-log + - apple,t6021-error-handler + - apple,t6021-event-log + - apple,t6022-error-handler + - apple,t6022-event-log + - apple,t6030-error-handler + - apple,t6030-event-log + - apple,t6031-error-handler + - apple,t6031-event-log + - apple,t6041-error-handler + - apple,t6041-event-log + - apple,t8103-error-handler + - apple,t8103-event-log + - apple,t8112-error-handler + - apple,t8112-event-log + - apple,t8122-error-handler + - apple,t8122-event-log + - apple,t8132-error-handler + - apple,t8132-event-log + - apple,t8140-error-handler + - apple,t8140-event-log + required: + - compatible - reg: - minItems: 10 - maxItems: 255 - description: | - Status apertures in hardware-description order. T6041 uses qualified - per-source NI status apertures in interrupt order. Native register - access on other variants requires separate qualification. - -required: - - compatible - - interrupts +properties: + compatible: true allOf: - - if: - properties: - compatible: - contains: - const: apple,t6041-error-handler - then: - properties: - interrupts: - minItems: 89 - maxItems: 89 - reg: - minItems: 25 - maxItems: 25 - required: - - reg - - if: - properties: - compatible: - contains: - const: apple,t8140-error-handler - then: - properties: - interrupts: - minItems: 26 - maxItems: 26 - reg: - minItems: 17 - maxItems: 17 - - 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 - reg: - minItems: 10 - maxItems: 10 - - if: - properties: - compatible: - contains: - enum: - - apple,t8122-error-handler - then: - properties: - reg: - minItems: 19 - maxItems: 19 - interrupts: - minItems: 39 - maxItems: 39 - required: - - reg - if: properties: compatible: contains: enum: - - apple,t6030-error-handler - then: - properties: - reg: - minItems: 26 - maxItems: 26 - interrupts: - minItems: 54 - maxItems: 54 + - apple,t8132-error-handler + - apple,t8132-event-log required: - - reg - - if: - properties: - compatible: - contains: - enum: - - apple,t8122-event-log + - compatible then: - properties: - reg: - minItems: 13 - maxItems: 13 - interrupts: - minItems: 13 - maxItems: 13 - required: - - reg - - if: properties: compatible: - contains: - enum: - - apple,t6030-event-log - then: - properties: - reg: - minItems: 26 - maxItems: 26 - interrupts: - minItems: 26 - maxItems: 26 - required: - - reg - - if: - properties: - compatible: - contains: - enum: - - apple,t6031-event-log - then: - properties: - reg: - minItems: 25 - maxItems: 25 - interrupts: - minItems: 26 - maxItems: 26 - required: - - reg - - if: - properties: - compatible: - contains: - enum: - - apple,t6031-error-handler - then: - oneOf: - - properties: - reg: - minItems: 123 - maxItems: 123 - interrupts: - minItems: 159 - maxItems: 159 - - properties: - reg: - minItems: 113 - maxItems: 113 - interrupts: - minItems: 141 - maxItems: 141 - required: - - reg + oneOf: + - items: + - const: apple,t8132-error-handler + - const: apple,soc-error-handler + - items: + - const: apple,t8132-event-log + - const: apple,soc-event-log - - if: - properties: - compatible: - contains: - const: apple,t8103-error-handler - then: - properties: - interrupts: - minItems: 11 - maxItems: 11 reg: - minItems: 18 - maxItems: 18 - required: - - reg - - if: - properties: - compatible: - contains: - const: apple,t8103-event-log - then: - properties: - interrupts: - minItems: 16 - maxItems: 16 - reg: - minItems: 16 - maxItems: 16 - required: - - reg - - if: - properties: - compatible: - contains: - const: apple,t6000-error-handler - then: - properties: - interrupts: - minItems: 76 - maxItems: 76 - reg: - minItems: 55 + minItems: 23 maxItems: 55 - required: - - reg - - if: - properties: - compatible: - contains: - const: apple,t6000-event-log - then: - properties: - interrupts: - minItems: 28 - maxItems: 28 - reg: - minItems: 28 - maxItems: 28 - required: - - reg - - if: - properties: - compatible: - contains: - const: apple,t6001-error-handler - then: - properties: + description: Status apertures in hardware-description order. + interrupts: - minItems: 127 - maxItems: 127 - reg: - minItems: 90 - maxItems: 90 + minItems: 12 + maxItems: 34 + required: + - compatible - reg - - if: + - 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,t6001-event-log - then: - properties: + oneOf: + - items: + - enum: + - apple,t6000-error-handler + - apple,t6001-error-handler + - apple,t6002-error-handler + - apple,t6020-error-handler + - apple,t6021-error-handler + - apple,t6022-error-handler + - apple,t6030-error-handler + - apple,t6031-error-handler + - apple,t6041-error-handler + - apple,t8103-error-handler + - apple,t8112-error-handler + - apple,t8122-error-handler + - apple,t8140-error-handler + - const: apple,soc-error-handler + - items: + - enum: + - apple,t6000-event-log + - apple,t6001-event-log + - apple,t6002-event-log + - apple,t6020-event-log + - apple,t6021-event-log + - apple,t6022-event-log + - apple,t6030-event-log + - apple,t6031-event-log + - apple,t6041-event-log + - apple,t8103-event-log + - apple,t8112-event-log + - apple,t8122-event-log + - apple,t8140-event-log + - const: apple,soc-event-log + + power-domains: + maxItems: 1 + description: Power domain needed for the associated error-source registers. + interrupts: - minItems: 28 - maxItems: 28 + minItems: 9 + maxItems: 322 + reg: - minItems: 28 - maxItems: 28 - required: - - reg - - if: - properties: - compatible: - contains: - const: apple,t6002-error-handler - then: - oneOf: - - properties: - interrupts: - minItems: 138 - maxItems: 138 - reg: - minItems: 104 - maxItems: 104 - - properties: - interrupts: - minItems: 130 - maxItems: 130 - reg: - minItems: 101 - maxItems: 101 - required: - - reg - - if: - properties: - compatible: - contains: - const: apple,t6002-event-log - then: - oneOf: - - properties: - interrupts: - minItems: 28 - maxItems: 28 - reg: - minItems: 28 - maxItems: 28 - - properties: - interrupts: - minItems: 26 - maxItems: 26 - reg: - minItems: 26 - maxItems: 26 + minItems: 10 + maxItems: 255 + description: | + Status apertures in hardware-description order. T6041 uses qualified + per-source NI status apertures in interrupt order. Native register + access on other variants requires separate qualification. + required: - - reg + - compatible + - interrupts + + allOf: + - if: + properties: + compatible: + contains: + const: apple,t6041-error-handler + then: + properties: + interrupts: + minItems: 89 + maxItems: 89 + reg: + minItems: 25 + maxItems: 25 + required: + - reg + - if: + properties: + compatible: + contains: + const: apple,t8140-error-handler + then: + properties: + interrupts: + minItems: 26 + maxItems: 26 + reg: + minItems: 17 + maxItems: 17 + - 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 + reg: + minItems: 10 + maxItems: 10 + - if: + properties: + compatible: + contains: + enum: + - apple,t8122-error-handler + then: + properties: + reg: + minItems: 19 + maxItems: 19 + interrupts: + minItems: 39 + maxItems: 39 + required: + - reg + - if: + properties: + compatible: + contains: + enum: + - apple,t6030-error-handler + then: + properties: + reg: + minItems: 26 + maxItems: 26 + interrupts: + minItems: 54 + maxItems: 54 + required: + - reg + - if: + properties: + compatible: + contains: + enum: + - apple,t8122-event-log + then: + properties: + reg: + minItems: 13 + maxItems: 13 + interrupts: + minItems: 13 + maxItems: 13 + required: + - reg + - if: + properties: + compatible: + contains: + enum: + - apple,t6030-event-log + then: + properties: + reg: + minItems: 26 + maxItems: 26 + interrupts: + minItems: 26 + maxItems: 26 + required: + - reg + - if: + properties: + compatible: + contains: + enum: + - apple,t6031-event-log + then: + properties: + reg: + minItems: 25 + maxItems: 25 + interrupts: + minItems: 26 + maxItems: 26 + required: + - reg + - if: + properties: + compatible: + contains: + enum: + - apple,t6031-error-handler + then: + oneOf: + - properties: + reg: + minItems: 123 + maxItems: 123 + interrupts: + minItems: 159 + maxItems: 159 + - properties: + reg: + minItems: 113 + maxItems: 113 + interrupts: + minItems: 141 + maxItems: 141 + required: + - reg + + - if: + properties: + compatible: + contains: + const: apple,t8103-error-handler + then: + properties: + interrupts: + minItems: 11 + maxItems: 11 + reg: + minItems: 18 + maxItems: 18 + required: + - reg + - if: + properties: + compatible: + contains: + const: apple,t8103-event-log + then: + properties: + interrupts: + minItems: 16 + maxItems: 16 + reg: + minItems: 16 + maxItems: 16 + required: + - reg + - if: + properties: + compatible: + contains: + const: apple,t6000-error-handler + then: + properties: + interrupts: + minItems: 76 + maxItems: 76 + reg: + minItems: 55 + maxItems: 55 + required: + - reg + - if: + properties: + compatible: + contains: + const: apple,t6000-event-log + then: + properties: + interrupts: + minItems: 28 + maxItems: 28 + reg: + minItems: 28 + maxItems: 28 + required: + - reg + - if: + properties: + compatible: + contains: + const: apple,t6001-error-handler + then: + properties: + interrupts: + minItems: 127 + maxItems: 127 + reg: + minItems: 90 + maxItems: 90 + required: + - reg + - if: + properties: + compatible: + contains: + const: apple,t6001-event-log + then: + properties: + interrupts: + minItems: 28 + maxItems: 28 + reg: + minItems: 28 + maxItems: 28 + required: + - reg + - if: + properties: + compatible: + contains: + const: apple,t6002-error-handler + then: + oneOf: + - properties: + interrupts: + minItems: 138 + maxItems: 138 + reg: + minItems: 104 + maxItems: 104 + - properties: + interrupts: + minItems: 130 + maxItems: 130 + reg: + minItems: 101 + maxItems: 101 + required: + - reg + - if: + properties: + compatible: + contains: + const: apple,t6002-event-log + then: + oneOf: + - properties: + interrupts: + minItems: 28 + maxItems: 28 + reg: + minItems: 28 + maxItems: 28 + - properties: + interrupts: + minItems: 26 + maxItems: 26 + reg: + minItems: 26 + maxItems: 26 + required: + - reg + + additionalProperties: false -additionalProperties: false +unevaluatedProperties: false examples: - | diff --git a/Documentation/devicetree/bindings/iommu/apple,dapf.yaml b/Documentation/devicetree/bindings/iommu/apple,dapf.yaml index 2a1635099f474..2a7262c6c441e 100644 --- a/Documentation/devicetree/bindings/iommu/apple,dapf.yaml +++ b/Documentation/devicetree/bindings/iommu/apple,dapf.yaml @@ -21,9 +21,11 @@ select: compatible: contains: enum: - - apple,t8122-dapf - apple,t6030-dapf - apple,t6031-dapf + - apple,t6032-dapf + - apple,t8122-dapf + - apple,t8132-dapf required: - compatible @@ -34,6 +36,8 @@ properties: - apple,t8122-dapf - apple,t6030-dapf - apple,t6031-dapf + - apple,t6032-dapf + - apple,t8132-dapf - const: apple,dapf reg: diff --git a/Documentation/devicetree/bindings/iommu/apple,dart-smmu.yaml b/Documentation/devicetree/bindings/iommu/apple,dart-smmu.yaml index ba8b8fd188358..e06b179c79cab 100644 --- a/Documentation/devicetree/bindings/iommu/apple,dart-smmu.yaml +++ b/Documentation/devicetree/bindings/iommu/apple,dart-smmu.yaml @@ -21,9 +21,11 @@ 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 @@ -34,6 +36,8 @@ properties: - apple,t8122-dart-smmu - apple,t6030-dart-smmu - apple,t6031-dart-smmu + - apple,t6032-dart-smmu + - apple,t8132-dart-smmu - const: apple,dart-smmu reg: diff --git a/Documentation/devicetree/bindings/iommu/apple,gapf.yaml b/Documentation/devicetree/bindings/iommu/apple,gapf.yaml new file mode 100644 index 0000000000000..60dc0758046fe --- /dev/null +++ b/Documentation/devicetree/bindings/iommu/apple,gapf.yaml @@ -0,0 +1,42 @@ +# 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: + maxItems: 1 + +required: + - compatible + - reg + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/media/apple,avd.yaml b/Documentation/devicetree/bindings/media/apple,avd.yaml index 1187255b0f474..3291f775c9924 100644 --- a/Documentation/devicetree/bindings/media/apple,avd.yaml +++ b/Documentation/devicetree/bindings/media/apple,avd.yaml @@ -12,84 +12,155 @@ description: 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/Documentation/devicetree/bindings/media/apple,jpeg.yaml b/Documentation/devicetree/bindings/media/apple,jpeg.yaml index 364c61d23c2be..bbab1e49d9f50 100644 --- a/Documentation/devicetree/bindings/media/apple,jpeg.yaml +++ b/Documentation/devicetree/bindings/media/apple,jpeg.yaml @@ -20,90 +20,200 @@ 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: - oneOf: - - enum: +select: + properties: + compatible: + contains: + enum: + - apple,t6000-jpeg + - apple,t6020-jpeg + - apple,t6021-jpeg + - apple,t6022-jpeg + - apple,t6030-jpeg + - apple,t6031-jpeg + - apple,t6032-jpeg - apple,t6041-jpeg + - apple,t8103-jpeg + - apple,t8112-jpeg + - apple,t8122-jpeg + - apple,t8132-jpeg - apple,t8140-jpeg - - items: - - enum: - - apple,t6000-jpeg - - apple,t6020-jpeg - - apple,t6021-jpeg - - apple,t6022-jpeg - - apple,t6030-jpeg - - apple,t6031-jpeg - - apple,t8103-jpeg - - apple,t8112-jpeg - - apple,t8122-jpeg - - const: apple,jpeg - - reg: - maxItems: 1 - - interrupts: - maxItems: 1 - - iommus: - maxItems: 1 - - clocks: - minItems: 1 - maxItems: 2 - - 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 + 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. - -required: - - compatible - - reg - - interrupts - - iommus - - power-domains + description: Shared hardware resource metadata. allOf: - - if: - properties: - compatible: - const: apple,t6041-jpeg - then: - required: - - apple,dma-range - else: - properties: - apple,dma-range: false - if: properties: compatible: contains: enum: - - apple,t6030-jpeg - - apple,t6031-jpeg - - apple,t8122-jpeg + - apple,t8132-jpeg + required: + - compatible then: properties: + compatible: + items: + - enum: + - apple,t8132-jpeg + - const: apple,jpeg + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + power-domains: maxItems: 1 -additionalProperties: false + 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: + oneOf: + - enum: + - apple,t6041-jpeg + - apple,t8140-jpeg + - items: + - enum: + - apple,t6000-jpeg + - apple,t6020-jpeg + - apple,t6021-jpeg + - apple,t6022-jpeg + - apple,t6030-jpeg + - apple,t6031-jpeg + - apple,t8103-jpeg + - apple,t8112-jpeg + - apple,t8122-jpeg + - const: apple,jpeg + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + iommus: + maxItems: 1 + + clocks: + minItems: 1 + maxItems: 2 + + 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 + - if: + properties: + compatible: + contains: + enum: + - apple,t6030-jpeg + - apple,t6031-jpeg + - apple,t8122-jpeg + then: + properties: + power-domains: + maxItems: 1 + + additionalProperties: false + +unevaluatedProperties: false examples: - | diff --git a/Documentation/devicetree/bindings/media/apple,prores.yaml b/Documentation/devicetree/bindings/media/apple,prores.yaml index 1b24523e3d004..52213425af62b 100644 --- a/Documentation/devicetree/bindings/media/apple,prores.yaml +++ b/Documentation/devicetree/bindings/media/apple,prores.yaml @@ -14,64 +14,28 @@ 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,t6000-prores + - apple,t6020-prores + - apple,t6021-prores + - apple,t6022-prores + - apple,t6030-prores + - apple,t6031-prores + - apple,t6032-prores + - apple,t6041-prores + - apple,t8112-prores + - apple,t8122-prores + - apple,t8132-prores + - apple,t8140-prores + required: + - compatible + properties: - compatible: - oneOf: - - const: apple,t8140-prores - - items: - - enum: - - apple,t6000-prores - - apple,t6020-prores - - apple,t6021-prores - - apple,t6022-prores - - apple,t6030-prores - - apple,t6031-prores - - apple,t6041-prores - - apple,t8112-prores - - apple,t8122-prores - - const: apple,prores - - reg: - minItems: 2 - maxItems: 3 - description: Engine, wrapper and generation-specific auxiliary register windows. - - reg-names: - minItems: 2 - items: - - const: core - - const: wrapper - - const: aux - - interrupts: - minItems: 1 - maxItems: 2 - - iommus: - minItems: 1 - maxItems: 2 - - 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 - - interrupts - - iommus - - power-domains + compatible: true allOf: - if: @@ -79,70 +43,206 @@ allOf: compatible: contains: enum: - - apple,t6030-prores - - apple,t6031-prores - - apple,t8122-prores + - apple,t8132-prores + required: + - compatible then: - properties: - reg: - minItems: 2 - maxItems: 3 - power-domains: - maxItems: 1 - - if: properties: compatible: - contains: - enum: - - apple,t6020-prores - - apple,t6021-prores - - apple,t6022-prores - - apple,t8112-prores - then: - properties: - reg: - maxItems: 2 - reg-names: - maxItems: 2 - - if: - properties: - compatible: - contains: - enum: - - apple,t6041-prores - then: - properties: + items: + - enum: + - apple,t8132-prores + - const: apple,prores + reg: minItems: 3 maxItems: 3 - reg-names: - minItems: 3 - maxItems: 3 + interrupts: - maxItems: 1 - iommus: - maxItems: 1 - required: - - resets - - reg-names - - if: - properties: - compatible: - contains: - enum: - - apple,t8140-prores - then: - properties: - reg: - maxItems: 2 - reg-names: + minItems: 2 maxItems: 2 + + power-domains: + maxItems: 1 + iommus: maxItems: 1 + required: - - reg-names + - compatible + - reg + - interrupts + - power-domains + - iommus + else: + 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: + - enum: + - apple,t6000-prores + - apple,t6020-prores + - apple,t6021-prores + - apple,t6022-prores + - apple,t6030-prores + - apple,t6031-prores + - apple,t6041-prores + - apple,t8112-prores + - apple,t8122-prores + - const: apple,prores + + reg: + minItems: 2 + maxItems: 3 + description: Engine, wrapper and generation-specific auxiliary register windows. + + reg-names: + minItems: 2 + items: + - const: core + - const: wrapper + - const: aux + + interrupts: + minItems: 1 + maxItems: 2 + + iommus: + minItems: 1 + maxItems: 2 + + 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 + - interrupts + - iommus + - power-domains + + allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t6030-prores + - apple,t6031-prores + - apple,t8122-prores + then: + properties: + reg: + minItems: 2 + maxItems: 3 + power-domains: + maxItems: 1 + - if: + properties: + compatible: + contains: + enum: + - apple,t6020-prores + - apple,t6021-prores + - apple,t6022-prores + - apple,t8112-prores + then: + properties: + reg: + maxItems: 2 + reg-names: + maxItems: 2 + - if: + properties: + compatible: + contains: + enum: + - apple,t6041-prores + then: + properties: + reg: + minItems: 3 + maxItems: 3 + reg-names: + minItems: 3 + maxItems: 3 + interrupts: + maxItems: 1 + iommus: + maxItems: 1 + required: + - resets + - reg-names + - if: + properties: + compatible: + contains: + enum: + - apple,t8140-prores + then: + properties: + reg: + maxItems: 2 + reg-names: + maxItems: 2 + iommus: + maxItems: 1 + required: + - reg-names + + additionalProperties: false -additionalProperties: false +unevaluatedProperties: false examples: - | diff --git a/Documentation/devicetree/bindings/media/apple,scaler.yaml b/Documentation/devicetree/bindings/media/apple,scaler.yaml index bf2e7a6107ba8..e7e041337193b 100644 --- a/Documentation/devicetree/bindings/media/apple,scaler.yaml +++ b/Documentation/devicetree/bindings/media/apple,scaler.yaml @@ -14,51 +14,29 @@ description: | carry image data and PIODMA transfers. Firmware performance votes are not fixed clock rates and are not encoded as clock-frequency values. -properties: - compatible: - items: - - enum: +select: + properties: + compatible: + contains: + enum: - apple,t6000-scaler - apple,t6020-scaler - apple,t6021-scaler - apple,t6022-scaler - apple,t6030-scaler - apple,t6031-scaler + - apple,t6032-scaler - apple,t6041-scaler - apple,t8103-scaler - apple,t8112-scaler - apple,t8122-scaler + - apple,t8132-scaler - apple,t8140-scaler - - const: apple,scaler - - reg: - minItems: 2 - maxItems: 4 - - interrupts: - minItems: 2 - maxItems: 2 - - power-domains: - minItems: 1 - maxItems: 3 - - iommus: - minItems: 1 - maxItems: 2 - - clocks: - maxItems: 1 + required: + - compatible - resets: - maxItems: 1 - -required: - - compatible - - reg - - interrupts - - power-domains - - iommus +properties: + compatible: true allOf: - if: @@ -66,91 +44,225 @@ allOf: compatible: contains: enum: - - apple,t6041-scaler - - apple,t8140-scaler + - apple,t8132-scaler + required: + - compatible then: properties: + compatible: + items: + - enum: + - apple,t8132-scaler + - const: apple,scaler + reg: minItems: 4 maxItems: 4 - power-domains: - minItems: 2 - maxItems: 2 - iommus: - minItems: 2 - maxItems: 2 - required: - - resets - - clocks - - if: - properties: - compatible: - contains: - enum: - - apple,t6020-scaler - - apple,t6021-scaler - - apple,t6022-scaler - - apple,t8112-scaler - then: - properties: - power-domains: - minItems: 2 - maxItems: 3 - iommus: + + interrupts: minItems: 2 maxItems: 2 - - if: - properties: - compatible: - contains: - enum: - - apple,t6030-scaler - - apple,t6031-scaler - - apple,t8122-scaler - then: - properties: + power-domains: minItems: 1 maxItems: 2 - - if: - properties: - compatible: - contains: - const: apple,t8103-scaler - then: - properties: - reg: - maxItems: 2 - else: - properties: - reg: - minItems: 3 - - if: - properties: - compatible: - contains: - const: apple,t6000-scaler - then: - properties: - reg: - minItems: 3 - maxItems: 3 - - if: - properties: - compatible: - contains: - enum: - - apple,t6000-scaler - - apple,t8103-scaler - then: - properties: - power-domains: - minItems: 2 - maxItems: 2 + iommus: - minItems: 2 + minItems: 1 + maxItems: 2 + + clocks: + maxItems: 1 + required: - - resets - - clocks + - 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: + items: + - enum: + - apple,t6000-scaler + - apple,t6020-scaler + - apple,t6021-scaler + - apple,t6022-scaler + - apple,t6030-scaler + - apple,t6031-scaler + - apple,t6041-scaler + - apple,t8103-scaler + - apple,t8112-scaler + - apple,t8122-scaler + - apple,t8140-scaler + - const: apple,scaler + + reg: + minItems: 2 + maxItems: 4 + + interrupts: + minItems: 2 + maxItems: 2 + + power-domains: + minItems: 1 + maxItems: 3 + + iommus: + minItems: 1 + maxItems: 2 + + clocks: + maxItems: 1 + + resets: + maxItems: 1 + + required: + - compatible + - reg + - interrupts + - power-domains + - iommus + + allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t6041-scaler + - apple,t8140-scaler + then: + properties: + reg: + minItems: 4 + maxItems: 4 + power-domains: + minItems: 2 + maxItems: 2 + iommus: + minItems: 2 + maxItems: 2 + required: + - resets + - clocks + - if: + properties: + compatible: + contains: + enum: + - apple,t6020-scaler + - apple,t6021-scaler + - apple,t6022-scaler + - apple,t8112-scaler + then: + properties: + power-domains: + minItems: 2 + maxItems: 3 + iommus: + minItems: 2 + maxItems: 2 + - if: + properties: + compatible: + contains: + enum: + - apple,t6030-scaler + - apple,t6031-scaler + - apple,t8122-scaler + then: + properties: + power-domains: + minItems: 1 + maxItems: 2 + - if: + properties: + compatible: + contains: + const: apple,t8103-scaler + then: + properties: + reg: + maxItems: 2 + else: + properties: + reg: + minItems: 3 + - if: + properties: + compatible: + contains: + const: apple,t6000-scaler + then: + properties: + reg: + minItems: 3 + maxItems: 3 + - if: + properties: + compatible: + contains: + enum: + - apple,t6000-scaler + - apple,t8103-scaler + then: + properties: + power-domains: + minItems: 2 + maxItems: 2 + iommus: + minItems: 2 + required: + - resets + - clocks + + additionalProperties: false -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 5f737feb625cd..f02744fd0ce6b 100644 --- a/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml +++ b/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml @@ -14,83 +14,29 @@ description: | DART instances translate its DMA streams. The bootloader supplies the firmware memory handoff and IOVA mappings. -properties: - compatible: - oneOf: - - enum: +select: + properties: + compatible: + contains: + enum: - apple,t6000-ave + - apple,t6020-ave + - apple,t6021-ave + - apple,t6022-ave + - apple,t6030-ave + - apple,t6031-ave + - apple,t6032-ave - apple,t6041-ave + - apple,t8103-ave - apple,t8112-ave + - apple,t8122-ave + - apple,t8132-ave - apple,t8140-ave - - items: - - enum: - - apple,t6020-ave - - apple,t6021-ave - - apple,t6022-ave - - apple,t6030-ave - - apple,t6031-ave - - apple,t8103-ave - - apple,t8122-ave - - const: apple,ave - - reg: - minItems: 3 - maxItems: 5 - description: Codec, mailbox, coprocessor and generation-specific auxiliary banks. - - reg-names: - minItems: 3 - items: - - const: codec - - const: mailbox - - const: coproc - - enum: [pmgr, power-control] - - enum: [fabric, pio] - - clocks: - maxItems: 1 - - 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: 1 - 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: - minItems: 2 - maxItems: 4 - - memory-region: - items: - - description: Preloaded firmware text - - description: Preloaded firmware data - -required: - - compatible - - reg - - interrupts - - power-domains - - iommus + required: + - compatible + +properties: + compatible: true allOf: - if: @@ -98,36 +44,198 @@ allOf: compatible: contains: enum: - - apple,t6020-ave - - apple,t6021-ave - - apple,t6022-ave - - apple,t6030-ave - - apple,t6031-ave - - apple,t8122-ave + - apple,t8132-ave + required: + - compatible then: properties: + compatible: + items: + - enum: + - apple,t8132-ave + - const: apple,ave + reg: minItems: 5 - else: - properties: - power-domains: + maxItems: 5 + + interrupts: minItems: 5 + maxItems: 5 + + power-domains: + minItems: 1 + maxItems: 6 + + iommus: + minItems: 1 + maxItems: 2 + + clocks: + maxItems: 1 + required: - - reg-names - - power-domain-names - - if: - properties: - compatible: - contains: - enum: - - apple,t6041-ave - - apple,t8112-ave - - apple,t8140-ave - then: - properties: - reg: - maxItems: 3 - reg-names: - maxItems: 3 + - 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: + oneOf: + - enum: + - apple,t6000-ave + - apple,t6041-ave + - apple,t8112-ave + - apple,t8140-ave + - items: + - enum: + - apple,t6020-ave + - apple,t6021-ave + - apple,t6022-ave + - apple,t6030-ave + - apple,t6031-ave + - apple,t8103-ave + - apple,t8122-ave + - const: apple,ave + + reg: + minItems: 3 + maxItems: 5 + description: Codec, mailbox, coprocessor and generation-specific auxiliary banks. + + reg-names: + minItems: 3 + items: + - const: codec + - const: mailbox + - const: coproc + - enum: [pmgr, power-control] + - enum: [fabric, pio] + + clocks: + maxItems: 1 + + 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: 1 + 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: + minItems: 2 + maxItems: 4 + + memory-region: + items: + - description: Preloaded firmware text + - description: Preloaded firmware data + + required: + - compatible + - reg + - interrupts + - power-domains + - iommus + + allOf: + - if: + properties: + compatible: + contains: + enum: + - apple,t6020-ave + - apple,t6021-ave + - apple,t6022-ave + - apple,t6030-ave + - apple,t6031-ave + - apple,t8122-ave + then: + properties: + reg: + minItems: 5 + else: + properties: + power-domains: + minItems: 5 + required: + - reg-names + - power-domain-names + - if: + properties: + compatible: + contains: + enum: + - apple,t6041-ave + - apple,t8112-ave + - apple,t8140-ave + then: + properties: + reg: + maxItems: 3 + reg-names: + maxItems: 3 + + additionalProperties: false -additionalProperties: false +unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/pwm/apple,pwm.yaml b/Documentation/devicetree/bindings/pwm/apple,pwm.yaml index 81fe6e5962e85..113fd95ddf5a5 100644 --- a/Documentation/devicetree/bindings/pwm/apple,pwm.yaml +++ b/Documentation/devicetree/bindings/pwm/apple,pwm.yaml @@ -26,6 +26,7 @@ select: - apple,t8103-pwm - apple,t8112-pwm - apple,t8122-pwm + - apple,t8132-pwm required: - compatible @@ -37,6 +38,7 @@ properties: - apple,t8103-pwm - apple,t8112-pwm - apple,t8122-pwm + - apple,t8132-pwm - const: apple,pwm reg: diff --git a/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml b/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml index 0b135d115081a..b4f96a4d46135 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml @@ -13,43 +13,139 @@ 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,t6031-aon-ptd + - 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 - - items: - - enum: - - apple,t6031-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 + - items: + - enum: + - apple,t6031-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 90f27b2903f16..a8c707ce8cafa 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml @@ -13,37 +13,126 @@ description: | DWI hardware register window and interrupt. Register programming and firmware ownership must be qualified before enabling the controller. -properties: - compatible: - items: - - enum: +select: + properties: + compatible: + contains: + enum: - apple,t6000-dwi - apple,t6020-dwi - apple,t6021-dwi - apple,t6022-dwi - apple,t6030-dwi - apple,t6031-dwi + - apple,t6032-dwi - apple,t6041-dwi - apple,t8103-dwi - apple,t8112-dwi - apple,t8122-dwi + - apple,t8132-dwi - apple,t8140-dwi - - const: apple,dwi + required: + - compatible + +properties: + 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: + items: + - enum: + - apple,t6000-dwi + - apple,t6020-dwi + - apple,t6021-dwi + - apple,t6022-dwi + - apple,t6030-dwi + - apple,t6031-dwi + - apple,t6041-dwi + - apple,t8103-dwi + - apple,t8112-dwi + - apple,t8122-dwi + - apple,t8140-dwi + - const: apple,dwi + + 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 + power-domains: + maxItems: 1 - power-domains: - maxItems: 1 + required: + - compatible + - reg + - interrupts + - power-domains -required: - - compatible - - reg - - interrupts - - power-domains + additionalProperties: false -additionalProperties: false +unevaluatedProperties: false 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-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-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..d52930e0b9250 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8132-peripherals.dtsi @@ -0,0 +1,386 @@ +// 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"; + }; + +}; + +/ { + 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-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 aa5ff8589e5fa..35490237bba94 100644 --- a/arch/arm64/boot/dts/apple/t8132.dtsi +++ b/arch/arm64/boot/dts/apple/t8132.dtsi @@ -1328,6 +1328,16 @@ }; #include "t8132-memory.dtsi" + +#include "t8132-peripherals.dtsi" + +#include "t8132-peripheral-buses.dtsi" + +#include "t8132-error-handlers.dtsi" + +#include "t8132-sio.dtsi" + +#include "t8132-avd.dtsi" #include "t8132-gpu.dtsi" #include "t8132-dcp.dtsi" #include "t8132-dcpext.dtsi"