From 5e92a16b6bc8dcc7687ba08cf34067f09c1d8298 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sat, 7 Nov 2026 22:17:12 +1100 Subject: [PATCH 01/20] dt-bindings: apple: describe unqualified T6041 and T8140 hardware resources Describe the structural register, interrupt, power-domain, clock-selector and DART interfaces of currently unqualified blocks. These bindings do not establish firmware ownership or enable a device. Keep T6041 APR distinct from the driven T8140 engine. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../bindings/clock/apple,pmgr-clocks.yaml | 40 +++++++++++++ .../devicetree/bindings/crypto/apple,aes.yaml | 50 +++++++++++++++++ .../bindings/display/apple,dcp-expert.yaml | 41 ++++++++++++++ .../display/apple,display-secure-proxy.yaml | 32 +++++++++++ .../bindings/display/apple,dpin.yaml | 36 ++++++++++++ .../bindings/dma/apple,pcie-piodma.yaml | 42 ++++++++++++++ .../bindings/dma/apple,pciec-piodma.yaml | 42 ++++++++++++++ .../devicetree/bindings/dma/apple,sio.yaml | 23 +++++++- .../mailbox/apple,secure-mailbox.yaml | 42 ++++++++++++++ .../media/apple,isp-secure-proxy.yaml | 32 +++++++++++ .../bindings/media/apple,scaler.yaml | 56 +++++++++++++++++++ .../bindings/media/apple,t6041-prores.yaml | 48 ++++++++++++++++ .../bindings/serial/samsung_uart.yaml | 3 + .../bindings/soc/apple/apple,aon-ptd.yaml | 40 +++++++++++++ .../bindings/soc/apple/apple,aop2.yaml | 47 ++++++++++++++++ .../bindings/soc/apple/apple,cpu-debug.yaml | 37 ++++++++++++ .../bindings/soc/apple/apple,dwi.yaml | 45 +++++++++++++++ .../bindings/soc/apple/apple,esm.yaml | 42 ++++++++++++++ .../bindings/soc/apple/apple,rsm.yaml | 41 ++++++++++++++ .../bindings/timer/apple,aic-timebase.yaml | 31 ++++++++++ .../bindings/timer/apple,secure-timebase.yaml | 31 ++++++++++ .../watchdog/apple,secure-watchdog.yaml | 31 ++++++++++ 22 files changed, 831 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml create mode 100644 Documentation/devicetree/bindings/crypto/apple,aes.yaml create mode 100644 Documentation/devicetree/bindings/display/apple,dcp-expert.yaml create mode 100644 Documentation/devicetree/bindings/display/apple,display-secure-proxy.yaml create mode 100644 Documentation/devicetree/bindings/display/apple,dpin.yaml create mode 100644 Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml create mode 100644 Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml create mode 100644 Documentation/devicetree/bindings/mailbox/apple,secure-mailbox.yaml create mode 100644 Documentation/devicetree/bindings/media/apple,isp-secure-proxy.yaml create mode 100644 Documentation/devicetree/bindings/media/apple,scaler.yaml create mode 100644 Documentation/devicetree/bindings/media/apple,t6041-prores.yaml create mode 100644 Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml create mode 100644 Documentation/devicetree/bindings/soc/apple/apple,aop2.yaml create mode 100644 Documentation/devicetree/bindings/soc/apple/apple,cpu-debug.yaml create mode 100644 Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml create mode 100644 Documentation/devicetree/bindings/soc/apple/apple,esm.yaml create mode 100644 Documentation/devicetree/bindings/soc/apple/apple,rsm.yaml create mode 100644 Documentation/devicetree/bindings/timer/apple,aic-timebase.yaml create mode 100644 Documentation/devicetree/bindings/timer/apple,secure-timebase.yaml create mode 100644 Documentation/devicetree/bindings/watchdog/apple,secure-watchdog.yaml diff --git a/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml b/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml new file mode 100644 index 0000000000000..84e7e54dc662b --- /dev/null +++ b/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml @@ -0,0 +1,40 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/clock/apple,pmgr-clocks.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple PMGR peripheral clock selectors + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Peripheral input clocks managed by the SoC power manager. The clock + specifier is the SoC clock selector from the hardware description. It is + separate from a PMGR device/power-gate ID. Rates may change with performance + state and must not be represented as fixed clocks sampled at one boot. + The provider remains disabled until a generation-specific clock driver + can resolve selectors and coordinate ownership with firmware. + +properties: + compatible: + items: + - enum: + - apple,t6041-pmgr-clocks + - apple,t8140-pmgr-clocks + - const: apple,pmgr-clocks + + '#clock-cells': + const: 1 + + apple,pmgr: + $ref: /schemas/types.yaml#/definitions/phandle + description: Power manager providing the clock control registers. + +required: + - compatible + - '#clock-cells' + - apple,pmgr + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/crypto/apple,aes.yaml b/Documentation/devicetree/bindings/crypto/apple,aes.yaml new file mode 100644 index 0000000000000..516a7ae14036f --- /dev/null +++ b/Documentation/devicetree/bindings/crypto/apple,aes.yaml @@ -0,0 +1,50 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/crypto/apple,aes.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple AES engine + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + AES hardware attached to the SIO DART. The register banks are the + engine, shared control and auxiliary control windows, in that order. + +properties: + compatible: + oneOf: + - items: + - const: apple,t6041-aes + - const: apple,aes + - items: + - const: apple,t8140-aes + - const: apple,aes + + reg: + minItems: 3 + maxItems: 3 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 1 + maxItems: 1 + + power-domains: + minItems: 1 + maxItems: 1 + + iommus: + minItems: 1 + maxItems: 1 + +required: + - compatible + - reg + - interrupts + - power-domains + - iommus + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml b/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml new file mode 100644 index 0000000000000..a0b34e37f6d1f --- /dev/null +++ b/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml @@ -0,0 +1,41 @@ +# 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. + +properties: + compatible: + oneOf: + - items: + - const: apple,t6041-dcp-expert + - const: apple,dcp-expert + - items: + - const: apple,t8140-dcp-expert + - const: apple,dcp-expert + + reg: + minItems: 3 + maxItems: 17 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 1 + maxItems: 1 + +required: + - compatible + - reg + - interrupts + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/display/apple,display-secure-proxy.yaml b/Documentation/devicetree/bindings/display/apple,display-secure-proxy.yaml new file mode 100644 index 0000000000000..417d16344e07b --- /dev/null +++ b/Documentation/devicetree/bindings/display/apple,display-secure-proxy.yaml @@ -0,0 +1,32 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/apple,display-secure-proxy.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple secure display proxy apertures + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Secure display proxy register apertures. They are distinct from the + non-secure display engine and remain owned by firmware. + +properties: + compatible: + oneOf: + - items: + - const: apple,t8140-display-secure-proxy + - const: apple,display-secure-proxy + + reg: + minItems: 3 + maxItems: 3 + description: Register apertures in hardware-description order. + +required: + - compatible + - reg + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/display/apple,dpin.yaml b/Documentation/devicetree/bindings/display/apple,dpin.yaml new file mode 100644 index 0000000000000..a58aef9bb9c3c --- /dev/null +++ b/Documentation/devicetree/bindings/display/apple,dpin.yaml @@ -0,0 +1,36 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/apple,dpin.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple DisplayPort tunnel ingress + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + DisplayPort ingress registers and interrupt for a USB4 display tunnel. + +properties: + compatible: + oneOf: + - items: + - const: apple,t6041-dpin + - const: apple,dpin + + reg: + minItems: 1 + maxItems: 1 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 1 + maxItems: 1 + +required: + - compatible + - reg + - interrupts + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml b/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml new file mode 100644 index 0000000000000..157a640a5ea32 --- /dev/null +++ b/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml @@ -0,0 +1,42 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/dma/apple,pcie-piodma.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple PCIe PIODMA engine + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + PCIe auxiliary DMA register banks and completion interrupt. The stream + is distinct from the PCIe endpoint streams in the same DART. + +properties: + compatible: + oneOf: + - items: + - const: apple,t6041-pcie-piodma + - const: apple,pcie-piodma + + reg: + minItems: 3 + maxItems: 3 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 1 + maxItems: 1 + + iommus: + minItems: 1 + maxItems: 1 + +required: + - compatible + - reg + - interrupts + - iommus + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml b/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml new file mode 100644 index 0000000000000..18313d789cd7b --- /dev/null +++ b/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml @@ -0,0 +1,42 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/dma/apple,pciec-piodma.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple PCIe tunnel PIODMA engine + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + PCIe tunnel auxiliary DMA register banks and completion interrupt. Its + stream is distinct from the tunnel endpoint streams in the same DART. + +properties: + compatible: + oneOf: + - items: + - const: apple,t6041-pciec-piodma + - const: apple,pciec-piodma + + reg: + minItems: 4 + maxItems: 4 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 1 + maxItems: 1 + + iommus: + minItems: 1 + maxItems: 1 + +required: + - compatible + - reg + - interrupts + - iommus + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/dma/apple,sio.yaml b/Documentation/devicetree/bindings/dma/apple,sio.yaml index 2498a7adaf410..7e0171d53eb1e 100644 --- a/Documentation/devicetree/bindings/dma/apple,sio.yaml +++ b/Documentation/devicetree/bindings/dma/apple,sio.yaml @@ -18,6 +18,20 @@ maintainers: allOf: - $ref: dma-controller.yaml# + - if: + properties: + compatible: + contains: + const: apple,t8140-sio + then: + properties: + reg: + minItems: 2 + maxItems: 2 + else: + properties: + reg: + maxItems: 1 properties: compatible: @@ -29,12 +43,19 @@ properties: - apple,t6030-sio - apple,t8103-sio - apple,t8112-sio + - apple,t8140-sio - const: apple,sio - description: T6041 firmware requires a generation-specific backend. const: apple,t6041-sio reg: - maxItems: 1 + minItems: 1 + maxItems: 2 + description: Coprocessor registers, followed on T8140 by the ASC auxiliary window. + + clocks: + minItems: 1 + maxItems: 3 '#dma-cells': const: 1 diff --git a/Documentation/devicetree/bindings/mailbox/apple,secure-mailbox.yaml b/Documentation/devicetree/bindings/mailbox/apple,secure-mailbox.yaml new file mode 100644 index 0000000000000..0bdb3a73cadc5 --- /dev/null +++ b/Documentation/devicetree/bindings/mailbox/apple,secure-mailbox.yaml @@ -0,0 +1,42 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mailbox/apple,secure-mailbox.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple secure coprocessor mailbox aperture + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Secure coprocessor proxy mailbox aperture and its transport interrupts. + This description does not authorize access to secure-world registers. + +properties: + compatible: + oneOf: + - items: + - const: apple,t8140-secure-mailbox + - const: apple,secure-mailbox + + reg: + minItems: 1 + maxItems: 1 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 2 + maxItems: 2 + + iommus: + minItems: 1 + maxItems: 1 + +required: + - compatible + - reg + - interrupts + - iommus + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/media/apple,isp-secure-proxy.yaml b/Documentation/devicetree/bindings/media/apple,isp-secure-proxy.yaml new file mode 100644 index 0000000000000..cb90bbe4b4251 --- /dev/null +++ b/Documentation/devicetree/bindings/media/apple,isp-secure-proxy.yaml @@ -0,0 +1,32 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/apple,isp-secure-proxy.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple secure image processor proxy apertures + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Secure image processor proxy register apertures. They are distinct from + the non-secure image processor and remain owned by firmware. + +properties: + compatible: + oneOf: + - items: + - const: apple,t8140-isp-secure-proxy + - const: apple,isp-secure-proxy + + reg: + minItems: 3 + maxItems: 3 + description: Register apertures in hardware-description order. + +required: + - compatible + - reg + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/media/apple,scaler.yaml b/Documentation/devicetree/bindings/media/apple,scaler.yaml new file mode 100644 index 0000000000000..7f97ff9a6199d --- /dev/null +++ b/Documentation/devicetree/bindings/media/apple,scaler.yaml @@ -0,0 +1,56 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/apple,scaler.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple image scaler + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + The image scaler and its companion DMA registers. The two DART streams + carry image data and PIODMA transfers. Firmware performance votes are + not fixed clock rates and are not encoded as clock-frequency values. + +properties: + compatible: + oneOf: + - items: + - const: apple,t6041-scaler + - const: apple,scaler + - items: + - const: apple,t8140-scaler + - const: apple,scaler + + reg: + minItems: 4 + maxItems: 4 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 2 + maxItems: 2 + + power-domains: + minItems: 2 + maxItems: 2 + + iommus: + minItems: 2 + maxItems: 2 + + clocks: + minItems: 1 + maxItems: 1 + +required: + - compatible + - reg + - interrupts + - power-domains + - iommus + - clocks + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/media/apple,t6041-prores.yaml b/Documentation/devicetree/bindings/media/apple,t6041-prores.yaml new file mode 100644 index 0000000000000..1a35ae29920ef --- /dev/null +++ b/Documentation/devicetree/bindings/media/apple,t6041-prores.yaml @@ -0,0 +1,48 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/apple,t6041-prores.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple T6041 ProRes engine + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + T6041 APR engine, wrapper and auxiliary register banks. This resource + layout is distinct from the T8140 APR binding and must not select that + generation's driver. + +properties: + compatible: + oneOf: + - items: + - const: apple,t6041-prores + - const: apple,prores + + reg: + minItems: 3 + maxItems: 3 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 1 + maxItems: 1 + + power-domains: + minItems: 1 + maxItems: 1 + + iommus: + minItems: 1 + maxItems: 1 + +required: + - compatible + - reg + - interrupts + - power-domains + - iommus + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/serial/samsung_uart.yaml b/Documentation/devicetree/bindings/serial/samsung_uart.yaml index 75ac2a08f2576..e1a606f86bce1 100644 --- a/Documentation/devicetree/bindings/serial/samsung_uart.yaml +++ b/Documentation/devicetree/bindings/serial/samsung_uart.yaml @@ -28,6 +28,9 @@ properties: - samsung,exynos5433-uart - samsung,exynos850-uart - samsung,exynos8895-uart + - items: + - const: apple,t8140-uart + - const: apple,s5l-uart - items: - enum: - samsung,exynos2200-uart diff --git a/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml b/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml new file mode 100644 index 0000000000000..2a3dc9f5856d4 --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml @@ -0,0 +1,40 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/soc/apple/apple,aon-ptd.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple always-on power telemetry interrupt router + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Always-on power telemetry register banks and upstream interrupts. The + firmware owns the telemetry data and interrupt routing at boot. + +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 + +required: + - compatible + - reg + - interrupts + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,aop2.yaml b/Documentation/devicetree/bindings/soc/apple/apple,aop2.yaml new file mode 100644 index 0000000000000..3bb8d1a5ff384 --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,aop2.yaml @@ -0,0 +1,47 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/soc/apple/apple,aop2.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple secondary always-on processor + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Secondary always-on processor register banks and transport interrupts. + The processor uses a distinct stream in the primary AOP DART. + +properties: + compatible: + oneOf: + - items: + - const: apple,t8140-aop2 + - const: apple,aop2 + + reg: + minItems: 3 + maxItems: 3 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 4 + maxItems: 4 + + power-domains: + minItems: 1 + maxItems: 1 + + iommus: + minItems: 1 + maxItems: 1 + +required: + - compatible + - reg + - interrupts + - power-domains + - iommus + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,cpu-debug.yaml b/Documentation/devicetree/bindings/soc/apple/apple,cpu-debug.yaml new file mode 100644 index 0000000000000..1770af2c28fc1 --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,cpu-debug.yaml @@ -0,0 +1,37 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/soc/apple/apple,cpu-debug.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple processor debug interface + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Processor debug register apertures. Access ownership must be established + before a debugger accesses this block. + +properties: + compatible: + oneOf: + - items: + - const: apple,t6041-cpu-debug + - const: apple,cpu-debug + + reg: + minItems: 2 + maxItems: 2 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 1 + maxItems: 1 + +required: + - compatible + - reg + - interrupts + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml b/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml new file mode 100644 index 0000000000000..f6d84bf0f371c --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml @@ -0,0 +1,45 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/soc/apple/apple,dwi.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple DWI controller + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + DWI hardware register window and interrupt. Register programming and + firmware ownership must be qualified before enabling the controller. + +properties: + compatible: + oneOf: + - items: + - const: apple,t6041-dwi + - const: apple,dwi + - items: + - const: apple,t8140-dwi + - const: apple,dwi + + reg: + minItems: 1 + maxItems: 1 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 1 + maxItems: 1 + + power-domains: + minItems: 1 + maxItems: 1 + +required: + - compatible + - reg + - interrupts + - power-domains + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,esm.yaml b/Documentation/devicetree/bindings/soc/apple/apple,esm.yaml new file mode 100644 index 0000000000000..f9f73a9215b99 --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,esm.yaml @@ -0,0 +1,42 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/soc/apple/apple,esm.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple secure SEP manager transport + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Secure SEP manager transport register aperture and interrupts. This is + separate from the ordinary SEP mailbox and has no qualified AP client. + +properties: + compatible: + oneOf: + - items: + - const: apple,t8140-esm + - const: apple,esm + + reg: + minItems: 1 + maxItems: 1 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 2 + maxItems: 2 + + iommus: + minItems: 1 + maxItems: 1 + +required: + - compatible + - reg + - interrupts + - iommus + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,rsm.yaml b/Documentation/devicetree/bindings/soc/apple/apple,rsm.yaml new file mode 100644 index 0000000000000..24e8e20f688a5 --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,rsm.yaml @@ -0,0 +1,41 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/soc/apple/apple,rsm.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple remote service manager + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Remote service manager register banks, interrupt and DART stream. + +properties: + compatible: + oneOf: + - items: + - const: apple,t8140-rsm + - const: apple,rsm + + reg: + minItems: 2 + maxItems: 2 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 1 + maxItems: 1 + + iommus: + minItems: 1 + maxItems: 1 + +required: + - compatible + - reg + - interrupts + - iommus + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/timer/apple,aic-timebase.yaml b/Documentation/devicetree/bindings/timer/apple,aic-timebase.yaml new file mode 100644 index 0000000000000..8e31d99e85792 --- /dev/null +++ b/Documentation/devicetree/bindings/timer/apple,aic-timebase.yaml @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/timer/apple,aic-timebase.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple AIC timebase + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + The timebase register aperture associated with the interrupt controller. + +properties: + compatible: + oneOf: + - items: + - const: apple,t6041-aic-timebase + - const: apple,aic-timebase + + reg: + minItems: 1 + maxItems: 1 + description: Register apertures in hardware-description order. + +required: + - compatible + - reg + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/timer/apple,secure-timebase.yaml b/Documentation/devicetree/bindings/timer/apple,secure-timebase.yaml new file mode 100644 index 0000000000000..527cf5841a6e1 --- /dev/null +++ b/Documentation/devicetree/bindings/timer/apple,secure-timebase.yaml @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/timer/apple,secure-timebase.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple secure audio timebase aperture + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Secure audio timebase register aperture, owned by firmware at boot. + +properties: + compatible: + oneOf: + - items: + - const: apple,t8140-secure-timebase + - const: apple,secure-timebase + + reg: + minItems: 1 + maxItems: 1 + description: Register apertures in hardware-description order. + +required: + - compatible + - reg + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/watchdog/apple,secure-watchdog.yaml b/Documentation/devicetree/bindings/watchdog/apple,secure-watchdog.yaml new file mode 100644 index 0000000000000..83e6ebc7e17ff --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/apple,secure-watchdog.yaml @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/watchdog/apple,secure-watchdog.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple secure hibernation watchdog aperture + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Secure hibernation watchdog register aperture, owned by firmware at boot. + +properties: + compatible: + oneOf: + - items: + - const: apple,t8140-secure-watchdog + - const: apple,secure-watchdog + + reg: + minItems: 1 + maxItems: 1 + description: Register apertures in hardware-description order. + +required: + - compatible + - reg + +additionalProperties: false From 5ef0d687e44cfea3ad15d9b35a698eb5ab95ef7f Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sat, 7 Nov 2026 22:18:20 +1100 Subject: [PATCH 02/20] arm64: dts: apple: describe unqualified J616s and J700 peripheral resources Translate the saved live ADTs into disabled hardware descriptions, including scaler, AES, APR, telemetry, display experts, PCIe DMA and DisplayPort ingress; describe the secondary and secure coprocessor resources on T8140. Keep the new blocks disabled so firmware-owned apertures and power gates are not touched. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../boot/dts/apple/t6040-peripherals.dtsi | 282 ++++++++++++ arch/arm64/boot/dts/apple/t6040.dtsi | 1 + .../boot/dts/apple/t8140-peripherals.dtsi | 414 ++++++++++++++++++ arch/arm64/boot/dts/apple/t8140.dtsi | 1 + 4 files changed, 698 insertions(+) create mode 100644 arch/arm64/boot/dts/apple/t6040-peripherals.dtsi create mode 100644 arch/arm64/boot/dts/apple/t8140-peripherals.dtsi diff --git a/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi b/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi new file mode 100644 index 0000000000000..c65b68a15bfca --- /dev/null +++ b/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi @@ -0,0 +1,282 @@ +// SPDX-License-Identifier: GPL-2.0-only OR MIT +/* + * Structural hardware resources from the board's saved Apple Device Tree. + * Keep unqualified blocks disabled: describing them does not transfer + * ownership from firmware or make their registers safe to access. + */ + +/ { + + /* ADT /arm-io/dwi. */ + dwi: dwi@5029b0000 { + compatible = "apple,t6041-dwi", "apple,dwi"; + reg = <0x5 0x029b0000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_dwi>; + status = "disabled"; + }; + + /* ADT /arm-io/aes. */ + aes: crypto@42900c000 { + compatible = "apple,t6041-aes", "apple,aes"; + reg = <0x4 0x2900c000 0x0 0x4000>, + <0x5 0x08340000 0x0 0x8000>, + <0x5 0x08090000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_aes>; + iommus = <&sio_dart 1>; + status = "disabled"; + }; + + /* ADT /arm-io/aon-ptd. */ + aon_ptd: aon-ptd@50cdc0000 { + compatible = "apple,t6041-aon-ptd", "apple,aon-ptd"; + reg = <0x5 0x0cdc0000 0x0 0x4000>, + <0x5 0x0cdd0000 0x0 0x4000>, + <0x5 0x0cdd8000 0x0 0x4000>, + <0x5 0x0cde0000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + status = "disabled"; + }; + + /* ADT /arm-io/scaler0. */ + scaler0: scaler@521000000 { + compatible = "apple,t6041-scaler", "apple,scaler"; + reg = <0x5 0x21000000 0x0 0x38000>, + <0x5 0x21210000 0x0 0x4000>, + <0x5 0x21204000 0x0 0x4000>, + <0x5 0x20000000 0x0 0x8000>; + interrupt-parent = <&aic>; + interrupts = , + ; + power-domains = <&ps_msr0>, + <&ps_msr0_ase_core>; + iommus = <&scaler0_dart 0>, + <&scaler0_dart 1>; + clocks = <&peripheral_clocks 417>; + status = "disabled"; + }; + + /* ADT /arm-io/aic-timebase. */ + aic_timebase: aic-timebase@502580000 { + compatible = "apple,t6041-aic-timebase", "apple,aic-timebase"; + reg = <0x5 0x02580000 0x0 0x1000>; + status = "disabled"; + }; + + /* ADT /arm-io/dbgCPU. */ + cpu_debug: cpu-debug@508700000 { + compatible = "apple,t6041-cpu-debug", "apple,cpu-debug"; + reg = <0x5 0x08700000 0x0 0x28000>, + <0x5 0x085c0000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + /* ADT /arm-io/apcie0-piodma. */ + apcie0_piodma: dma@410030000 { + compatible = "apple,t6041-pcie-piodma", "apple,pcie-piodma"; + reg = <0x4 0x10030000 0x0 0x4000>, + <0x4 0x10034000 0x0 0x4000>, + <0x4 0x10038000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + iommus = <&pcie_dart 17>; + status = "disabled"; + }; + + /* ADT /arm-io/apcie1-piodma. */ + apcie1_piodma: dma@411030000 { + compatible = "apple,t6041-pcie-piodma", "apple,pcie-piodma"; + reg = <0x4 0x11030000 0x0 0x4000>, + <0x4 0x11034000 0x0 0x4000>, + <0x4 0x11038000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + iommus = <&apcie1_dart 17>; + status = "disabled"; + }; + + /* ADT /arm-io/apciec0-piodma. */ + apciec0_piodma: dma@384068000 { + compatible = "apple,t6041-pciec-piodma", "apple,pciec-piodma"; + reg = <0x3 0x84068000 0x0 0x4000>, + <0x3 0x8406c000 0x0 0x4000>, + <0x3 0x84070000 0x0 0x4000>, + <0x3 0x8403c000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + iommus = <&apciec0_dart 254>; + status = "disabled"; + }; + + /* ADT /arm-io/apciec1-piodma. */ + apciec1_piodma: dma@38c068000 { + compatible = "apple,t6041-pciec-piodma", "apple,pciec-piodma"; + reg = <0x3 0x8c068000 0x0 0x4000>, + <0x3 0x8c06c000 0x0 0x4000>, + <0x3 0x8c070000 0x0 0x4000>, + <0x3 0x8c03c000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + iommus = <&apciec1_dart 254>; + status = "disabled"; + }; + + /* ADT /arm-io/apciec2-piodma. */ + apciec2_piodma: dma@394068000 { + compatible = "apple,t6041-pciec-piodma", "apple,pciec-piodma"; + reg = <0x3 0x94068000 0x0 0x4000>, + <0x3 0x9406c000 0x0 0x4000>, + <0x3 0x94070000 0x0 0x4000>, + <0x3 0x9403c000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + iommus = <&apciec2_dart 254>; + status = "disabled"; + }; + + /* ADT /arm-io/apr0. */ + apr0: video-codec@301000000 { + compatible = "apple,t6041-prores", "apple,prores"; + reg = <0x3 0x01000000 0x0 0x4000>, + <0x3 0x00000000 0x0 0x1000000>, + <0x3 0x010c0000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_scodec>; + iommus = <&apr0_dart 1>; + status = "disabled"; + }; + + /* ADT /arm-io/atc0-dpin0. */ + atc0_dpin0: dpin@381e50000 { + compatible = "apple,t6041-dpin", "apple,dpin"; + reg = <0x3 0x81e50000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + /* ADT /arm-io/atc0-dpin1. */ + atc0_dpin1: dpin@381e58000 { + compatible = "apple,t6041-dpin", "apple,dpin"; + reg = <0x3 0x81e58000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + /* ADT /arm-io/atc1-dpin0. */ + atc1_dpin0: dpin@389e50000 { + compatible = "apple,t6041-dpin", "apple,dpin"; + reg = <0x3 0x89e50000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + /* ADT /arm-io/atc1-dpin1. */ + atc1_dpin1: dpin@389e58000 { + compatible = "apple,t6041-dpin", "apple,dpin"; + reg = <0x3 0x89e58000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + /* ADT /arm-io/atc2-dpin0. */ + atc2_dpin0: dpin@391e50000 { + compatible = "apple,t6041-dpin", "apple,dpin"; + reg = <0x3 0x91e50000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + /* ADT /arm-io/atc2-dpin1. */ + atc2_dpin1: dpin@391e58000 { + compatible = "apple,t6041-dpin", "apple,dpin"; + reg = <0x3 0x91e58000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + /* ADT /arm-io/dcpext0-expert. */ + dcp_expert: display-expert@4023a8050 { + compatible = "apple,t6041-dcp-expert", "apple,dcp-expert"; + reg = <0x4 0x023a8050 0x0 0x4>, + <0x4 0x02374000 0x0 0x40>, + <0x4 0x02370000 0x0 0x40>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + /* ADT /arm-io/dcpext0-expert. */ + dcpext0_expert: display-expert@3a23a8050 { + compatible = "apple,t6041-dcp-expert", "apple,dcp-expert"; + reg = <0x3 0xa23a8050 0x0 0x4>, + <0x3 0xa2374000 0x0 0x40>, + <0x3 0xa2370000 0x0 0x40>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + /* ADT /arm-io/dcpext1-expert. */ + dcpext1_expert: display-expert@6023a8050 { + compatible = "apple,t6041-dcp-expert", "apple,dcp-expert"; + reg = <0x6 0x023a8050 0x0 0x4>, + <0x6 0x02374000 0x0 0x40>, + <0x6 0x02370000 0x0 0x40>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + /* Clock IDs are SoC hardware selectors, not ADT phandles. */ + peripheral_clocks: clock-controller { + compatible = "apple,t6041-pmgr-clocks", "apple,pmgr-clocks"; + #clock-cells = <1>; + apple,pmgr = <&pmgr>; + status = "disabled"; + }; +}; + diff --git a/arch/arm64/boot/dts/apple/t6040.dtsi b/arch/arm64/boot/dts/apple/t6040.dtsi index 38dc7888509fd..c901f331bc03e 100644 --- a/arch/arm64/boot/dts/apple/t6040.dtsi +++ b/arch/arm64/boot/dts/apple/t6040.dtsi @@ -6,6 +6,7 @@ */ #include "t604x.dtsi" +#include "t6040-peripherals.dtsi" /* The M4 Pro has five cores in each P cluster. */ /delete-node/ &cpu_p05; diff --git a/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi b/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi new file mode 100644 index 0000000000000..4c3ef3ea1a551 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi @@ -0,0 +1,414 @@ +// SPDX-License-Identifier: GPL-2.0-only OR MIT +/* + * Structural hardware resources from the board's saved Apple Device Tree. + * Keep unqualified blocks disabled: describing them does not transfer + * ownership from firmware or make their registers safe to access. + */ + +/ { + + /* ADT /arm-io/dwi. */ + dwi: dwi@300200000 { + compatible = "apple,t8140-dwi", "apple,dwi"; + reg = <0x3 0x00200000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_dwi>; + status = "disabled"; + }; + + /* ADT /arm-io/aes. */ + aes: crypto@38500c000 { + compatible = "apple,t8140-aes", "apple,aes"; + reg = <0x3 0x8500c000 0x0 0x4000>, + <0x3 0x082dc000 0x0 0x8000>, + <0x3 0x08078000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_aes>; + iommus = <&sio_dart 1>; + status = "disabled"; + }; + + /* ADT /arm-io/aon-ptd. */ + aon_ptd: aon-ptd@30c840000 { + compatible = "apple,t8140-aon-ptd", "apple,aon-ptd"; + reg = <0x3 0x0c840000 0x0 0x4000>, + <0x3 0x0c850000 0x0 0x4000>, + <0x3 0x0c858000 0x0 0x4000>, + <0x3 0x0c860000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + status = "disabled"; + }; + + /* ADT /arm-io/scaler0. */ + scaler0: scaler@291000000 { + compatible = "apple,t8140-scaler", "apple,scaler"; + reg = <0x2 0x91000000 0x0 0x38000>, + <0x2 0x91210000 0x0 0x4000>, + <0x2 0x91204000 0x0 0x4000>, + <0x2 0x90000000 0x0 0x8000>; + interrupt-parent = <&aic>; + interrupts = , + ; + power-domains = <&ps_msr>, + <&ps_msr_ase_core>; + iommus = <&scaler0_dart 0>, + <&scaler0_dart 1>; + clocks = <&peripheral_clocks 374>; + status = "disabled"; + }; + + /* ADT /arm-io/aop2. */ + aop2: coprocessor@311600000 { + compatible = "apple,t8140-aop2", "apple,aop2"; + reg = <0x3 0x11600000 0x0 0x88000>, + <0x3 0x11050000 0x0 0x4000>, + <0x3 0x1162c000 0x0 0x3c008>; + interrupt-parent = <&aic>; + interrupts = , + , + , + ; + power-domains = <&ps_aop2_cpu>; + iommus = <&aop_dart 16>; + status = "disabled"; + }; + + /* ADT /arm-io/aop2-exclave-mailbox. */ + aop2_secure_mbox: mailbox@35167c000 { + compatible = "apple,t8140-secure-mailbox", "apple,secure-mailbox"; + reg = <0x3 0x5167c000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = , + ; + iommus = <&aop_dart 17>; + status = "disabled"; + }; + + /* ADT /arm-io/esm. */ + esm: coprocessor@4d267c000 { + compatible = "apple,t8140-esm", "apple,esm"; + reg = <0x4 0xd267c000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = , + ; + iommus = <&sep_dart 2>; + status = "disabled"; + }; + + /* ADT /arm-io/rsm. */ + rsm: rsm@309825000 { + compatible = "apple,t8140-rsm", "apple,rsm"; + reg = <0x3 0x09825000 0x0 0x4000>, + <0x3 0x098c0000 0x0 0x4>; + interrupt-parent = <&aic>; + interrupts = ; + iommus = <&rsm_dart 0>; + status = "disabled"; + }; + + /* ADT /arm-io/dcp0-expert. */ + dcp_expert: display-expert@3082b8044 { + compatible = "apple,t8140-dcp-expert", "apple,dcp-expert"; + reg = <0x3 0x082b8044 0x0 0xc>, + <0x3 0x08008000 0x0 0x4>, + <0x4 0x123ac050 0x0 0x4>, + <0x4 0x12370000 0x0 0x40>, + <0x4 0x12384000 0x0 0x40>, + <0x4 0x12378000 0x0 0x40>, + <0x4 0x1237c000 0x0 0x40>, + <0x4 0x12380000 0x0 0x40>, + <0x4 0x12374000 0x0 0x40>, + <0x4 0x123b8000 0x0 0x40>, + <0x4 0x1239c000 0x0 0x40>, + <0x4 0x123a0000 0x0 0x40>, + <0x4 0x12388000 0x0 0x40>, + <0x4 0x1238c000 0x0 0x40>, + <0x4 0x12394000 0x0 0x40>, + <0x4 0x12398000 0x0 0x40>, + <0x4 0x12390000 0x0 0x40>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + /* ADT /arm-io/dcpext-expert. */ + dcpext_expert: display-expert@4163ac050 { + compatible = "apple,t8140-dcp-expert", "apple,dcp-expert"; + reg = <0x4 0x163ac050 0x0 0x4>, + <0x4 0x16370000 0x0 0x40>, + <0x4 0x16374000 0x0 0x40>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + /* ADT /arm-io/dcp-exclave-mailbox. */ + dcp_secure_mbox: mailbox@452e7c000 { + compatible = "apple,t8140-secure-mailbox", "apple,secure-mailbox"; + reg = <0x4 0x52e7c000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = , + ; + iommus = <&dcp_dart 24>; + status = "disabled"; + }; + + /* ADT /arm-io/exdisplaypipe-s-proxy. */ + display_secure_proxy: display-secure-proxy@450000000 { + compatible = "apple,t8140-display-secure-proxy", "apple,display-secure-proxy"; + reg = <0x4 0x50000000 0x0 0xafc000>, + <0x4 0x51000000 0x0 0xafc000>, + <0x4 0x523b0000 0x0 0x8000>; + status = "disabled"; + }; + + /* ADT /arm-io/isp-exclave-s-proxy. */ + isp_secure_proxy: isp-secure-proxy@361800000 { + compatible = "apple,t8140-isp-secure-proxy", "apple,isp-secure-proxy"; + reg = <0x3 0x61800000 0x0 0x480000>, + <0x3 0x628ac000 0x0 0x4000>, + <0x3 0x62780000 0x0 0x10000>; + status = "disabled"; + }; + + /* ADT /arm-io/siri-exclave-timebase. */ + siri_timebase: secure-timebase@3482a8000 { + compatible = "apple,t8140-secure-timebase", "apple,secure-timebase"; + reg = <0x3 0x482a8000 0x0 0x4000>; + status = "disabled"; + }; + + /* ADT /arm-io/hib-exclave-watchdog. */ + hib_watchdog: secure-watchdog@3482b0000 { + compatible = "apple,t8140-secure-watchdog", "apple,secure-watchdog"; + reg = <0x3 0x482b0000 0x0 0x4000>; + status = "disabled"; + }; + + /* Clock IDs are SoC hardware selectors, not ADT phandles. */ + peripheral_clocks: clock-controller { + compatible = "apple,t8140-pmgr-clocks", "apple,pmgr-clocks"; + #clock-cells = <1>; + apple,pmgr = <&pmgr>; + status = "disabled"; + }; +}; + +/ { + + /* ADT /arm-io/aop-gpio; coprocessor/firmware ownership unqualified. */ + pinctrl_aop: pinctrl@310824000 { + compatible = "apple,t8140-pinctrl", "apple,t8103-pinctrl"; + reg = <0x3 0x10824000 0x0 0x4000>; + gpio-controller; + #gpio-cells = <2>; + gpio-ranges = <&pinctrl_aop 0 0 57>; + apple,npins = <57>; + interrupt-controller; + #interrupt-cells = <2>; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + , + , + ; + power-domains = <&ps_aop_gpio>; + status = "disabled"; + }; + + /* ADT /arm-io/nub-gpio; coprocessor/firmware ownership unqualified. */ + pinctrl_nub: pinctrl@3081f0000 { + compatible = "apple,t8140-pinctrl", "apple,t8103-pinctrl"; + reg = <0x3 0x081f0000 0x0 0x4000>; + gpio-controller; + #gpio-cells = <2>; + gpio-ranges = <&pinctrl_nub 0 0 30>; + apple,npins = <30>; + interrupt-controller; + #interrupt-cells = <2>; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + , + , + ; + power-domains = <&ps_nub_gpio>; + status = "disabled"; + }; + + /* ADT /arm-io/smc-gpio; coprocessor/firmware ownership unqualified. */ + pinctrl_smc: pinctrl@30c820000 { + compatible = "apple,t8140-pinctrl", "apple,t8103-pinctrl"; + reg = <0x3 0x0c820000 0x0 0x4000>; + gpio-controller; + #gpio-cells = <2>; + gpio-ranges = <&pinctrl_smc 0 0 6>; + apple,npins = <6>; + interrupt-controller; + #interrupt-cells = <2>; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + , + , + ; + status = "disabled"; + }; + + /* ADT /arm-io/mtp-gpio; coprocessor/firmware ownership unqualified. */ + pinctrl_mtp: pinctrl@314838000 { + compatible = "apple,t8140-pinctrl", "apple,t8103-pinctrl"; + reg = <0x3 0x14838000 0x0 0x4000>; + gpio-controller; + #gpio-cells = <2>; + gpio-ranges = <&pinctrl_mtp 0 0 10>; + apple,npins = <10>; + interrupt-controller; + #interrupt-cells = <2>; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + , + , + ; + status = "disabled"; + }; + + /* ADT /arm-io/dart-sio. */ + sio_dart: iommu@385060000 { + compatible = "apple,t8140-dart", "apple,t8110-dart"; + reg = <0x3 0x85060000 0x0 0x20000>; + #iommu-cells = <1>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_sio_cpu>; + status = "disabled"; + }; + + /* ADT /arm-io/dart-scaler. */ + scaler0_dart: iommu@291260000 { + compatible = "apple,t8140-dart", "apple,t8110-dart"; + reg = <0x2 0x91260000 0x0 0x20000>; + #iommu-cells = <1>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_msr>; + status = "disabled"; + }; + + /* ADT /arm-io/dart-rsm. */ + rsm_dart: iommu@3099a0000 { + compatible = "apple,t8140-dart", "apple,t8110-dart"; + reg = <0x3 0x099a0000 0x0 0xc000>; + #iommu-cells = <1>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + uart0: serial@385200000 { + compatible = "apple,t8140-uart", "apple,s5l-uart"; + reg = <0x3 0x85200000 0x0 0x4000>; + reg-io-width = <4>; + interrupt-parent = <&aic>; + interrupts = ; + clocks = <&peripheral_clocks 401>, <&peripheral_clocks 4>; + clock-names = "uart", "clk_uart_baud0"; + power-domains = <&ps_uart0>; + status = "disabled"; + }; + + uart4: serial@385210000 { + compatible = "apple,t8140-uart", "apple,s5l-uart"; + reg = <0x3 0x85210000 0x0 0x4000>; + reg-io-width = <4>; + interrupt-parent = <&aic>; + interrupts = ; + clocks = <&peripheral_clocks 401>, <&peripheral_clocks 4>; + clock-names = "uart", "clk_uart_baud0"; + power-domains = <&ps_uart4>; + status = "disabled"; + }; + + uart5: serial@385214000 { + compatible = "apple,t8140-uart", "apple,s5l-uart"; + reg = <0x3 0x85214000 0x0 0x4000>; + reg-io-width = <4>; + interrupt-parent = <&aic>; + interrupts = ; + clocks = <&peripheral_clocks 401>, <&peripheral_clocks 4>; + clock-names = "uart", "clk_uart_baud0"; + power-domains = <&ps_uart5>; + status = "disabled"; + }; + + sio: dma-controller@385e00000 { + compatible = "apple,t8140-sio", "apple,sio"; + reg = <0x3 0x85e00000 0x0 0x88000>, + <0x3 0x85850000 0x0 0x4000>; + #dma-cells = <1>; + dma-channels = <128>; + mboxes = <&sio_mbox>; + iommus = <&sio_dart 0>; + power-domains = <&ps_sio_cpu>; + clocks = <&peripheral_clocks 393>, <&peripheral_clocks 391>, <&peripheral_clocks 392>; + status = "disabled"; + }; + + sio_mbox: mailbox@385e08000 { + compatible = "apple,t8140-asc-mailbox", "apple,asc-mailbox-v4"; + reg = <0x3 0x85e08000 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"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t8140.dtsi b/arch/arm64/boot/dts/apple/t8140.dtsi index b27ca1ee8b05c..2b210d8ce99f5 100644 --- a/arch/arm64/boot/dts/apple/t8140.dtsi +++ b/arch/arm64/boot/dts/apple/t8140.dtsi @@ -1999,6 +1999,7 @@ }; #include "t8140-pmgr.dtsi" +#include "t8140-peripherals.dtsi" /* * DRAM interface class: width and maximum rate are inferred from topology From e680a9917e9df64f051e1a2ff5480ae4545b0352 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sat, 7 Nov 2026 22:21:27 +1100 Subject: [PATCH 03/20] dt-bindings: apple: describe firmware endpoints and board control devices Document firmware-only endpoints separately from directly programmed hardware, and describe the panel and card-reader sideband control interfaces. Keep hardware description independent of driver availability. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../bindings/clock/apple,nco-service.yaml | 32 ++++++++++++++ .../display/apple,sac-controller.yaml | 33 +++++++++++++++ .../display/apple,secure-display-pipe.yaml | 36 ++++++++++++++++ .../bindings/display/bridge/parade,dp855.yaml | 32 ++++++++++++++ .../media/apple,isp-service-proxy.yaml | 26 ++++++++++++ .../bindings/misc/apple,display-pcon.yaml | 29 +++++++++++++ .../bindings/misc/apple,sd-card-control.yaml | 29 +++++++++++++ .../bindings/soc/apple/apple,debug-dock.yaml | 35 ++++++++++++++++ .../bindings/soc/apple/apple,debug-port.yaml | 38 +++++++++++++++++ .../bindings/soc/apple/apple,eic.yaml | 42 +++++++++++++++++++ .../soc/apple/apple,hid-transport-mux.yaml | 29 +++++++++++++ .../soc/apple/apple,processor-trace.yaml | 29 +++++++++++++ .../bindings/soc/apple/apple,sac-manager.yaml | 29 +++++++++++++ .../soc/apple/apple,wireless-debug-dock.yaml | 26 ++++++++++++ .../sound/apple,audio-dart-proxy.yaml | 31 ++++++++++++++ .../bindings/sound/apple,audio-mic-proxy.yaml | 26 ++++++++++++ 16 files changed, 502 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/apple,nco-service.yaml create mode 100644 Documentation/devicetree/bindings/display/apple,sac-controller.yaml create mode 100644 Documentation/devicetree/bindings/display/apple,secure-display-pipe.yaml create mode 100644 Documentation/devicetree/bindings/display/bridge/parade,dp855.yaml create mode 100644 Documentation/devicetree/bindings/media/apple,isp-service-proxy.yaml create mode 100644 Documentation/devicetree/bindings/misc/apple,display-pcon.yaml create mode 100644 Documentation/devicetree/bindings/misc/apple,sd-card-control.yaml create mode 100644 Documentation/devicetree/bindings/soc/apple/apple,debug-dock.yaml create mode 100644 Documentation/devicetree/bindings/soc/apple/apple,debug-port.yaml create mode 100644 Documentation/devicetree/bindings/soc/apple/apple,eic.yaml create mode 100644 Documentation/devicetree/bindings/soc/apple/apple,hid-transport-mux.yaml create mode 100644 Documentation/devicetree/bindings/soc/apple/apple,processor-trace.yaml create mode 100644 Documentation/devicetree/bindings/soc/apple/apple,sac-manager.yaml create mode 100644 Documentation/devicetree/bindings/soc/apple/apple,wireless-debug-dock.yaml create mode 100644 Documentation/devicetree/bindings/sound/apple,audio-dart-proxy.yaml create mode 100644 Documentation/devicetree/bindings/sound/apple,audio-mic-proxy.yaml diff --git a/Documentation/devicetree/bindings/clock/apple,nco-service.yaml b/Documentation/devicetree/bindings/clock/apple,nco-service.yaml new file mode 100644 index 0000000000000..567efa089d067 --- /dev/null +++ b/Documentation/devicetree/bindings/clock/apple,nco-service.yaml @@ -0,0 +1,32 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/clock/apple,nco-service.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple firmware NCO clock service + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Firmware-managed numerically controlled oscillator service. Unlike the + directly programmed NCO binding, no AP register window is published. + The input selectors identify clocks in the PMGR clock namespace. + +properties: + compatible: + oneOf: + - items: + - const: apple,t8140-nco-service + - const: apple,nco-service + + clocks: + minItems: 4 + maxItems: 4 + +required: + - compatible + - clocks + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/display/apple,sac-controller.yaml b/Documentation/devicetree/bindings/display/apple,sac-controller.yaml new file mode 100644 index 0000000000000..b2c2770fb5f2f --- /dev/null +++ b/Documentation/devicetree/bindings/display/apple,sac-controller.yaml @@ -0,0 +1,33 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/apple,sac-controller.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple display SAC controller + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Display SAC firmware controller associated with the SAC manager. + +properties: + compatible: + oneOf: + - items: + - const: apple,t6041-sac-controller + - const: apple,sac-controller + - items: + - const: apple,t8140-sac-controller + - const: apple,sac-controller + + apple,manager: + $ref: /schemas/types.yaml#/definitions/phandle + description: Firmware SAC manager. + +required: + - compatible + - apple,manager + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/display/apple,secure-display-pipe.yaml b/Documentation/devicetree/bindings/display/apple,secure-display-pipe.yaml new file mode 100644 index 0000000000000..8ec1c0ef71480 --- /dev/null +++ b/Documentation/devicetree/bindings/display/apple,secure-display-pipe.yaml @@ -0,0 +1,36 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/apple,secure-display-pipe.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple secure display pipeline + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Secure display pipeline firmware endpoint, its interrupts and DART + streams. Firmware retains control of the display registers. + +properties: + compatible: + oneOf: + - items: + - const: apple,t8140-secure-display-pipe + - const: apple,secure-display-pipe + + interrupts: + minItems: 4 + maxItems: 4 + + iommus: + minItems: 2 + maxItems: 2 + +required: + - compatible + - interrupts + - iommus + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/display/bridge/parade,dp855.yaml b/Documentation/devicetree/bindings/display/bridge/parade,dp855.yaml new file mode 100644 index 0000000000000..9517baae77ce8 --- /dev/null +++ b/Documentation/devicetree/bindings/display/bridge/parade,dp855.yaml @@ -0,0 +1,32 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/bridge/parade,dp855.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Parade DP855 panel timing controller + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Panel timing controller controlled through SPI. The controller also + mediates access to panel management devices. Its downstream address + transport must be established before exposing those clients on a host + bus; the SPI chip select is not their downstream device address. + +allOf: + - $ref: /schemas/spi/spi-peripheral-props.yaml# + +properties: + compatible: + const: parade,dp855 + + reg: + maxItems: 1 + +required: + - compatible + - reg + +unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/media/apple,isp-service-proxy.yaml b/Documentation/devicetree/bindings/media/apple,isp-service-proxy.yaml new file mode 100644 index 0000000000000..217e3933f6868 --- /dev/null +++ b/Documentation/devicetree/bindings/media/apple,isp-service-proxy.yaml @@ -0,0 +1,26 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/apple,isp-service-proxy.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple image processor firmware service proxy + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Image processor secure firmware service endpoint. This is separate + from the AP image processor and has no AP register window. + +properties: + compatible: + oneOf: + - items: + - const: apple,t8140-isp-service-proxy + - const: apple,isp-service-proxy + +required: + - compatible + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/misc/apple,display-pcon.yaml b/Documentation/devicetree/bindings/misc/apple,display-pcon.yaml new file mode 100644 index 0000000000000..095b4bfd67ee8 --- /dev/null +++ b/Documentation/devicetree/bindings/misc/apple,display-pcon.yaml @@ -0,0 +1,29 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/misc/apple,display-pcon.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple display protocol converter control + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Display protocol converter control endpoint on the panel control bus. + Firmware retains control of the display path at boot. + +properties: + compatible: + items: + - const: apple,t6041-display-pcon + - const: apple,display-pcon + + reg: + maxItems: 1 + +required: + - compatible + - reg + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/misc/apple,sd-card-control.yaml b/Documentation/devicetree/bindings/misc/apple,sd-card-control.yaml new file mode 100644 index 0000000000000..7671d72d9b306 --- /dev/null +++ b/Documentation/devicetree/bindings/misc/apple,sd-card-control.yaml @@ -0,0 +1,29 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/misc/apple,sd-card-control.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple SD card sideband control + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Sideband control device on the SD reader control bus. The PCIe card + reader is a separate device; this endpoint does not replace it. + +properties: + compatible: + items: + - const: apple,t6041-sd-card-control + - const: apple,sd-card-control + + reg: + maxItems: 1 + +required: + - compatible + - reg + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,debug-dock.yaml b/Documentation/devicetree/bindings/soc/apple/apple,debug-dock.yaml new file mode 100644 index 0000000000000..836fa12906e65 --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,debug-dock.yaml @@ -0,0 +1,35 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/soc/apple/apple,debug-dock.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple debug dock connection detector + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Debug dock connection detector register and interrupt resources. + +properties: + compatible: + oneOf: + - items: + - const: apple,t8140-debug-dock + - const: apple,debug-dock + + reg: + minItems: 1 + maxItems: 1 + + interrupts: + minItems: 2 + maxItems: 2 + +required: + - compatible + - reg + - interrupts + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,debug-port.yaml b/Documentation/devicetree/bindings/soc/apple/apple,debug-port.yaml new file mode 100644 index 0000000000000..549ad92ccaf14 --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,debug-port.yaml @@ -0,0 +1,38 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/soc/apple/apple,debug-port.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple auxiliary on-chip debug port + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Auxiliary on-chip debug port. Firmware describes the port separately + from the processor debug MMIO apertures. Pin ownership and the debug + transport must be established before this endpoint is used. + +properties: + compatible: + oneOf: + - items: + - const: apple,t6041-debug-port + - const: apple,debug-port + - items: + - const: apple,t8140-debug-port + - const: apple,debug-port + + swclk-gpios: + maxItems: 1 + description: Serial wire clock pin. + + swdio-gpios: + maxItems: 1 + description: Bidirectional serial wire data pin. + +required: + - compatible + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,eic.yaml b/Documentation/devicetree/bindings/soc/apple/apple,eic.yaml new file mode 100644 index 0000000000000..4d916ffa1d51c --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,eic.yaml @@ -0,0 +1,42 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/soc/apple/apple,eic.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple secure peripheral controller + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Secure peripheral controller register apertures. These are absolute + secure-side aliases published separately from the ordinary AP devices. + The firmware retains ownership; an AP driver must establish an access + contract before touching these resources. + +properties: + compatible: + items: + - const: apple,t8140-eic + - const: apple,eic + + reg: + minItems: 6 + maxItems: 6 + + reg-names: + items: + - const: ps + - const: wd-isp + - const: gpio + - const: fpwm + - const: gltb + - const: wd-e + +required: + - compatible + - reg + - reg-names + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,hid-transport-mux.yaml b/Documentation/devicetree/bindings/soc/apple/apple,hid-transport-mux.yaml new file mode 100644 index 0000000000000..ae444f86cd0c0 --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,hid-transport-mux.yaml @@ -0,0 +1,29 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/soc/apple/apple,hid-transport-mux.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple HID transport multiplexer + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Firmware HID transport multiplexer between the MTP and AOP services. + The hardware description provides no independent register aperture. + +properties: + compatible: + oneOf: + - items: + - const: apple,t6041-hid-transport-mux + - const: apple,hid-transport-mux + - items: + - const: apple,t8140-hid-transport-mux + - const: apple,hid-transport-mux + +required: + - compatible + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,processor-trace.yaml b/Documentation/devicetree/bindings/soc/apple/apple,processor-trace.yaml new file mode 100644 index 0000000000000..6207bfbe14d0b --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,processor-trace.yaml @@ -0,0 +1,29 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/soc/apple/apple,processor-trace.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple processor trace service + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Processor trace service. The hardware description provides no AP MMIO + register aperture; a driver must establish its firmware transport. + +properties: + compatible: + oneOf: + - items: + - const: apple,t6041-processor-trace + - const: apple,processor-trace + - items: + - const: apple,t8140-processor-trace + - const: apple,processor-trace + +required: + - compatible + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,sac-manager.yaml b/Documentation/devicetree/bindings/soc/apple/apple,sac-manager.yaml new file mode 100644 index 0000000000000..3e6a309f0a694 --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,sac-manager.yaml @@ -0,0 +1,29 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/soc/apple/apple,sac-manager.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple display SAC manager + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Firmware display SAC manager. It has no independent register aperture + in the hardware description. + +properties: + compatible: + oneOf: + - items: + - const: apple,t6041-sac-manager + - const: apple,sac-manager + - items: + - const: apple,t8140-sac-manager + - const: apple,sac-manager + +required: + - compatible + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,wireless-debug-dock.yaml b/Documentation/devicetree/bindings/soc/apple/apple,wireless-debug-dock.yaml new file mode 100644 index 0000000000000..beee156b0b223 --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,wireless-debug-dock.yaml @@ -0,0 +1,26 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/soc/apple/apple,wireless-debug-dock.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple wireless debug dock endpoint + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Wireless debug dock firmware endpoint. It does not describe a second + wireless radio or transfer ownership of the existing radio. + +properties: + compatible: + oneOf: + - items: + - const: apple,t8140-wireless-debug-dock + - const: apple,wireless-debug-dock + +required: + - compatible + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,audio-dart-proxy.yaml b/Documentation/devicetree/bindings/sound/apple,audio-dart-proxy.yaml new file mode 100644 index 0000000000000..96a0e4a2892fc --- /dev/null +++ b/Documentation/devicetree/bindings/sound/apple,audio-dart-proxy.yaml @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/apple,audio-dart-proxy.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple isolated audio DART service proxy + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Isolated audio firmware endpoint and its DART streams. The firmware + retains ownership of the stream mappings at boot. + +properties: + compatible: + oneOf: + - items: + - const: apple,t8140-audio-dart-proxy + - const: apple,audio-dart-proxy + + iommus: + minItems: 2 + maxItems: 2 + +required: + - compatible + - iommus + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,audio-mic-proxy.yaml b/Documentation/devicetree/bindings/sound/apple,audio-mic-proxy.yaml new file mode 100644 index 0000000000000..6bc04371a4420 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/apple,audio-mic-proxy.yaml @@ -0,0 +1,26 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/apple,audio-mic-proxy.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple isolated microphone service proxy + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Isolated microphone firmware endpoint. Buffer geometry and calibration + are runtime data and are not static hardware resources. + +properties: + compatible: + oneOf: + - items: + - const: apple,t8140-audio-mic-proxy + - const: apple,audio-mic-proxy + +required: + - compatible + +additionalProperties: false From aae7eb1c2ca563731c2204287e61acb0b5cad836 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sat, 7 Nov 2026 22:21:28 +1100 Subject: [PATCH 04/20] arm64: dts: apple: describe remaining debug and firmware service endpoints Describe the live ADT firmware endpoints without inventing register windows for services that publish none. Add the secure peripheral aliases and keep board GPIO and control-bus wiring in the board descriptions. All additions remain disabled. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- arch/arm64/boot/dts/apple/t6040-j616s.dts | 29 +++++ .../boot/dts/apple/t6040-peripherals.dtsi | 35 ++++++ arch/arm64/boot/dts/apple/t8140-j700.dts | 6 + .../boot/dts/apple/t8140-peripherals.dtsi | 115 ++++++++++++++++++ 4 files changed, 185 insertions(+) diff --git a/arch/arm64/boot/dts/apple/t6040-j616s.dts b/arch/arm64/boot/dts/apple/t6040-j616s.dts index 087a1e96316e8..0d25857c3a5e5 100644 --- a/arch/arm64/boot/dts/apple/t6040-j616s.dts +++ b/arch/arm64/boot/dts/apple/t6040-j616s.dts @@ -80,3 +80,32 @@ &jpeg1 { status = "okay"; }; + +&debug_port2 { + swclk-gpios = <&pinctrl_ap 42 GPIO_ACTIVE_HIGH>; + swdio-gpios = <&pinctrl_ap 43 GPIO_ACTIVE_HIGH>; +}; + +&i2c4 { + sd_card_control: card-control@20 { + compatible = "apple,t6041-sd-card-control", "apple,sd-card-control"; + reg = <0x20>; + status = "disabled"; + }; +}; + +&i2c8 { + display_pcon: display-converter@8 { + compatible = "apple,t6041-display-pcon", "apple,display-pcon"; + reg = <0x8>; + status = "disabled"; + }; +}; + +&spi4 { + tcon: panel-controller@0 { + compatible = "parade,dp855"; + reg = <0>; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi b/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi index c65b68a15bfca..5bbb542140323 100644 --- a/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi +++ b/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi @@ -280,3 +280,38 @@ }; }; + +/ { + + /* ADT /arm-io/mtp-aop-mux; no qualified host transport/ownership contract. */ + hid_mux: hid-transport-mux { + compatible = "apple,t6041-hid-transport-mux", "apple,hid-transport-mux"; + status = "disabled"; + }; + + /* ADT /arm-io/apple-processor-trace; no qualified host transport/ownership contract. */ + processor_trace: processor-trace { + compatible = "apple,t6041-processor-trace", "apple,processor-trace"; + status = "disabled"; + }; + + /* ADT /arm-io/aod2; no qualified host transport/ownership contract. */ + debug_port2: debug-port-2 { + compatible = "apple,t6041-debug-port", "apple,debug-port"; + status = "disabled"; + }; + + /* ADT /sacm; no qualified host transport/ownership contract. */ + sac_manager: sac-manager { + compatible = "apple,t6041-sac-manager", "apple,sac-manager"; + status = "disabled"; + }; + + /* ADT /arm-io/dcp0-sac-controller; no qualified host transport/ownership contract. */ + sac_controller: sac-controller { + compatible = "apple,t6041-sac-controller", "apple,sac-controller"; + apple,manager = <&sac_manager>; + status = "disabled"; + }; +}; + diff --git a/arch/arm64/boot/dts/apple/t8140-j700.dts b/arch/arm64/boot/dts/apple/t8140-j700.dts index 80dbb11d873ec..2a73f2b65d3a5 100644 --- a/arch/arm64/boot/dts/apple/t8140-j700.dts +++ b/arch/arm64/boot/dts/apple/t8140-j700.dts @@ -2005,3 +2005,9 @@ &ane_dart2 { status = "okay"; }; + +&debug_port4 { + swclk-gpios = <&pinctrl_ap 86 GPIO_ACTIVE_HIGH>; + swdio-gpios = <&pinctrl_ap 85 GPIO_ACTIVE_HIGH>; +}; + diff --git a/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi b/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi index 4c3ef3ea1a551..6183366b0581f 100644 --- a/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi +++ b/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi @@ -412,3 +412,118 @@ status = "disabled"; }; }; + +/ { + + /* ADT /arm-io/mtp-aop-mux; no qualified host transport/ownership contract. */ + hid_mux: hid-transport-mux { + compatible = "apple,t8140-hid-transport-mux", "apple,hid-transport-mux"; + status = "disabled"; + }; + + /* ADT /arm-io/apple-processor-trace; no qualified host transport/ownership contract. */ + processor_trace: processor-trace { + compatible = "apple,t8140-processor-trace", "apple,processor-trace"; + status = "disabled"; + }; + + /* ADT /arm-io/aod2; no qualified host transport/ownership contract. */ + debug_port2: debug-port-2 { + compatible = "apple,t8140-debug-port", "apple,debug-port"; + status = "disabled"; + }; + + /* ADT /arm-io/aod3; no qualified host transport/ownership contract. */ + debug_port3: debug-port-3 { + compatible = "apple,t8140-debug-port", "apple,debug-port"; + status = "disabled"; + }; + + /* ADT /arm-io/aod4; no qualified host transport/ownership contract. */ + debug_port4: debug-port-4 { + compatible = "apple,t8140-debug-port", "apple,debug-port"; + status = "disabled"; + }; + + /* ADT /sacm; no qualified host transport/ownership contract. */ + sac_manager: sac-manager { + compatible = "apple,t8140-sac-manager", "apple,sac-manager"; + status = "disabled"; + }; + + /* ADT /arm-io/dcp-sac-controller; no qualified host transport/ownership contract. */ + sac_controller: sac-controller { + compatible = "apple,t8140-sac-controller", "apple,sac-controller"; + apple,manager = <&sac_manager>; + status = "disabled"; + }; + + /* ADT /arm-io/nco; no qualified host transport/ownership contract. */ + nco_service: nco-service { + compatible = "apple,t8140-nco-service", "apple,nco-service"; + clocks = <&peripheral_clocks 377>, <&peripheral_clocks 378>, <&peripheral_clocks 375>, <&peripheral_clocks 376>; + status = "disabled"; + }; + + /* ADT /arm-io/exdisplaypipe; no qualified host transport/ownership contract. */ + secure_display_pipe: secure-display-pipe { + compatible = "apple,t8140-secure-display-pipe", "apple,secure-display-pipe"; + interrupt-parent = <&aic>; + interrupts = , + , + , + ; + iommus = <&disp0_dart 3>, <&disp0_dart 4>; + status = "disabled"; + }; + + /* ADT /arm-io/isp-exclave-proxy; no qualified host transport/ownership contract. */ + isp_service_proxy: isp-service-proxy { + compatible = "apple,t8140-isp-service-proxy", "apple,isp-service-proxy"; + status = "disabled"; + }; + + /* ADT /arm-io/audio-hp-mic-proxy; no qualified host transport/ownership contract. */ + audio_mic_proxy: audio-mic-proxy { + compatible = "apple,t8140-audio-mic-proxy", "apple,audio-mic-proxy"; + status = "disabled"; + }; + + /* ADT /arm-io/audio-shared-dart-proxy; no qualified host transport/ownership contract. */ + audio_dart_proxy: audio-dart-proxy { + compatible = "apple,t8140-audio-dart-proxy", "apple,audio-dart-proxy"; + iommus = <&aop_dart 9>, <&aop_dart 11>; + status = "disabled"; + }; + + /* ADT /dock-debug-wireless; no qualified host transport/ownership contract. */ + wireless_debug_dock: wireless-debug-dock { + compatible = "apple,t8140-wireless-debug-dock", "apple,wireless-debug-dock"; + status = "disabled"; + }; + + /* ADT /dock-connect; no qualified host transport/ownership contract. */ + debug_dock: debug-dock@3082d8008 { + compatible = "apple,t8140-debug-dock", "apple,debug-dock"; + reg = <0x3 0x082d8008 0x0 0x4>; + interrupt-parent = <&aic>; + interrupts = , + ; + status = "disabled"; + }; +}; + +/ { + /* ADT /arm-io/eic named MMIO apertures are absolute addresses. */ + eic: secure-controller@340700000 { + compatible = "apple,t8140-eic", "apple,eic"; + reg = <0x3 0x40700000 0x0 0x18000>, + <0x3 0x63b50000 0x0 0x8000>, + <0x3 0x5a000000 0x0 0x4000>, + <0x3 0xc5040000 0x0 0xc000>, + <0x3 0x482a8000 0x0 0x4000>, + <0x3 0x482b0000 0x0 0x4000>; + reg-names = "ps", "wd-isp", "gpio", "fpwm", "gltb", "wd-e"; + status = "disabled"; + }; +}; From 097e0ff9c48ff523887588791a1c08f5af5459ab Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sat, 7 Nov 2026 22:24:21 +1100 Subject: [PATCH 05/20] arm64: dts: apple: use the T6041 AP GPIO label for the debug port Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- arch/arm64/boot/dts/apple/t6040-j616s.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t6040-j616s.dts b/arch/arm64/boot/dts/apple/t6040-j616s.dts index 0d25857c3a5e5..20b096996f303 100644 --- a/arch/arm64/boot/dts/apple/t6040-j616s.dts +++ b/arch/arm64/boot/dts/apple/t6040-j616s.dts @@ -82,8 +82,8 @@ }; &debug_port2 { - swclk-gpios = <&pinctrl_ap 42 GPIO_ACTIVE_HIGH>; - swdio-gpios = <&pinctrl_ap 43 GPIO_ACTIVE_HIGH>; + swclk-gpios = <&pinctrl 42 GPIO_ACTIVE_HIGH>; + swdio-gpios = <&pinctrl 43 GPIO_ACTIVE_HIGH>; }; &i2c4 { From 7b69f979ee957892f2344445fde0507e5c91e23e Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sat, 7 Nov 2026 22:29:30 +1100 Subject: [PATCH 06/20] dt-bindings: apple: cover panel sensors, PMU functions and loader placeholders Describe telemetry interrupt sources and the remaining SPMI control endpoints. Permit disabled coprocessor memory placeholders to carry a size until the loader assigns their physical reg, and document the existing Type-C PHY port graph. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../bindings/display/bridge/parade,dp855.yaml | 12 ++++++ .../devicetree/bindings/dma/apple,sio.yaml | 11 ++++-- .../bindings/misc/apple,radio-pmu.yaml | 30 +++++++++++++++ .../bindings/misc/apple,spmi-all-ace.yaml | 30 +++++++++++++++ .../bindings/misc/apple,xspmi-proxy.yaml | 30 +++++++++++++++ .../bindings/nvmem/apple,spmi-nvmem.yaml | 3 ++ .../bindings/phy/apple,t6040-atcphy.yaml | 4 ++ .../power/supply/apple,battery-monitor.yaml | 37 +++++++++++++++++++ .../reserved-memory/apple,asc-mem.yaml | 16 +++++++- .../bindings/soc/apple/apple,aon-ptd.yaml | 11 ++++++ .../soc/apple/apple,xspmi-controller.yaml | 31 ++++++++++++++++ .../bindings/sound/apple,smc-mogul.yaml | 37 +++++++++++++++++++ 12 files changed, 247 insertions(+), 5 deletions(-) create mode 100644 Documentation/devicetree/bindings/misc/apple,radio-pmu.yaml create mode 100644 Documentation/devicetree/bindings/misc/apple,spmi-all-ace.yaml create mode 100644 Documentation/devicetree/bindings/misc/apple,xspmi-proxy.yaml create mode 100644 Documentation/devicetree/bindings/power/supply/apple,battery-monitor.yaml create mode 100644 Documentation/devicetree/bindings/soc/apple/apple,xspmi-controller.yaml create mode 100644 Documentation/devicetree/bindings/sound/apple,smc-mogul.yaml diff --git a/Documentation/devicetree/bindings/display/bridge/parade,dp855.yaml b/Documentation/devicetree/bindings/display/bridge/parade,dp855.yaml index 9517baae77ce8..846fcecfb86d3 100644 --- a/Documentation/devicetree/bindings/display/bridge/parade,dp855.yaml +++ b/Documentation/devicetree/bindings/display/bridge/parade,dp855.yaml @@ -25,6 +25,18 @@ properties: reg: maxItems: 1 + i2c: + type: object + $ref: /schemas/i2c/i2c-controller.yaml# + description: Downstream panel management bus mediated by the timing controller. + + patternProperties: + '^temperature-sensor@7[0-2]$': + type: object + $ref: /schemas/trivial-devices.yaml# + + unevaluatedProperties: false + required: - compatible - reg diff --git a/Documentation/devicetree/bindings/dma/apple,sio.yaml b/Documentation/devicetree/bindings/dma/apple,sio.yaml index 7e0171d53eb1e..5a6e7e84cd469 100644 --- a/Documentation/devicetree/bindings/dma/apple,sio.yaml +++ b/Documentation/devicetree/bindings/dma/apple,sio.yaml @@ -26,8 +26,8 @@ allOf: then: properties: reg: - minItems: 2 - maxItems: 2 + minItems: 3 + maxItems: 3 else: properties: reg: @@ -50,8 +50,11 @@ properties: reg: minItems: 1 - maxItems: 2 - description: Coprocessor registers, followed on T8140 by the ASC auxiliary window. + maxItems: 3 + description: | + Coprocessor control registers. T8140 also publishes an auxiliary ASC + window and the remaining ASC registers after the mailbox window. + The mailbox registers are described by the mailbox provider. clocks: minItems: 1 diff --git a/Documentation/devicetree/bindings/misc/apple,radio-pmu.yaml b/Documentation/devicetree/bindings/misc/apple,radio-pmu.yaml new file mode 100644 index 0000000000000..934fd143ec834 --- /dev/null +++ b/Documentation/devicetree/bindings/misc/apple,radio-pmu.yaml @@ -0,0 +1,30 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/misc/apple,radio-pmu.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple radio power management follower + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + SPMI radio power-management follower. The firmware controls its power + policy; this node only describes its address on the SPMI bus. + +properties: + compatible: + items: + - enum: + - apple,t6041-radio-pmu + - const: apple,radio-pmu + + reg: + maxItems: 1 + +required: + - compatible + - reg + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/misc/apple,spmi-all-ace.yaml b/Documentation/devicetree/bindings/misc/apple,spmi-all-ace.yaml new file mode 100644 index 0000000000000..00b7caba3bfff --- /dev/null +++ b/Documentation/devicetree/bindings/misc/apple,spmi-all-ace.yaml @@ -0,0 +1,30 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/misc/apple,spmi-all-ace.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple SPMI Type-C control companion + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + SPMI companion endpoint alongside the Type-C port controllers. It + remains firmware-owned and is distinct from the per-port HPM followers. + +properties: + compatible: + items: + - enum: + - apple,t8140-spmi-all-ace + - const: apple,spmi-all-ace + + reg: + maxItems: 1 + +required: + - compatible + - reg + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/misc/apple,xspmi-proxy.yaml b/Documentation/devicetree/bindings/misc/apple,xspmi-proxy.yaml new file mode 100644 index 0000000000000..d6ec66464ea3d --- /dev/null +++ b/Documentation/devicetree/bindings/misc/apple,xspmi-proxy.yaml @@ -0,0 +1,30 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/misc/apple,xspmi-proxy.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple external SPMI proxy follower + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + External SPMI proxy endpoint on the NUB SPMI bus. Firmware owns the + proxy transport until a host driver establishes an access contract. + +properties: + compatible: + items: + - enum: + - apple,t8140-xspmi-proxy + - const: apple,xspmi-proxy + + reg: + maxItems: 1 + +required: + - compatible + - reg + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml b/Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml index 1a1051584e8fa..bd28dc14068e1 100644 --- a/Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml +++ b/Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml @@ -29,6 +29,9 @@ properties: reg: maxItems: 1 + battery-monitor: + $ref: /schemas/power/supply/apple,battery-monitor.yaml# + rtc: $ref: /schemas/rtc/apple,j700-pmu-rtc.yaml# diff --git a/Documentation/devicetree/bindings/phy/apple,t6040-atcphy.yaml b/Documentation/devicetree/bindings/phy/apple,t6040-atcphy.yaml index 04c8907584946..f62c71901541f 100644 --- a/Documentation/devicetree/bindings/phy/apple,t6040-atcphy.yaml +++ b/Documentation/devicetree/bindings/phy/apple,t6040-atcphy.yaml @@ -109,6 +109,10 @@ properties: Link to the SuperSpeed lanes of the Type-C connector. Absent on a fixed DisplayPort PHY. + ports: + $ref: /schemas/graph.yaml#/properties/ports + description: USB and DisplayPort lane connections to the Type-C connector. + apple,tunable-axi2af: $ref: "#/$defs/apple,tunable" description: Tunables applied to the axi2af region. diff --git a/Documentation/devicetree/bindings/power/supply/apple,battery-monitor.yaml b/Documentation/devicetree/bindings/power/supply/apple,battery-monitor.yaml new file mode 100644 index 0000000000000..32385b877710b --- /dev/null +++ b/Documentation/devicetree/bindings/power/supply/apple,battery-monitor.yaml @@ -0,0 +1,37 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/power/supply/apple,battery-monitor.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple PMU battery monitor + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Battery-monitor function. T6041 uses a separate SPMI follower and + telemetry-router source identifiers; T8140 is a function of the primary + PMIC and signals through the SPMI interrupt controller. The monitor does + not transfer ownership of PMIC control or battery policy to the host. + +properties: + compatible: + items: + - enum: + - apple,t6041-battery-monitor + - apple,t8140-battery-monitor + - const: apple,battery-monitor + + reg: + maxItems: 1 + + interrupts: + minItems: 1 + maxItems: 2 + +required: + - compatible + - interrupts + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/reserved-memory/apple,asc-mem.yaml b/Documentation/devicetree/bindings/reserved-memory/apple,asc-mem.yaml index fb306d541ca44..2a6cc96799c9f 100644 --- a/Documentation/devicetree/bindings/reserved-memory/apple,asc-mem.yaml +++ b/Documentation/devicetree/bindings/reserved-memory/apple,asc-mem.yaml @@ -19,6 +19,19 @@ description: allOf: - $ref: reserved-memory.yaml# + - if: + properties: + status: + const: disabled + required: + - status + then: + anyOf: + - required: [reg] + - required: [size] + else: + required: + - reg properties: compatible: @@ -27,6 +40,8 @@ properties: reg: maxItems: 1 + size: true + no-map: true iommu-addresses: true @@ -37,6 +52,5 @@ properties: required: - compatible - - reg 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 2a3dc9f5856d4..13dec59b733fc 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml @@ -32,9 +32,20 @@ properties: minItems: 32 maxItems: 32 + interrupt-controller: true + + '#interrupt-cells': + description: Firmware telemetry source identifier, plus flags on T8140. + enum: [1, 2] + + '#address-cells': + const: 0 + required: - compatible - reg - interrupts + - interrupt-controller + - '#interrupt-cells' additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,xspmi-controller.yaml b/Documentation/devicetree/bindings/soc/apple/apple,xspmi-controller.yaml new file mode 100644 index 0000000000000..2c0f48c8ebc52 --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,xspmi-controller.yaml @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/soc/apple/apple,xspmi-controller.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple external SPMI controller endpoint + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + External SPMI controller firmware endpoint. Its bus access is mediated + by a proxy follower; it has no independently published AP MMIO aperture. + +properties: + compatible: + items: + - enum: + - apple,t8140-xspmi-controller + - const: apple,xspmi-controller + + apple,proxy: + $ref: /schemas/types.yaml#/definitions/phandle + description: SPMI follower implementing the firmware proxy transport. + +required: + - compatible + - apple,proxy + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,smc-mogul.yaml b/Documentation/devicetree/bindings/sound/apple,smc-mogul.yaml new file mode 100644 index 0000000000000..1e628186118ac --- /dev/null +++ b/Documentation/devicetree/bindings/sound/apple,smc-mogul.yaml @@ -0,0 +1,37 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/apple,smc-mogul.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple SMC Mogul control endpoint + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Mogul control endpoint published below the SMC firmware node. Its + control address belongs to the SMC-mediated peripheral namespace and + must not be interpreted as an AP physical address. + +properties: + compatible: + items: + - enum: + - apple,t8140-smc-mogul + - const: apple,smc-mogul + + apple,smc: + $ref: /schemas/types.yaml#/definitions/phandle + description: SMC firmware transport provider. + + apple,control-address: + $ref: /schemas/types.yaml#/definitions/uint32 + description: Peripheral address in the SMC-mediated control namespace. + +required: + - compatible + - apple,smc + - apple,control-address + +additionalProperties: false From 5890ebc1609de5b2e31eef9d461ec9fb06cedd8e Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sat, 7 Nov 2026 22:29:31 +1100 Subject: [PATCH 07/20] arm64: dts: apple: complete control endpoints and correct static resource descriptions Describe panel temperature clients, PMU monitor/proxy functions and their structural links. Use disabled size placeholders for memory that the loader fills with reg. Put the named SGX resource first on T8140 to avoid the GPU/mailbox unit-address collision; consumers resolve resources by name. Remove unused static child-bus cells from the internal DCP. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../apple/t6040-j616s-extdisp-mem-loader.dtsi | 12 ++--- arch/arm64/boot/dts/apple/t6040-j616s.dts | 24 +++++++++ .../boot/dts/apple/t6040-peripherals.dtsi | 26 +++++++++- .../arm64/boot/dts/apple/t604x-j614-j616.dtsi | 12 ++--- arch/arm64/boot/dts/apple/t604x.dtsi | 3 -- .../boot/dts/apple/t8140-peripherals.dtsi | 52 ++++++++++++++++++- arch/arm64/boot/dts/apple/t8140.dtsi | 20 ++++--- 7 files changed, 123 insertions(+), 26 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t6040-j616s-extdisp-mem-loader.dtsi b/arch/arm64/boot/dts/apple/t6040-j616s-extdisp-mem-loader.dtsi index 08d4768494634..542a2d9f22dfa 100644 --- a/arch/arm64/boot/dts/apple/t6040-j616s-extdisp-mem-loader.dtsi +++ b/arch/arm64/boot/dts/apple/t6040-j616s-extdisp-mem-loader.dtsi @@ -19,42 +19,42 @@ reserved-memory { dcpext0_text: dcpext0-text { compatible = "apple,asc-mem"; - reg = <0x0 0x0 0x0 0x4000>; + size = <0x0 0x4000>; /* The loader supplies reg. */ no-map; status = "disabled"; }; dcpext0_data: dcpext0-data { compatible = "apple,asc-mem"; - reg = <0x0 0x0 0x0 0x4000>; + size = <0x0 0x4000>; /* The loader supplies reg. */ no-map; status = "disabled"; }; dcpext0_heap: dcpext0-heap { compatible = "apple,asc-mem"; - reg = <0x0 0x0 0x0 0x4000>; + size = <0x0 0x4000>; /* The loader supplies reg. */ no-map; status = "disabled"; }; dcpext1_text: dcpext1-text { compatible = "apple,asc-mem"; - reg = <0x0 0x0 0x0 0x4000>; + size = <0x0 0x4000>; /* The loader supplies reg. */ no-map; status = "disabled"; }; dcpext1_data: dcpext1-data { compatible = "apple,asc-mem"; - reg = <0x0 0x0 0x0 0x4000>; + size = <0x0 0x4000>; /* The loader supplies reg. */ no-map; status = "disabled"; }; dcpext1_heap: dcpext1-heap { compatible = "apple,asc-mem"; - reg = <0x0 0x0 0x0 0x4000>; + size = <0x0 0x4000>; /* The loader supplies reg. */ no-map; status = "disabled"; }; diff --git a/arch/arm64/boot/dts/apple/t6040-j616s.dts b/arch/arm64/boot/dts/apple/t6040-j616s.dts index 20b096996f303..09c22cc658d81 100644 --- a/arch/arm64/boot/dts/apple/t6040-j616s.dts +++ b/arch/arm64/boot/dts/apple/t6040-j616s.dts @@ -107,5 +107,29 @@ compatible = "parade,dp855"; reg = <0>; status = "disabled"; + + /* ADT display-temp-sens1..3 are downstream of the TCON. */ + i2c { + #address-cells = <1>; + #size-cells = <0>; + + temperature-sensor@70 { + compatible = "ti,tmp103"; + reg = <0x70>; + status = "disabled"; + }; + + temperature-sensor@71 { + compatible = "ti,tmp103"; + reg = <0x71>; + status = "disabled"; + }; + + temperature-sensor@72 { + compatible = "ti,tmp103"; + reg = <0x72>; + status = "disabled"; + }; + }; }; }; diff --git a/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi b/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi index 5bbb542140323..5743d9032f5f4 100644 --- a/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi +++ b/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi @@ -238,7 +238,7 @@ status = "disabled"; }; - /* ADT /arm-io/dcpext0-expert. */ + /* ADT /arm-io/dcp0-expert. */ dcp_expert: display-expert@4023a8050 { compatible = "apple,t6041-dcp-expert", "apple,dcp-expert"; reg = <0x4 0x023a8050 0x0 0x4>, @@ -315,3 +315,27 @@ }; }; + +&aon_ptd { + interrupt-controller; + #interrupt-cells = <1>; + #address-cells = <0>; +}; + +&nub_spmi0 { + battery_monitor: battery-monitor@b { + compatible = "apple,t6041-battery-monitor", "apple,battery-monitor"; + reg = <0xb SPMI_USID>; + interrupt-parent = <&aon_ptd>; + interrupts = <0x62746d30>, <0x62746d31>; + status = "disabled"; + }; +}; + +&aop_spmi0 { + radio_pmu: pmic@e { + compatible = "apple,t6041-radio-pmu", "apple,radio-pmu"; + reg = <0xe SPMI_USID>; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi b/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi index 2c4e9d8cec2bc..7e8f9950c4afb 100644 --- a/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi +++ b/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi @@ -108,7 +108,7 @@ * segment-ranges[0]); the driver identifies the build from it. */ gpu_fw_text: gpu-fw-text { - reg = <0 0 0 0>; + size = <0 0>; /* The loader adds reg before enabling this region. */ status = "disabled"; no-map; }; @@ -118,7 +118,7 @@ * places its crash log here. */ gpu_fw_data: gpu-fw-data { - reg = <0 0 0 0>; + size = <0 0>; /* The loader adds reg before enabling this region. */ status = "disabled"; no-map; }; @@ -129,25 +129,25 @@ * the boot loader adds them to /memory. */ uat_ttbs: uat-ttbs { - reg = <0 0 0 0>; + size = <0 0>; /* The loader adds reg before enabling this region. */ status = "disabled"; no-map; }; uat_pagetables: uat-pagetables { - reg = <0 0 0 0>; + size = <0 0>; /* The loader adds reg before enabling this region. */ status = "disabled"; no-map; }; uat_l2_pagetables: uat-l2-pagetables { - reg = <0 0 0 0>; + size = <0 0>; /* The loader adds reg before enabling this region. */ status = "disabled"; no-map; }; uat_handoff: uat-handoff { - reg = <0 0 0 0>; + size = <0 0>; /* The loader adds reg before enabling this region. */ status = "disabled"; no-map; }; diff --git a/arch/arm64/boot/dts/apple/t604x.dtsi b/arch/arm64/boot/dts/apple/t604x.dtsi index 93a595a057f24..1b289ab28059f 100644 --- a/arch/arm64/boot/dts/apple/t604x.dtsi +++ b/arch/arm64/boot/dts/apple/t604x.dtsi @@ -915,9 +915,6 @@ iommus = <&dcp_dart 23>; apple,bw-scratch = <&pmgr_dcp 0 4 0x20000>; apple,iomfb-surfaces = <1 1 0 0>; - /* the boot loader describes the piodma's regions with 2+2 cells */ - #address-cells = <2>; - #size-cells = <2>; /* enabled once the boot loader has handed the display over */ status = "disabled"; diff --git a/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi b/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi index 6183366b0581f..8714ef1e60642 100644 --- a/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi +++ b/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi @@ -386,8 +386,10 @@ sio: dma-controller@385e00000 { compatible = "apple,t8140-sio", "apple,sio"; - reg = <0x3 0x85e00000 0x0 0x88000>, - <0x3 0x85850000 0x0 0x4000>; + /* Split the ASC bank around the separately owned mailbox window. */ + reg = <0x3 0x85e00000 0x0 0x8000>, + <0x3 0x85850000 0x0 0x4000>, + <0x3 0x85e0c000 0x0 0x7c000>; #dma-cells = <1>; dma-channels = <128>; mboxes = <&sio_mbox>; @@ -527,3 +529,49 @@ status = "disabled"; }; }; + +&aon_ptd { + interrupt-controller; + #interrupt-cells = <2>; + #address-cells = <0>; +}; + +&{/soc/spmi@308714000/pmic@e} { + battery_monitor: battery-monitor { + compatible = "apple,t8140-battery-monitor", "apple,battery-monitor"; + interrupt-parent = <&nub_spmi0>; + interrupts = <12 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; +}; + +&nub_spmi1 { + xspmi_proxy: proxy@d { + compatible = "apple,t8140-xspmi-proxy", "apple,xspmi-proxy"; + reg = <0xd SPMI_USID>; + status = "disabled"; + }; +}; + +&nub_spmi_a0 { + spmi_all_ace: controller@e { + compatible = "apple,t8140-spmi-all-ace", "apple,spmi-all-ace"; + reg = <0xe SPMI_USID>; + status = "disabled"; + }; +}; + +/ { + xspmi_controller: spmi-proxy-controller { + compatible = "apple,t8140-xspmi-controller", "apple,xspmi-controller"; + apple,proxy = <&xspmi_proxy>; + status = "disabled"; + }; + + smc_mogul: smc-mogul { + compatible = "apple,t8140-smc-mogul", "apple,smc-mogul"; + apple,smc = <&smc>; + apple,control-address = <0x10>; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t8140.dtsi b/arch/arm64/boot/dts/apple/t8140.dtsi index 338272182371d..2e1109aaa451c 100644 --- a/arch/arm64/boot/dts/apple/t8140.dtsi +++ b/arch/arm64/boot/dts/apple/t8140.dtsi @@ -430,7 +430,8 @@ ranges; uat_handoff: uat-handoff { - reg = <0 0 0 0>; + size = <0 0>; /* The loader supplies reg and enables the region. */ + status = "disabled"; }; /* @@ -458,15 +459,18 @@ /* Only reserved: the GPU node does not reference it */ uat_l2_pagetables: uat-l2-pagetables { - reg = <0 0 0 0>; + size = <0 0>; /* The loader supplies reg and enables the region. */ + status = "disabled"; }; uat_pagetables: uat-pagetables { - reg = <0 0 0 0>; + size = <0 0>; /* The loader supplies reg and enables the region. */ + status = "disabled"; }; uat_ttbs: uat-ttbs { - reg = <0 0 0 0>; + size = <0 0>; /* The loader supplies reg and enables the region. */ + status = "disabled"; }; }; @@ -1344,11 +1348,11 @@ status = "disabled"; }; - gpu: gpu@482600000 { + gpu: gpu@480000000 { compatible = "apple,agx-t8140"; - reg = <0x4 0x82600000 0x0 0x88000>, - <0x4 0x80000000 0x0 0x4000000>; - reg-names = "asc", "sgx"; + reg = <0x4 0x80000000 0x0 0x4000000>, + <0x4 0x82600000 0x0 0x88000>; + reg-names = "sgx", "asc"; mboxes = <&gfx_mbox>, <&gfx1_mbox>; power-domains = <&ps_gfx>; memory-region = <&uat_ttbs>, <&uat_pagetables>, From 9c4c280e26a46921052719ca3d01351aa1ec97c4 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sat, 7 Nov 2026 22:41:30 +1100 Subject: [PATCH 08/20] dt-bindings: apple: describe unqualified audio and reporting endpoints Permit unrouted DP audio interfaces to remain disabled and describe their T8140 variant. Document the remaining audio firmware endpoints, secure ADMAC and external SPMI queue resources without inventing firmware transport links. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../display/apple,dcp-ioreporting.yaml | 27 +++++++ .../bindings/dma/apple,admac-secure.yaml | 56 +++++++++++++ .../soc/apple/apple,xspmi-controller.yaml | 28 +++++-- .../sound/apple,audio-firmware-services.yaml | 79 +++++++++++++++++++ .../bindings/sound/apple,t6030-dpaudio.yaml | 22 +++++- 5 files changed, 203 insertions(+), 9 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/apple,dcp-ioreporting.yaml create mode 100644 Documentation/devicetree/bindings/dma/apple,admac-secure.yaml create mode 100644 Documentation/devicetree/bindings/sound/apple,audio-firmware-services.yaml diff --git a/Documentation/devicetree/bindings/display/apple,dcp-ioreporting.yaml b/Documentation/devicetree/bindings/display/apple,dcp-ioreporting.yaml new file mode 100644 index 0000000000000..009c1df8f082d --- /dev/null +++ b/Documentation/devicetree/bindings/display/apple,dcp-ioreporting.yaml @@ -0,0 +1,27 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/apple,dcp-ioreporting.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple secure display reporting service + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Secure display coprocessor reporting endpoint. It is a firmware service + without an independently published AP MMIO window or interrupt. A host + client must establish the reporting transport and its lifecycle before + using it; the service is not an additional display engine. + +properties: + compatible: + items: + - const: apple,t8140-dcp-ioreporting + - const: apple,dcp-ioreporting + +required: + - compatible + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/dma/apple,admac-secure.yaml b/Documentation/devicetree/bindings/dma/apple,admac-secure.yaml new file mode 100644 index 0000000000000..bb8ee4570b6bd --- /dev/null +++ b/Documentation/devicetree/bindings/dma/apple,admac-secure.yaml @@ -0,0 +1,56 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/dma/apple,admac-secure.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple secure audio DMA controller + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + The secure LEAP audio DMA controller's direct hardware aperture. It is + distinct from the AP-accessible channel proxy. Its register aperture is + not safe for the AP to access until firmware transfers ownership. The + node remains disabled and must not select the ordinary ADMAC driver. + Linux logical channel IDs alternate TX and RX; the ADT slot count is + per direction. + +allOf: + - $ref: dma-controller.yaml# + +properties: + compatible: + items: + - const: apple,t8140-admac-secure + - const: apple,admac-secure + + reg: + maxItems: 1 + + '#dma-cells': + const: 1 + + dma-channels: + const: 18 + + interrupts: + maxItems: 1 + + iommus: + maxItems: 1 + + power-domains: + maxItems: 1 + +required: + - compatible + - reg + - '#dma-cells' + - dma-channels + - interrupts + - iommus + - power-domains + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,xspmi-controller.yaml b/Documentation/devicetree/bindings/soc/apple/apple,xspmi-controller.yaml index 2c0f48c8ebc52..93ca2a72cc436 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,xspmi-controller.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,xspmi-controller.yaml @@ -10,8 +10,10 @@ maintainers: - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> description: | - External SPMI controller firmware endpoint. Its bus access is mediated - by a proxy follower; it has no independently published AP MMIO aperture. + External SPMI controller queue aperture, published separately from the + non-secure bus and its SPMI proxy follower. The queue aperture is owned + by secure firmware; the response vector is local to this transport and + is not an AIC interrupt number. properties: compatible: @@ -20,12 +22,26 @@ properties: - apple,t8140-xspmi-controller - const: apple,xspmi-controller - apple,proxy: - $ref: /schemas/types.yaml#/definitions/phandle - description: SPMI follower implementing the firmware proxy transport. + reg: + maxItems: 1 + + apple,read-queue-depth: + $ref: /schemas/types.yaml#/definitions/uint32 + description: Number of entries in the read request queue. + + apple,write-queue-depth: + $ref: /schemas/types.yaml#/definitions/uint32 + description: Number of entries in the write request queue. + + apple,response-vector: + $ref: /schemas/types.yaml#/definitions/uint32 + description: Local response vector of the firmware transport. required: - compatible - - apple,proxy + - reg + - apple,read-queue-depth + - apple,write-queue-depth + - apple,response-vector additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,audio-firmware-services.yaml b/Documentation/devicetree/bindings/sound/apple,audio-firmware-services.yaml new file mode 100644 index 0000000000000..c205aa516a552 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/apple,audio-firmware-services.yaml @@ -0,0 +1,79 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/apple,audio-firmware-services.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple firmware audio service endpoints + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Firmware audio services published separately from the active sound card. + These endpoints identify voice-trigger, loopback, low-power microphone, + shared microphone buffer and listening clients. A service has no AP MMIO + aperture. DMA references describe ADMAC channel ownership, not permission + to reset a firmware-owned audio fabric or start an audio stream. + These endpoints remain disabled until their host client and ownership + protocol have been qualified. No acoustic tuning or buffer contents are + static hardware properties. + +properties: + compatible: + oneOf: + - items: + - const: apple,t6041-audio-leap-loopback + - const: apple,audio-leap-loopback + - items: + - const: apple,t6041-audio-listening-client + - const: apple,audio-listening-client + - items: + - const: apple,t6041-audio-low-power-mic + - const: apple,audio-low-power-mic + - items: + - const: apple,t6041-audio-mca-loopback + - const: apple,audio-mca-loopback + - items: + - const: apple,t6041-audio-mic-buffer + - const: apple,audio-mic-buffer + - items: + - const: apple,t6041-audio-voice-trigger + - const: apple,audio-voice-trigger + - items: + - const: apple,t8140-audio-leap-loopback + - const: apple,audio-leap-loopback + - items: + - const: apple,t8140-audio-listening-client + - const: apple,audio-listening-client + - items: + - const: apple,t8140-audio-low-power-mic + - const: apple,audio-low-power-mic + - items: + - const: apple,t8140-audio-mca-loopback + - const: apple,audio-mca-loopback + - items: + - const: apple,t8140-audio-mic-buffer + - const: apple,audio-mic-buffer + - items: + - const: apple,t8140-audio-mic-injection + - const: apple,audio-mic-injection + - items: + - const: apple,t8140-audio-speaker-tap + - const: apple,audio-speaker-tap + - items: + - const: apple,t8140-audio-voice-trigger + - const: apple,audio-voice-trigger + + dmas: + minItems: 1 + maxItems: 2 + + iommus: + minItems: 1 + maxItems: 2 + +required: + - compatible + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,t6030-dpaudio.yaml b/Documentation/devicetree/bindings/sound/apple,t6030-dpaudio.yaml index b511202f35c7e..1ae364f691740 100644 --- a/Documentation/devicetree/bindings/sound/apple,t6030-dpaudio.yaml +++ b/Documentation/devicetree/bindings/sound/apple,t6030-dpaudio.yaml @@ -4,7 +4,7 @@ $id: http://devicetree.org/schemas/sound/apple,t6030-dpaudio.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Apple T6030 and T6041 DisplayPort audio +title: Apple T6030, T6041 and T8140 DisplayPort audio maintainers: - Ryan Murray @@ -15,7 +15,10 @@ description: | Samples arrive through SIO, and the graph connects this interface to port 0 of the display processor that owns the audio service. - T6041 interfaces remain disabled until a generation-specific SIO firmware + Unrouted interfaces can be described disabled without inventing an audio + connection to a display processor. A route is required before enabling. + + T6041 and T8140 interfaces remain disabled until a generation-specific SIO firmware backend and loader handoff are available and display audio is qualified. select: @@ -25,6 +28,7 @@ select: enum: - apple,t6030-dpaudio - apple,t6041-dpaudio + - apple,t8140-dpaudio required: - compatible @@ -34,6 +38,7 @@ properties: - enum: - apple,t6030-dpaudio - apple,t6041-dpaudio + - apple,t8140-dpaudio - const: apple,dpaudio dmas: @@ -59,6 +64,17 @@ required: - dmas - dma-names - power-domains - - ports + +allOf: + - if: + not: + properties: + status: + const: disabled + required: + - status + then: + required: + - ports additionalProperties: false From 6a81702a42916e3dcf29c6e3cd615fe7a933b628 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sat, 7 Nov 2026 22:41:30 +1100 Subject: [PATCH 09/20] arm64: dts: apple: expose remaining audio endpoints and complete T8140 channel counts Describe the remaining DP/audio firmware endpoints and the CPU power-state descriptors without enabling them. Correct non-secure T8140 ADMAC counts: the live ADT counts TX/RX pairs, as the licensed m1n1 ADMAC helper also documents, while Linux logical IDs alternate directions. Describe the secure direct aperture separately from the existing proxy. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../boot/dts/apple/t6040-peripherals.dtsi | 75 +++++++++++++ .../boot/dts/apple/t8140-peripherals.dtsi | 106 +++++++++++++++++- arch/arm64/boot/dts/apple/t8140-pmgr.dtsi | 76 +++++++++++++ arch/arm64/boot/dts/apple/t8140.dtsi | 6 +- 4 files changed, 259 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi b/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi index 5743d9032f5f4..a79fc041dec1c 100644 --- a/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi +++ b/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi @@ -339,3 +339,78 @@ status = "disabled"; }; }; + +/* Register-less DP audio interfaces: ADT DMA channels and PMGR gates. */ +/ { + + dpaudio0: audio-controller-0 { + compatible = "apple,t6041-dpaudio", "apple,dpaudio"; + dmas = <&sio 0x64>; + dma-names = "tx"; + power-domains = <&ps_dpa0>; + /* No qualified firmware audio route is assigned at boot. */ + status = "disabled"; + }; + + dpaudio3: audio-controller-3 { + compatible = "apple,t6041-dpaudio", "apple,dpaudio"; + dmas = <&sio 0x6a>; + dma-names = "tx"; + power-domains = <&ps_dpa3>; + /* No qualified firmware audio route is assigned at boot. */ + status = "disabled"; + }; + + dpaudio4: audio-controller-4 { + compatible = "apple,t6041-dpaudio", "apple,dpaudio"; + dmas = <&sio 0x6c>; + dma-names = "tx"; + power-domains = <&ps_dpa4>; + /* No qualified firmware audio route is assigned at boot. */ + status = "disabled"; + }; +}; + + +/* Firmware audio endpoints with no qualified independent host client. */ +/ { + + /* ADT /arm-io/iop-voicetrigger-controller/audio-vt-device. */ + audio_voice_trigger: audio-voice-trigger { + compatible = "apple,t6041-audio-voice-trigger", "apple,audio-voice-trigger"; + status = "disabled"; + }; + + /* ADT /arm-io/iop-audio-controller/audio-mca-loopback. */ + audio_mca_loopback: audio-mca-loopback { + compatible = "apple,t6041-audio-mca-loopback", "apple,audio-mca-loopback"; + dmas = <&admac1 6>, <&admac1 7>; + status = "disabled"; + }; + + /* ADT /arm-io/iop-audio-controller/audio-leap-internal-loopback. */ + audio_leap_loopback: audio-leap-loopback { + compatible = "apple,t6041-audio-leap-loopback", "apple,audio-leap-loopback"; + dmas = <&admac0 8>, <&admac0 9>; + status = "disabled"; + }; + + /* ADT /arm-io/iop-audio-controller/lp-mic-device. */ + audio_low_power_mic: audio-low-power-mic { + compatible = "apple,t6041-audio-low-power-mic", "apple,audio-low-power-mic"; + status = "disabled"; + }; + + /* ADT /arm-io/iop-audio-controller/lp-mic-io-buffer-device. */ + audio_mic_buffer: audio-mic-buffer { + compatible = "apple,t6041-audio-mic-buffer", "apple,audio-mic-buffer"; + iommus = <&aop_dart 8>; + status = "disabled"; + }; + + /* ADT /arm-io/iop-audio-controller/siri-listening-device. */ + audio_listening_client: audio-listening-client { + compatible = "apple,t6041-audio-listening-client", "apple,audio-listening-client"; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi b/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi index 8714ef1e60642..7a696b6f4addb 100644 --- a/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi +++ b/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi @@ -140,6 +140,26 @@ status = "disabled"; }; + /* ADT /arm-io/admac-leap-s; the existing AP proxy is separate. */ + admac_leap_secure: dma-controller@313200000 { + compatible = "apple,t8140-admac-secure", "apple,admac-secure"; + reg = <0x3 0x13200000 0x0 0x34000>; + #dma-cells = <1>; + dma-channels = <18>; + interrupt-parent = <&aic>; + interrupts = ; + iommus = <&aop_dart 11>; + power-domains = <&ps_audio_leap_s_a>; + status = "disabled"; + }; + + /* ADT /arm-io/dcp0-expert. */ + /* ADT /arm-io/dcp-exclave-ioreporting. */ + dcp_ioreporting: dcp-ioreporting { + compatible = "apple,t8140-dcp-ioreporting", "apple,dcp-ioreporting"; + status = "disabled"; + }; + /* ADT /arm-io/dcp0-expert. */ dcp_expert: display-expert@3082b8044 { compatible = "apple,t8140-dcp-expert", "apple,dcp-expert"; @@ -562,9 +582,12 @@ }; / { - xspmi_controller: spmi-proxy-controller { + xspmi_controller: spmi-proxy-controller@348614000 { compatible = "apple,t8140-xspmi-controller", "apple,xspmi-controller"; - apple,proxy = <&xspmi_proxy>; + reg = <0x3 0x48614000 0x0 0x4000>; + apple,read-queue-depth = <256>; + apple,write-queue-depth = <256>; + apple,response-vector = <256>; status = "disabled"; }; @@ -575,3 +598,82 @@ status = "disabled"; }; }; + +/* Register-less DP audio interfaces: ADT DMA channels and PMGR gates. */ +/ { + + dpaudio0: audio-controller-0 { + compatible = "apple,t8140-dpaudio", "apple,dpaudio"; + dmas = <&sio 0x64>; + dma-names = "tx"; + power-domains = <&ps_dpa0>; + /* No qualified firmware audio route is assigned at boot. */ + status = "disabled"; + }; + + dpaudio1: audio-controller-1 { + compatible = "apple,t8140-dpaudio", "apple,dpaudio"; + dmas = <&sio 0x66>; + dma-names = "tx"; + power-domains = <&ps_dpa1>; + /* No qualified firmware audio route is assigned at boot. */ + status = "disabled"; + }; +}; + +/* Firmware audio endpoints with no qualified independent host client. */ +/ { + + /* ADT /arm-io/iop-voicetrigger-controller/audio-vt-device. */ + audio_voice_trigger: audio-voice-trigger { + compatible = "apple,t8140-audio-voice-trigger", "apple,audio-voice-trigger"; + status = "disabled"; + }; + + /* ADT /arm-io/iop-audio-controller/audio-mca-loopback. */ + audio_mca_loopback: audio-mca-loopback { + compatible = "apple,t8140-audio-mca-loopback", "apple,audio-mca-loopback"; + dmas = <&admac_base_ns 6>, <&admac_base_ns 7>; + status = "disabled"; + }; + + /* ADT /arm-io/iop-audio-controller/audio-leap-internal-loopback. */ + audio_leap_loopback: audio-leap-loopback { + compatible = "apple,t8140-audio-leap-loopback", "apple,audio-leap-loopback"; + dmas = <&admac_leap_ns 8>, <&admac_leap_ns 9>; + status = "disabled"; + }; + + /* ADT /arm-io/iop-audio-controller/lp-mic-device. */ + audio_low_power_mic: audio-low-power-mic { + compatible = "apple,t8140-audio-low-power-mic", "apple,audio-low-power-mic"; + status = "disabled"; + }; + + /* ADT /arm-io/iop-audio-controller/lp-mic-io-buffer-device. */ + audio_mic_buffer: audio-mic-buffer { + compatible = "apple,t8140-audio-mic-buffer", "apple,audio-mic-buffer"; + iommus = <&aop_dart 9>; + status = "disabled"; + }; + + /* ADT /arm-io/iop-audio-controller/siri-listening-device. */ + audio_listening_client: audio-listening-client { + compatible = "apple,t8140-audio-listening-client", "apple,audio-listening-client"; + status = "disabled"; + }; + + /* ADT /arm-io/iop-audio-controller/audio-speaker-tap. */ + audio_speaker_tap: audio-speaker-tap { + compatible = "apple,t8140-audio-speaker-tap", "apple,audio-speaker-tap"; + dmas = <&admac_base_ns 3>; + status = "disabled"; + }; + + /* ADT /arm-io/iop-audio-controller/lp-mic-injection-device. */ + audio_mic_injection: audio-mic-injection { + compatible = "apple,t8140-audio-mic-injection", "apple,audio-mic-injection"; + dmas = <&admac_base_ns 10>; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t8140-pmgr.dtsi b/arch/arm64/boot/dts/apple/t8140-pmgr.dtsi index 0a479f7e8e8e5..a2be4fc980916 100644 --- a/arch/arm64/boot/dts/apple/t8140-pmgr.dtsi +++ b/arch/arm64/boot/dts/apple/t8140-pmgr.dtsi @@ -1498,3 +1498,79 @@ }; }; + +/* CPU power states are described but remain owned by CPU power management. */ +&pmgr { + + ps_ecpu_0: power-controller@0 { + compatible = "apple,t8140-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "ecpu_0"; + status = "disabled"; + }; + + ps_ecpu_1: power-controller@8 { + compatible = "apple,t8140-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "ecpu_1"; + status = "disabled"; + }; + + ps_ecpu_2: power-controller@10 { + compatible = "apple,t8140-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x10 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "ecpu_2"; + status = "disabled"; + }; + + ps_ecpu_3: power-controller@18 { + compatible = "apple,t8140-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x18 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "ecpu_3"; + status = "disabled"; + }; + + ps_pcpu_0: power-controller@30 { + compatible = "apple,t8140-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x30 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu_0"; + status = "disabled"; + }; + + ps_pcpu_1: power-controller@38 { + compatible = "apple,t8140-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x38 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu_1"; + status = "disabled"; + }; + + ps_ecpm: power-controller@50 { + compatible = "apple,t8140-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x50 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "ecpm"; + status = "disabled"; + }; + + ps_pcpm: power-controller@58 { + compatible = "apple,t8140-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x58 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpm"; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t8140.dtsi b/arch/arm64/boot/dts/apple/t8140.dtsi index 2e1109aaa451c..fbe4314221cff 100644 --- a/arch/arm64/boot/dts/apple/t8140.dtsi +++ b/arch/arm64/boot/dts/apple/t8140.dtsi @@ -1820,7 +1820,8 @@ admac_base_ns: dma-controller@313800000 { compatible = "apple,t8140-admac"; reg = <0x3 0x13800000 0x0 0x34000>; - dma-channels = <13>; + /* ADT has 13 slots per direction; Linux IDs alternate TX/RX. */ + dma-channels = <26>; interrupts-extended = <&aic AIC_IRQ 449 IRQ_TYPE_LEVEL_HIGH>, <0>, <0>, <0>; #dma-cells = <1>; @@ -1840,7 +1841,8 @@ admac_leap_ns: dma-controller@313300000 { compatible = "apple,t8140-admac"; reg = <0x3 0x13300000 0x0 0x34000>; - dma-channels = <9>; + /* ADT has 9 slots per direction, including loopback RX4. */ + dma-channels = <18>; interrupts-extended = <&aic AIC_IRQ 452 IRQ_TYPE_LEVEL_HIGH>, <0>, <0>, <0>; #dma-cells = <1>; From 1a6cd0120199c9b0a9aa13d55f5a305c66f4f658 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sat, 7 Nov 2026 22:42:38 +1100 Subject: [PATCH 10/20] docs: add compiled DT DMA geometry audit Validate that every client DMA specifier, including disabled clients, fits its provider geometry. This catches a structurally valid DT whose channel count excludes a described endpoint. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- docs/dt-audit/check-dma.py | 89 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 docs/dt-audit/check-dma.py diff --git a/docs/dt-audit/check-dma.py b/docs/dt-audit/check-dma.py new file mode 100644 index 0000000000000..7596d436ccc82 --- /dev/null +++ b/docs/dt-audit/check-dma.py @@ -0,0 +1,89 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0-only OR MIT +"""Check DMA references against provider geometry in compiled board DTBs. + +Run on the buildbox after compiling the boards. dt-schema validates each +node's shape; this checks the cross-node channel bounds, including disabled +clients intended for later enablement. +""" + +import pathlib +import struct +import sys + + +def cells(value): + if len(value) % 4: + raise ValueError("property length is not a whole number of cells") + return struct.unpack(">" + "I" * (len(value) // 4), value) + + +def read_nodes(data): + header = struct.unpack_from(">10I", data) + if header[0] != 0xD00DFEED or header[1] > len(data): + raise ValueError("invalid flattened device tree") + offset = header[2] + strings = data[header[3]:header[3] + header[8]] + stack = [] + nodes = {} + while True: + token, = struct.unpack_from(">I", data, offset) + offset += 4 + if token == 1: + end = data.index(b"\0", offset) + stack.append(data[offset:end].decode("ascii")) + offset = (end + 4) & ~3 + nodes["/".join(stack) or "/"] = {} + elif token == 2: + stack.pop() + elif token == 3: + size, name_offset = struct.unpack_from(">II", data, offset) + offset += 8 + end = strings.index(b"\0", name_offset) + name = strings[name_offset:end].decode("ascii") + nodes["/".join(stack) or "/"][name] = data[offset:offset + size] + offset = (offset + size + 3) & ~3 + elif token == 4: + continue + elif token == 9: + return nodes + else: + raise ValueError(f"unexpected FDT token {token}") + + +def check(path): + nodes = read_nodes(path.read_bytes()) + providers = {} + for name, props in nodes.items(): + if "phandle" in props: + providers[cells(props["phandle"])[0]] = (name, props) + references = 0 + for name, props in nodes.items(): + specifiers = cells(props.get("dmas", b"")) + offset = 0 + while offset < len(specifiers): + phandle = specifiers[offset] + offset += 1 + if phandle not in providers: + raise ValueError(f"{name}: DMA provider {phandle} is absent") + provider_name, provider = providers[phandle] + count = cells(provider.get("#dma-cells", b"")) + if len(count) != 1 or offset + count[0] > len(specifiers): + raise ValueError(f"{name}: invalid DMA specifier for {provider_name}") + args = specifiers[offset:offset + count[0]] + offset += count[0] + capacity = cells(provider.get("dma-channels", b"")) + if count[0] == 1 and capacity and args[0] >= capacity[0]: + raise ValueError( + f"{name}: channel {args[0]} exceeds {provider_name}'s " + f"{capacity[0]} logical channels" + ) + references += 1 + print(f"{path.name}: {references} DMA references within provider geometry") + + +if __name__ == "__main__": + if len(sys.argv) < 2: + raise SystemExit("usage: check-dma.py BOARD.dtb [BOARD.dtb ...]") + for argument in sys.argv[1:]: + check(pathlib.Path(argument)) From 3bddb4bfbac5efd9b7a5df9c810294ac862c4c6b Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sat, 7 Nov 2026 22:46:45 +1100 Subject: [PATCH 11/20] arm64: dts: apple: preserve display loader placeholders and describe engine resets Keep external DCP placeholder reg values required by the loader and give the initially disabled regions matching unit addresses. The GPU reservations keep their path-based fill interface. Add the scaler and T6041 APR reset relationships from the ADT ARST functions. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../bindings/media/apple,scaler.yaml | 4 ++++ .../bindings/media/apple,t6041-prores.yaml | 4 ++++ .../reserved-memory/apple,asc-mem.yaml | 16 +------------ .../apple/t6040-j616s-extdisp-mem-loader.dtsi | 24 +++++++++---------- .../boot/dts/apple/t6040-peripherals.dtsi | 2 ++ .../boot/dts/apple/t8140-peripherals.dtsi | 1 + 6 files changed, 24 insertions(+), 27 deletions(-) diff --git a/Documentation/devicetree/bindings/media/apple,scaler.yaml b/Documentation/devicetree/bindings/media/apple,scaler.yaml index 7f97ff9a6199d..62ae10462d76b 100644 --- a/Documentation/devicetree/bindings/media/apple,scaler.yaml +++ b/Documentation/devicetree/bindings/media/apple,scaler.yaml @@ -45,11 +45,15 @@ properties: minItems: 1 maxItems: 1 + resets: + maxItems: 1 + required: - compatible - reg - interrupts - power-domains + - resets - iommus - clocks diff --git a/Documentation/devicetree/bindings/media/apple,t6041-prores.yaml b/Documentation/devicetree/bindings/media/apple,t6041-prores.yaml index 1a35ae29920ef..3754bc5a901f0 100644 --- a/Documentation/devicetree/bindings/media/apple,t6041-prores.yaml +++ b/Documentation/devicetree/bindings/media/apple,t6041-prores.yaml @@ -38,11 +38,15 @@ properties: minItems: 1 maxItems: 1 + resets: + maxItems: 1 + required: - compatible - reg - interrupts - power-domains + - resets - iommus additionalProperties: false diff --git a/Documentation/devicetree/bindings/reserved-memory/apple,asc-mem.yaml b/Documentation/devicetree/bindings/reserved-memory/apple,asc-mem.yaml index 2a6cc96799c9f..fb306d541ca44 100644 --- a/Documentation/devicetree/bindings/reserved-memory/apple,asc-mem.yaml +++ b/Documentation/devicetree/bindings/reserved-memory/apple,asc-mem.yaml @@ -19,19 +19,6 @@ description: allOf: - $ref: reserved-memory.yaml# - - if: - properties: - status: - const: disabled - required: - - status - then: - anyOf: - - required: [reg] - - required: [size] - else: - required: - - reg properties: compatible: @@ -40,8 +27,6 @@ properties: reg: maxItems: 1 - size: true - no-map: true iommu-addresses: true @@ -52,5 +37,6 @@ properties: required: - compatible + - reg unevaluatedProperties: false diff --git a/arch/arm64/boot/dts/apple/t6040-j616s-extdisp-mem-loader.dtsi b/arch/arm64/boot/dts/apple/t6040-j616s-extdisp-mem-loader.dtsi index 542a2d9f22dfa..53f8e1fbc9482 100644 --- a/arch/arm64/boot/dts/apple/t6040-j616s-extdisp-mem-loader.dtsi +++ b/arch/arm64/boot/dts/apple/t6040-j616s-extdisp-mem-loader.dtsi @@ -17,44 +17,44 @@ / { reserved-memory { - dcpext0_text: dcpext0-text { + dcpext0_text: dcpext0-text@0 { compatible = "apple,asc-mem"; - size = <0x0 0x4000>; /* The loader supplies reg. */ + reg = <0x0 0x0 0x0 0x4000>; no-map; status = "disabled"; }; - dcpext0_data: dcpext0-data { + dcpext0_data: dcpext0-data@0 { compatible = "apple,asc-mem"; - size = <0x0 0x4000>; /* The loader supplies reg. */ + reg = <0x0 0x0 0x0 0x4000>; no-map; status = "disabled"; }; - dcpext0_heap: dcpext0-heap { + dcpext0_heap: dcpext0-heap@0 { compatible = "apple,asc-mem"; - size = <0x0 0x4000>; /* The loader supplies reg. */ + reg = <0x0 0x0 0x0 0x4000>; no-map; status = "disabled"; }; - dcpext1_text: dcpext1-text { + dcpext1_text: dcpext1-text@0 { compatible = "apple,asc-mem"; - size = <0x0 0x4000>; /* The loader supplies reg. */ + reg = <0x0 0x0 0x0 0x4000>; no-map; status = "disabled"; }; - dcpext1_data: dcpext1-data { + dcpext1_data: dcpext1-data@0 { compatible = "apple,asc-mem"; - size = <0x0 0x4000>; /* The loader supplies reg. */ + reg = <0x0 0x0 0x0 0x4000>; no-map; status = "disabled"; }; - dcpext1_heap: dcpext1-heap { + dcpext1_heap: dcpext1-heap@0 { compatible = "apple,asc-mem"; - size = <0x0 0x4000>; /* The loader supplies reg. */ + reg = <0x0 0x0 0x0 0x4000>; no-map; status = "disabled"; }; diff --git a/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi b/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi index a79fc041dec1c..b9a365b7a9691 100644 --- a/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi +++ b/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi @@ -88,6 +88,7 @@ iommus = <&scaler0_dart 0>, <&scaler0_dart 1>; clocks = <&peripheral_clocks 417>; + resets = <&ps_msr0>; status = "disabled"; }; @@ -181,6 +182,7 @@ interrupts = ; power-domains = <&ps_scodec>; iommus = <&apr0_dart 1>; + resets = <&ps_scodec>; status = "disabled"; }; diff --git a/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi b/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi index 7a696b6f4addb..cd63104dcff23 100644 --- a/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi +++ b/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi @@ -88,6 +88,7 @@ iommus = <&scaler0_dart 0>, <&scaler0_dart 1>; clocks = <&peripheral_clocks 374>; + resets = <&ps_msr>; status = "disabled"; }; From 1767abd8dfe14329f89c91ab3046ab13a829866a Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sat, 7 Nov 2026 22:48:01 +1100 Subject: [PATCH 12/20] dt-bindings: clock: apple: retain the complete PMGR clock resource banks Publish the saved ADT structural register banks alongside the clock selector namespace. A future clock backend must not be limited to the primary PMGR power-state syscon aperture. Keep both providers disabled and omit sampled rates and programming tables. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../bindings/clock/apple,pmgr-clocks.yaml | 30 ++++++++- .../boot/dts/apple/t6040-peripherals.dtsi | 66 ++++++++++++++++++- .../boot/dts/apple/t8140-peripherals.dtsi | 47 ++++++++++++- 3 files changed, 140 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml b/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml index 84e7e54dc662b..71e74f7d59a83 100644 --- a/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml +++ b/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml @@ -25,16 +25,44 @@ properties: - 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: Power manager providing the clock control registers. + description: Primary PMGR syscon. Additional control banks are described by reg. required: + - reg - compatible - '#clock-cells' - apple,pmgr +allOf: + - if: + properties: + compatible: + contains: + const: apple,t6041-pmgr-clocks + then: + properties: + reg: + minItems: 63 + maxItems: 63 + - if: + properties: + compatible: + contains: + const: apple,t8140-pmgr-clocks + then: + properties: + reg: + minItems: 44 + maxItems: 44 + additionalProperties: false diff --git a/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi b/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi index b9a365b7a9691..81685adca2cb9 100644 --- a/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi +++ b/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi @@ -274,8 +274,72 @@ }; /* Clock IDs are SoC hardware selectors, not ADT phandles. */ - peripheral_clocks: clock-controller { + peripheral_clocks: clock-controller@502800000 { compatible = "apple,t6041-pmgr-clocks", "apple,pmgr-clocks"; + /* ADT /arm-io/pmgr register banks, in hardware-description order. */ + reg = <0x5 0x02800000 0x0 0x1e0000>, + <0x5 0x08300000 0x0 0x80000>, + <0x5 0x02280000 0x0 0x100000>, + <0x5 0x00000000 0x0 0x80000>, + <0x5 0x08200000 0x0 0x80000>, + <0x5 0x08004000 0x0 0x1000>, + <0x2 0x10e20000 0x0 0x2000>, + <0x2 0x10050000 0x0 0xef1000>, + <0x2 0x10e40000 0x0 0x9000>, + <0x2 0x10e50000 0x0 0xe81000>, + <0x2 0x10e70000 0x0 0x1000>, + <0x2 0x10050000 0x0 0x10000>, + <0x2 0x10150000 0x0 0x10000>, + <0x2 0x10250000 0x0 0x10000>, + <0x2 0x10350000 0x0 0x10000>, + <0x2 0x11e20000 0x0 0x2000>, + <0x2 0x11050000 0x0 0xef1000>, + <0x2 0x11e40000 0x0 0xb000>, + <0x2 0x11e50000 0x0 0xe81000>, + <0x2 0x11e70000 0x0 0x1000>, + <0x2 0x11050000 0x0 0x10000>, + <0x2 0x11150000 0x0 0x10000>, + <0x2 0x11250000 0x0 0x10000>, + <0x2 0x11350000 0x0 0x10000>, + <0x2 0x11450000 0x0 0x10000>, + <0x2 0x11550000 0x0 0x10000>, + <0x2 0x12e20000 0x0 0x2000>, + <0x2 0x12050000 0x0 0xef1000>, + <0x2 0x12e40000 0x0 0xb000>, + <0x2 0x12e50000 0x0 0xe81000>, + <0x2 0x12e70000 0x0 0x1000>, + <0x2 0x12050000 0x0 0x10000>, + <0x2 0x12150000 0x0 0x10000>, + <0x2 0x12250000 0x0 0x10000>, + <0x2 0x12350000 0x0 0x10000>, + <0x2 0x12450000 0x0 0x10000>, + <0x2 0x12550000 0x0 0x10000>, + <0x5 0x02800000 0x0 0x18000>, + <0x5 0x0282c000 0x0 0x4000>, + <0x5 0x02850000 0x0 0x4000>, + <0x5 0x02880000 0x0 0x1c000>, + <0x5 0x02900000 0x0 0x24000>, + <0x5 0x028f0000 0x0 0x4000>, + <0x5 0x028e0000 0x0 0x4000>, + <0x5 0x02820000 0x0 0x4000>, + <0x5 0x08330000 0x0 0x10000>, + <0x5 0x08374000 0x0 0x4000>, + <0x5 0x08360000 0x0 0x4000>, + <0x5 0x00200000 0x0 0x8000>, + <0x5 0x00400000 0x0 0x34000>, + <0x5 0x003c0000 0x0 0x30000>, + <0x5 0x08800000 0x0 0xa8000>, + <0x4 0x85878000 0x0 0x4000>, + <0x2 0x88eb0000 0x0 0x4000>, + <0x2 0x88e80000 0x0 0x30000>, + <0x5 0x08900000 0x0 0x18000>, + <0x5 0x00210000 0x0 0x8000>, + <0x5 0x0020c000 0x0 0x4000>, + <0x5 0x08004000 0x0 0x1000>, + <0x5 0x0007a000 0x0 0x4000>, + <0x5 0x04000000 0x0 0x1000000>, + <0x2 0x88e1c000 0x0 0x4000>, + <0x5 0x022a0000 0x0 0x4000>; #clock-cells = <1>; apple,pmgr = <&pmgr>; status = "disabled"; diff --git a/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi b/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi index cd63104dcff23..a6a33c3223a66 100644 --- a/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi +++ b/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi @@ -241,8 +241,53 @@ }; /* Clock IDs are SoC hardware selectors, not ADT phandles. */ - peripheral_clocks: clock-controller { + peripheral_clocks: clock-controller@300700000 { compatible = "apple,t8140-pmgr-clocks", "apple,pmgr-clocks"; + /* ADT /arm-io/pmgr register banks, in hardware-description order. */ + reg = <0x3 0x00700000 0x0 0xcc000>, + <0x3 0x08280000 0x0 0x80000>, + <0x3 0x00000000 0x0 0x78000>, + <0x3 0x08200000 0x0 0x7c000>, + <0x3 0x08004000 0x0 0x1000>, + <0x2 0x10e20000 0x0 0x2000>, + <0x2 0x10050000 0x0 0xef1000>, + <0x2 0x10e40000 0x0 0x9000>, + <0x2 0x10e50000 0x0 0xe81000>, + <0x2 0x10e70000 0x0 0x1000>, + <0x2 0x10050000 0x0 0x10000>, + <0x2 0x10150000 0x0 0x10000>, + <0x2 0x10250000 0x0 0x10000>, + <0x2 0x10350000 0x0 0x10000>, + <0x2 0x11e20000 0x0 0x2000>, + <0x2 0x11050000 0x0 0xef1000>, + <0x2 0x11e40000 0x0 0xb000>, + <0x2 0x11e50000 0x0 0xe81000>, + <0x2 0x11e70000 0x0 0x1000>, + <0x2 0x11050000 0x0 0x10000>, + <0x2 0x11150000 0x0 0x10000>, + <0x3 0x00700000 0x0 0x18000>, + <0x3 0x00724000 0x0 0x4000>, + <0x3 0x00728000 0x0 0x4000>, + <0x3 0x00730000 0x0 0x14000>, + <0x3 0x00760000 0x0 0x4000>, + <0x3 0x00764000 0x0 0x4000>, + <0x3 0x00768000 0x0 0x4000>, + <0x3 0x00780000 0x0 0x4000>, + <0x3 0x082b8000 0x0 0x10000>, + <0x3 0x082c8000 0x0 0x4000>, + <0x3 0x082d0000 0x0 0x8000>, + <0x3 0x00208000 0x0 0x8000>, + <0x3 0x00280000 0x0 0x80000>, + <0x3 0x003c0000 0x0 0x30000>, + <0x3 0x08100000 0x0 0xa8000>, + <0x4 0x01878000 0x0 0x4000>, + <0x3 0x00780000 0x0 0x4000>, + <0x4 0x0195c000 0x0 0x4000>, + <0x4 0x01960000 0x0 0x4000>, + <0x4 0x01974000 0x0 0x4000>, + <0x2 0x11000000 0x0 0xff4000>, + <0x4 0x80e1c000 0x0 0x4000>, + <0x3 0x02000000 0x0 0x1000000>; #clock-cells = <1>; apple,pmgr = <&pmgr>; status = "disabled"; From 8777b6c7a5fa623e2252abb58b9fe6a4bf67df86 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sat, 7 Nov 2026 22:49:24 +1100 Subject: [PATCH 13/20] dt-bindings: clock: apple: keep firmware NCO selectors separate from input clocks Preserve the NCO service clock identifiers without asserting a direct AP input/output topology that the ADT does not publish. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../bindings/clock/apple,nco-service.yaml | 15 ++++++++++++--- arch/arm64/boot/dts/apple/t8140-peripherals.dtsi | 3 ++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/clock/apple,nco-service.yaml b/Documentation/devicetree/bindings/clock/apple,nco-service.yaml index 567efa089d067..78c553ce9b7bf 100644 --- a/Documentation/devicetree/bindings/clock/apple,nco-service.yaml +++ b/Documentation/devicetree/bindings/clock/apple,nco-service.yaml @@ -12,7 +12,9 @@ maintainers: description: | Firmware-managed numerically controlled oscillator service. Unlike the directly programmed NCO binding, no AP register window is published. - The input selectors identify clocks in the PMGR clock namespace. + The selectors identify clocks in the PMGR clock namespace. Their + firmware service association is preserved without assuming a direct + AP-programmable NCO input/output clock topology. properties: compatible: @@ -21,12 +23,19 @@ properties: - const: apple,t8140-nco-service - const: apple,nco-service - clocks: + apple,clock-controller: + $ref: /schemas/types.yaml#/definitions/phandle + description: Provider defining the SoC hardware clock selector namespace. + + apple,clock-selectors: + $ref: /schemas/types.yaml#/definitions/uint32-array minItems: 4 maxItems: 4 + description: Clock selectors published for this firmware NCO service. required: - compatible - - clocks + - apple,clock-controller + - apple,clock-selectors additionalProperties: false diff --git a/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi b/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi index a6a33c3223a66..a0a83dea2030a 100644 --- a/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi +++ b/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi @@ -529,7 +529,8 @@ /* ADT /arm-io/nco; no qualified host transport/ownership contract. */ nco_service: nco-service { compatible = "apple,t8140-nco-service", "apple,nco-service"; - clocks = <&peripheral_clocks 377>, <&peripheral_clocks 378>, <&peripheral_clocks 375>, <&peripheral_clocks 376>; + apple,clock-controller = <&peripheral_clocks>; + apple,clock-selectors = <377 378 375 376>; status = "disabled"; }; From 00d827fde32806ddf1836c2f5a2386522c28e49c Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sat, 7 Nov 2026 22:53:14 +1100 Subject: [PATCH 14/20] dt-bindings: apple: preserve transport contracts in the completeness descriptions Use the SPMI controller supported rising-edge trigger for the PMU monitor, and check that contract across compiled interrupt references. Leave firmware queue-depth configuration out of static DTS. Select the T6041 APR resource layout only for its own primary compatible. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../bindings/media/apple,t6041-prores.yaml | 8 ++++++ .../soc/apple/apple,xspmi-controller.yaml | 10 ------- .../boot/dts/apple/t8140-peripherals.dtsi | 4 +-- docs/dt-audit/check-dma.py | 26 +++++++++++++++++-- 4 files changed, 33 insertions(+), 15 deletions(-) diff --git a/Documentation/devicetree/bindings/media/apple,t6041-prores.yaml b/Documentation/devicetree/bindings/media/apple,t6041-prores.yaml index 3754bc5a901f0..96ffef4dbbca4 100644 --- a/Documentation/devicetree/bindings/media/apple,t6041-prores.yaml +++ b/Documentation/devicetree/bindings/media/apple,t6041-prores.yaml @@ -14,6 +14,14 @@ description: | layout is distinct from the T8140 APR binding and must not select that generation's driver. +select: + properties: + compatible: + contains: + const: apple,t6041-prores + required: + - compatible + properties: compatible: oneOf: diff --git a/Documentation/devicetree/bindings/soc/apple/apple,xspmi-controller.yaml b/Documentation/devicetree/bindings/soc/apple/apple,xspmi-controller.yaml index 93ca2a72cc436..23de22e476d5d 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,xspmi-controller.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,xspmi-controller.yaml @@ -25,14 +25,6 @@ properties: reg: maxItems: 1 - apple,read-queue-depth: - $ref: /schemas/types.yaml#/definitions/uint32 - description: Number of entries in the read request queue. - - apple,write-queue-depth: - $ref: /schemas/types.yaml#/definitions/uint32 - description: Number of entries in the write request queue. - apple,response-vector: $ref: /schemas/types.yaml#/definitions/uint32 description: Local response vector of the firmware transport. @@ -40,8 +32,6 @@ properties: required: - compatible - reg - - apple,read-queue-depth - - apple,write-queue-depth - apple,response-vector additionalProperties: false diff --git a/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi b/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi index a0a83dea2030a..6a00fc2f4ad69 100644 --- a/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi +++ b/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi @@ -607,7 +607,7 @@ battery_monitor: battery-monitor { compatible = "apple,t8140-battery-monitor", "apple,battery-monitor"; interrupt-parent = <&nub_spmi0>; - interrupts = <12 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <12 IRQ_TYPE_EDGE_RISING>; status = "disabled"; }; }; @@ -632,8 +632,6 @@ xspmi_controller: spmi-proxy-controller@348614000 { compatible = "apple,t8140-xspmi-controller", "apple,xspmi-controller"; reg = <0x3 0x48614000 0x0 0x4000>; - apple,read-queue-depth = <256>; - apple,write-queue-depth = <256>; apple,response-vector = <256>; status = "disabled"; }; diff --git a/docs/dt-audit/check-dma.py b/docs/dt-audit/check-dma.py index 7596d436ccc82..938dcdad9c9cc 100644 --- a/docs/dt-audit/check-dma.py +++ b/docs/dt-audit/check-dma.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # SPDX-License-Identifier: GPL-2.0-only OR MIT -"""Check DMA references against provider geometry in compiled board DTBs. +"""Check DMA geometry and SPMI interrupt references in compiled board DTBs. Run on the buildbox after compiling the boards. dt-schema validates each node's shape; this checks the cross-node channel bounds, including disabled @@ -58,6 +58,7 @@ def check(path): if "phandle" in props: providers[cells(props["phandle"])[0]] = (name, props) references = 0 + spmi_interrupts = 0 for name, props in nodes.items(): specifiers = cells(props.get("dmas", b"")) offset = 0 @@ -79,7 +80,28 @@ def check(path): f"{capacity[0]} logical channels" ) references += 1 - print(f"{path.name}: {references} DMA references within provider geometry") + interrupt_parent = props.get("interrupt-parent") + if interrupt_parent and "interrupts" in props: + phandle, = cells(interrupt_parent) + if phandle not in providers: + raise ValueError(f"{name}: interrupt provider {phandle} is absent") + provider_name, provider = providers[phandle] + compatible = provider.get("compatible", b"").split(b"\0") + if b"apple,t8103-spmi" in compatible: + specifiers = cells(props["interrupts"]) + if len(specifiers) % 2: + raise ValueError(f"{name}: malformed SPMI interrupt specifier") + for offset in range(0, len(specifiers), 2): + # spmi-apple-controller.c accepts IRQ_TYPE_EDGE_RISING only. + if specifiers[offset + 1] != 1: + raise ValueError( + f"{name}: {provider_name} supports rising-edge interrupts only" + ) + spmi_interrupts += 1 + print( + f"{path.name}: {references} DMA references within provider geometry; " + f"{spmi_interrupts} SPMI interrupt specifiers supported by the controller" + ) if __name__ == "__main__": From 043acbc7cecdd8ad1aac5d0d4dc37f79fdf5d1df Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sat, 7 Nov 2026 22:58:57 +1100 Subject: [PATCH 15/20] Remove audit tooling from the kernel tree per DT2 conventions Keep the audit reports and resource checker with the DT2 evidence and CI tooling outside the kernel repository. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- docs/dt-audit/check-dma.py | 111 ------------------------------------- 1 file changed, 111 deletions(-) delete mode 100644 docs/dt-audit/check-dma.py diff --git a/docs/dt-audit/check-dma.py b/docs/dt-audit/check-dma.py deleted file mode 100644 index 938dcdad9c9cc..0000000000000 --- a/docs/dt-audit/check-dma.py +++ /dev/null @@ -1,111 +0,0 @@ -#!/usr/bin/env python3 -# SPDX-License-Identifier: GPL-2.0-only OR MIT -"""Check DMA geometry and SPMI interrupt references in compiled board DTBs. - -Run on the buildbox after compiling the boards. dt-schema validates each -node's shape; this checks the cross-node channel bounds, including disabled -clients intended for later enablement. -""" - -import pathlib -import struct -import sys - - -def cells(value): - if len(value) % 4: - raise ValueError("property length is not a whole number of cells") - return struct.unpack(">" + "I" * (len(value) // 4), value) - - -def read_nodes(data): - header = struct.unpack_from(">10I", data) - if header[0] != 0xD00DFEED or header[1] > len(data): - raise ValueError("invalid flattened device tree") - offset = header[2] - strings = data[header[3]:header[3] + header[8]] - stack = [] - nodes = {} - while True: - token, = struct.unpack_from(">I", data, offset) - offset += 4 - if token == 1: - end = data.index(b"\0", offset) - stack.append(data[offset:end].decode("ascii")) - offset = (end + 4) & ~3 - nodes["/".join(stack) or "/"] = {} - elif token == 2: - stack.pop() - elif token == 3: - size, name_offset = struct.unpack_from(">II", data, offset) - offset += 8 - end = strings.index(b"\0", name_offset) - name = strings[name_offset:end].decode("ascii") - nodes["/".join(stack) or "/"][name] = data[offset:offset + size] - offset = (offset + size + 3) & ~3 - elif token == 4: - continue - elif token == 9: - return nodes - else: - raise ValueError(f"unexpected FDT token {token}") - - -def check(path): - nodes = read_nodes(path.read_bytes()) - providers = {} - for name, props in nodes.items(): - if "phandle" in props: - providers[cells(props["phandle"])[0]] = (name, props) - references = 0 - spmi_interrupts = 0 - for name, props in nodes.items(): - specifiers = cells(props.get("dmas", b"")) - offset = 0 - while offset < len(specifiers): - phandle = specifiers[offset] - offset += 1 - if phandle not in providers: - raise ValueError(f"{name}: DMA provider {phandle} is absent") - provider_name, provider = providers[phandle] - count = cells(provider.get("#dma-cells", b"")) - if len(count) != 1 or offset + count[0] > len(specifiers): - raise ValueError(f"{name}: invalid DMA specifier for {provider_name}") - args = specifiers[offset:offset + count[0]] - offset += count[0] - capacity = cells(provider.get("dma-channels", b"")) - if count[0] == 1 and capacity and args[0] >= capacity[0]: - raise ValueError( - f"{name}: channel {args[0]} exceeds {provider_name}'s " - f"{capacity[0]} logical channels" - ) - references += 1 - interrupt_parent = props.get("interrupt-parent") - if interrupt_parent and "interrupts" in props: - phandle, = cells(interrupt_parent) - if phandle not in providers: - raise ValueError(f"{name}: interrupt provider {phandle} is absent") - provider_name, provider = providers[phandle] - compatible = provider.get("compatible", b"").split(b"\0") - if b"apple,t8103-spmi" in compatible: - specifiers = cells(props["interrupts"]) - if len(specifiers) % 2: - raise ValueError(f"{name}: malformed SPMI interrupt specifier") - for offset in range(0, len(specifiers), 2): - # spmi-apple-controller.c accepts IRQ_TYPE_EDGE_RISING only. - if specifiers[offset + 1] != 1: - raise ValueError( - f"{name}: {provider_name} supports rising-edge interrupts only" - ) - spmi_interrupts += 1 - print( - f"{path.name}: {references} DMA references within provider geometry; " - f"{spmi_interrupts} SPMI interrupt specifiers supported by the controller" - ) - - -if __name__ == "__main__": - if len(sys.argv) < 2: - raise SystemExit("usage: check-dma.py BOARD.dtb [BOARD.dtb ...]") - for argument in sys.argv[1:]: - check(pathlib.Path(argument)) From fcae20144e243ecdca6699dca9b0f213ee566ec8 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sat, 7 Nov 2026 23:02:04 +1100 Subject: [PATCH 16/20] dt-bindings: apple: reuse the APR binding and name audio bindings by generic compatible Extend the existing ProRes resource contract for the T6041 variant rather than carrying a separate SoC binding. Keep each firmware audio endpoint binding under its generic compatible name, following DT2 conventions. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../bindings/media/apple,prores.yaml | 39 ++++++++- .../bindings/media/apple,t6041-prores.yaml | 60 -------------- .../sound/apple,audio-firmware-services.yaml | 79 ------------------- .../sound/apple,audio-leap-loopback.yaml | 36 +++++++++ .../sound/apple,audio-listening-client.yaml | 31 ++++++++ .../sound/apple,audio-low-power-mic.yaml | 31 ++++++++ .../sound/apple,audio-mca-loopback.yaml | 36 +++++++++ .../sound/apple,audio-mic-buffer.yaml | 35 ++++++++ .../sound/apple,audio-mic-injection.yaml | 34 ++++++++ .../sound/apple,audio-speaker-tap.yaml | 34 ++++++++ .../sound/apple,audio-voice-trigger.yaml | 31 ++++++++ .../boot/dts/apple/t6040-peripherals.dtsi | 1 + 12 files changed, 304 insertions(+), 143 deletions(-) delete mode 100644 Documentation/devicetree/bindings/media/apple,t6041-prores.yaml delete mode 100644 Documentation/devicetree/bindings/sound/apple,audio-firmware-services.yaml create mode 100644 Documentation/devicetree/bindings/sound/apple,audio-leap-loopback.yaml create mode 100644 Documentation/devicetree/bindings/sound/apple,audio-listening-client.yaml create mode 100644 Documentation/devicetree/bindings/sound/apple,audio-low-power-mic.yaml create mode 100644 Documentation/devicetree/bindings/sound/apple,audio-mca-loopback.yaml create mode 100644 Documentation/devicetree/bindings/sound/apple,audio-mic-buffer.yaml create mode 100644 Documentation/devicetree/bindings/sound/apple,audio-mic-injection.yaml create mode 100644 Documentation/devicetree/bindings/sound/apple,audio-speaker-tap.yaml create mode 100644 Documentation/devicetree/bindings/sound/apple,audio-voice-trigger.yaml diff --git a/Documentation/devicetree/bindings/media/apple,prores.yaml b/Documentation/devicetree/bindings/media/apple,prores.yaml index 07afac17ef2ee..4124c331a9f8c 100644 --- a/Documentation/devicetree/bindings/media/apple,prores.yaml +++ b/Documentation/devicetree/bindings/media/apple,prores.yaml @@ -16,17 +16,23 @@ description: | properties: compatible: - const: apple,t8140-prores + oneOf: + - const: apple,t8140-prores + - items: + - const: apple,t6041-prores + - const: apple,prores reg: - items: - - description: Engine registers - - description: Wrapper registers + 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 @@ -58,6 +64,31 @@ required: - 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 examples: diff --git a/Documentation/devicetree/bindings/media/apple,t6041-prores.yaml b/Documentation/devicetree/bindings/media/apple,t6041-prores.yaml deleted file mode 100644 index 96ffef4dbbca4..0000000000000 --- a/Documentation/devicetree/bindings/media/apple,t6041-prores.yaml +++ /dev/null @@ -1,60 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/media/apple,t6041-prores.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Apple T6041 ProRes engine - -maintainers: - - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> - -description: | - T6041 APR engine, wrapper and auxiliary register banks. This resource - layout is distinct from the T8140 APR binding and must not select that - generation's driver. - -select: - properties: - compatible: - contains: - const: apple,t6041-prores - required: - - compatible - -properties: - compatible: - oneOf: - - items: - - const: apple,t6041-prores - - const: apple,prores - - reg: - minItems: 3 - maxItems: 3 - description: Register apertures in hardware-description order. - - interrupts: - minItems: 1 - maxItems: 1 - - power-domains: - minItems: 1 - maxItems: 1 - - iommus: - minItems: 1 - maxItems: 1 - - resets: - maxItems: 1 - -required: - - compatible - - reg - - interrupts - - power-domains - - resets - - iommus - -additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,audio-firmware-services.yaml b/Documentation/devicetree/bindings/sound/apple,audio-firmware-services.yaml deleted file mode 100644 index c205aa516a552..0000000000000 --- a/Documentation/devicetree/bindings/sound/apple,audio-firmware-services.yaml +++ /dev/null @@ -1,79 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/sound/apple,audio-firmware-services.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Apple firmware audio service endpoints - -maintainers: - - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> - -description: | - Firmware audio services published separately from the active sound card. - These endpoints identify voice-trigger, loopback, low-power microphone, - shared microphone buffer and listening clients. A service has no AP MMIO - aperture. DMA references describe ADMAC channel ownership, not permission - to reset a firmware-owned audio fabric or start an audio stream. - These endpoints remain disabled until their host client and ownership - protocol have been qualified. No acoustic tuning or buffer contents are - static hardware properties. - -properties: - compatible: - oneOf: - - items: - - const: apple,t6041-audio-leap-loopback - - const: apple,audio-leap-loopback - - items: - - const: apple,t6041-audio-listening-client - - const: apple,audio-listening-client - - items: - - const: apple,t6041-audio-low-power-mic - - const: apple,audio-low-power-mic - - items: - - const: apple,t6041-audio-mca-loopback - - const: apple,audio-mca-loopback - - items: - - const: apple,t6041-audio-mic-buffer - - const: apple,audio-mic-buffer - - items: - - const: apple,t6041-audio-voice-trigger - - const: apple,audio-voice-trigger - - items: - - const: apple,t8140-audio-leap-loopback - - const: apple,audio-leap-loopback - - items: - - const: apple,t8140-audio-listening-client - - const: apple,audio-listening-client - - items: - - const: apple,t8140-audio-low-power-mic - - const: apple,audio-low-power-mic - - items: - - const: apple,t8140-audio-mca-loopback - - const: apple,audio-mca-loopback - - items: - - const: apple,t8140-audio-mic-buffer - - const: apple,audio-mic-buffer - - items: - - const: apple,t8140-audio-mic-injection - - const: apple,audio-mic-injection - - items: - - const: apple,t8140-audio-speaker-tap - - const: apple,audio-speaker-tap - - items: - - const: apple,t8140-audio-voice-trigger - - const: apple,audio-voice-trigger - - dmas: - minItems: 1 - maxItems: 2 - - iommus: - minItems: 1 - maxItems: 2 - -required: - - compatible - -additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,audio-leap-loopback.yaml b/Documentation/devicetree/bindings/sound/apple,audio-leap-loopback.yaml new file mode 100644 index 0000000000000..50dc5c5f685b2 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/apple,audio-leap-loopback.yaml @@ -0,0 +1,36 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/apple,audio-leap-loopback.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple leap loopback firmware audio service + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Firmware audio service endpoint, separate from the active sound card. + It has no independently published AP MMIO aperture. DMA and DART + references describe the service resources, without transferring audio + fabric ownership or authorizing a stream to start. The endpoint remains + disabled until its host client and ownership protocol are qualified. + Acoustic tuning and runtime buffer contents are not static properties. + +properties: + compatible: + items: + - enum: + - apple,t6041-audio-leap-loopback + - apple,t8140-audio-leap-loopback + - const: apple,audio-leap-loopback + + dmas: + minItems: 2 + maxItems: 2 + +required: + - compatible + - dmas + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,audio-listening-client.yaml b/Documentation/devicetree/bindings/sound/apple,audio-listening-client.yaml new file mode 100644 index 0000000000000..3558bb37de1e1 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/apple,audio-listening-client.yaml @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/apple,audio-listening-client.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple listening client firmware audio service + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Firmware audio service endpoint, separate from the active sound card. + It has no independently published AP MMIO aperture. DMA and DART + references describe the service resources, without transferring audio + fabric ownership or authorizing a stream to start. The endpoint remains + disabled until its host client and ownership protocol are qualified. + Acoustic tuning and runtime buffer contents are not static properties. + +properties: + compatible: + items: + - enum: + - apple,t6041-audio-listening-client + - apple,t8140-audio-listening-client + - const: apple,audio-listening-client + +required: + - compatible + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,audio-low-power-mic.yaml b/Documentation/devicetree/bindings/sound/apple,audio-low-power-mic.yaml new file mode 100644 index 0000000000000..798fa55ff313a --- /dev/null +++ b/Documentation/devicetree/bindings/sound/apple,audio-low-power-mic.yaml @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/apple,audio-low-power-mic.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple low power mic firmware audio service + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Firmware audio service endpoint, separate from the active sound card. + It has no independently published AP MMIO aperture. DMA and DART + references describe the service resources, without transferring audio + fabric ownership or authorizing a stream to start. The endpoint remains + disabled until its host client and ownership protocol are qualified. + Acoustic tuning and runtime buffer contents are not static properties. + +properties: + compatible: + items: + - enum: + - apple,t6041-audio-low-power-mic + - apple,t8140-audio-low-power-mic + - const: apple,audio-low-power-mic + +required: + - compatible + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,audio-mca-loopback.yaml b/Documentation/devicetree/bindings/sound/apple,audio-mca-loopback.yaml new file mode 100644 index 0000000000000..beed35f018c69 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/apple,audio-mca-loopback.yaml @@ -0,0 +1,36 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/apple,audio-mca-loopback.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple mca loopback firmware audio service + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Firmware audio service endpoint, separate from the active sound card. + It has no independently published AP MMIO aperture. DMA and DART + references describe the service resources, without transferring audio + fabric ownership or authorizing a stream to start. The endpoint remains + disabled until its host client and ownership protocol are qualified. + Acoustic tuning and runtime buffer contents are not static properties. + +properties: + compatible: + items: + - enum: + - apple,t6041-audio-mca-loopback + - apple,t8140-audio-mca-loopback + - const: apple,audio-mca-loopback + + dmas: + minItems: 2 + maxItems: 2 + +required: + - compatible + - dmas + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,audio-mic-buffer.yaml b/Documentation/devicetree/bindings/sound/apple,audio-mic-buffer.yaml new file mode 100644 index 0000000000000..85350cf05fd7e --- /dev/null +++ b/Documentation/devicetree/bindings/sound/apple,audio-mic-buffer.yaml @@ -0,0 +1,35 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/apple,audio-mic-buffer.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple mic buffer firmware audio service + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Firmware audio service endpoint, separate from the active sound card. + It has no independently published AP MMIO aperture. DMA and DART + references describe the service resources, without transferring audio + fabric ownership or authorizing a stream to start. The endpoint remains + disabled until its host client and ownership protocol are qualified. + Acoustic tuning and runtime buffer contents are not static properties. + +properties: + compatible: + items: + - enum: + - apple,t6041-audio-mic-buffer + - apple,t8140-audio-mic-buffer + - const: apple,audio-mic-buffer + + iommus: + maxItems: 1 + +required: + - compatible + - iommus + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,audio-mic-injection.yaml b/Documentation/devicetree/bindings/sound/apple,audio-mic-injection.yaml new file mode 100644 index 0000000000000..d7c9713a9d241 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/apple,audio-mic-injection.yaml @@ -0,0 +1,34 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/apple,audio-mic-injection.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple mic injection firmware audio service + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Firmware audio service endpoint, separate from the active sound card. + It has no independently published AP MMIO aperture. DMA and DART + references describe the service resources, without transferring audio + fabric ownership or authorizing a stream to start. The endpoint remains + disabled until its host client and ownership protocol are qualified. + Acoustic tuning and runtime buffer contents are not static properties. + +properties: + compatible: + items: + - enum: + - apple,t8140-audio-mic-injection + - const: apple,audio-mic-injection + + dmas: + maxItems: 1 + +required: + - compatible + - dmas + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,audio-speaker-tap.yaml b/Documentation/devicetree/bindings/sound/apple,audio-speaker-tap.yaml new file mode 100644 index 0000000000000..0f42cf7ae40a0 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/apple,audio-speaker-tap.yaml @@ -0,0 +1,34 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/apple,audio-speaker-tap.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple speaker tap firmware audio service + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Firmware audio service endpoint, separate from the active sound card. + It has no independently published AP MMIO aperture. DMA and DART + references describe the service resources, without transferring audio + fabric ownership or authorizing a stream to start. The endpoint remains + disabled until its host client and ownership protocol are qualified. + Acoustic tuning and runtime buffer contents are not static properties. + +properties: + compatible: + items: + - enum: + - apple,t8140-audio-speaker-tap + - const: apple,audio-speaker-tap + + dmas: + maxItems: 1 + +required: + - compatible + - dmas + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,audio-voice-trigger.yaml b/Documentation/devicetree/bindings/sound/apple,audio-voice-trigger.yaml new file mode 100644 index 0000000000000..154839a2e053b --- /dev/null +++ b/Documentation/devicetree/bindings/sound/apple,audio-voice-trigger.yaml @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/apple,audio-voice-trigger.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple voice trigger firmware audio service + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Firmware audio service endpoint, separate from the active sound card. + It has no independently published AP MMIO aperture. DMA and DART + references describe the service resources, without transferring audio + fabric ownership or authorizing a stream to start. The endpoint remains + disabled until its host client and ownership protocol are qualified. + Acoustic tuning and runtime buffer contents are not static properties. + +properties: + compatible: + items: + - enum: + - apple,t6041-audio-voice-trigger + - apple,t8140-audio-voice-trigger + - const: apple,audio-voice-trigger + +required: + - compatible + +additionalProperties: false diff --git a/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi b/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi index 81685adca2cb9..53e986ddbf96b 100644 --- a/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi +++ b/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi @@ -178,6 +178,7 @@ reg = <0x3 0x01000000 0x0 0x4000>, <0x3 0x00000000 0x0 0x1000000>, <0x3 0x010c0000 0x0 0x4000>; + reg-names = "core", "wrapper", "aux"; interrupt-parent = <&aic>; interrupts = ; power-domains = <&ps_scodec>; From b00bf129df0c7eaa324729fe54dda0ee21978df9 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sat, 7 Nov 2026 23:17:39 +1100 Subject: [PATCH 17/20] dt-bindings: apple: use the single-entry cell-array schema form The schema checker requires only maxItems for unconstrained single-entry cell arrays. Remove redundant minItems declarations without changing their effective bounds. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- Documentation/devicetree/bindings/crypto/apple,aes.yaml | 3 --- .../devicetree/bindings/display/apple,dcp-expert.yaml | 1 - Documentation/devicetree/bindings/display/apple,dpin.yaml | 2 -- Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml | 2 -- Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml | 2 -- .../devicetree/bindings/mailbox/apple,secure-mailbox.yaml | 2 -- Documentation/devicetree/bindings/media/apple,scaler.yaml | 1 - Documentation/devicetree/bindings/soc/apple/apple,aop2.yaml | 2 -- .../devicetree/bindings/soc/apple/apple,cpu-debug.yaml | 1 - .../devicetree/bindings/soc/apple/apple,debug-dock.yaml | 1 - Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml | 3 --- Documentation/devicetree/bindings/soc/apple/apple,esm.yaml | 2 -- Documentation/devicetree/bindings/soc/apple/apple,rsm.yaml | 2 -- .../devicetree/bindings/timer/apple,aic-timebase.yaml | 1 - .../devicetree/bindings/timer/apple,secure-timebase.yaml | 1 - .../devicetree/bindings/watchdog/apple,secure-watchdog.yaml | 1 - arch/arm64/boot/dts/apple/t8140-j700.dts | 1 - 17 files changed, 28 deletions(-) diff --git a/Documentation/devicetree/bindings/crypto/apple,aes.yaml b/Documentation/devicetree/bindings/crypto/apple,aes.yaml index 516a7ae14036f..1b55625851940 100644 --- a/Documentation/devicetree/bindings/crypto/apple,aes.yaml +++ b/Documentation/devicetree/bindings/crypto/apple,aes.yaml @@ -29,15 +29,12 @@ properties: description: Register apertures in hardware-description order. interrupts: - minItems: 1 maxItems: 1 power-domains: - minItems: 1 maxItems: 1 iommus: - minItems: 1 maxItems: 1 required: diff --git a/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml b/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml index a0b34e37f6d1f..d8cb7328d7df0 100644 --- a/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml +++ b/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml @@ -30,7 +30,6 @@ properties: description: Register apertures in hardware-description order. interrupts: - minItems: 1 maxItems: 1 required: diff --git a/Documentation/devicetree/bindings/display/apple,dpin.yaml b/Documentation/devicetree/bindings/display/apple,dpin.yaml index a58aef9bb9c3c..340d078c054d1 100644 --- a/Documentation/devicetree/bindings/display/apple,dpin.yaml +++ b/Documentation/devicetree/bindings/display/apple,dpin.yaml @@ -20,12 +20,10 @@ properties: - const: apple,dpin reg: - minItems: 1 maxItems: 1 description: Register apertures in hardware-description order. interrupts: - minItems: 1 maxItems: 1 required: diff --git a/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml b/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml index 157a640a5ea32..530b4f7402804 100644 --- a/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml +++ b/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml @@ -26,11 +26,9 @@ properties: description: Register apertures in hardware-description order. interrupts: - minItems: 1 maxItems: 1 iommus: - minItems: 1 maxItems: 1 required: diff --git a/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml b/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml index 18313d789cd7b..7381a24bba808 100644 --- a/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml +++ b/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml @@ -26,11 +26,9 @@ properties: description: Register apertures in hardware-description order. interrupts: - minItems: 1 maxItems: 1 iommus: - minItems: 1 maxItems: 1 required: diff --git a/Documentation/devicetree/bindings/mailbox/apple,secure-mailbox.yaml b/Documentation/devicetree/bindings/mailbox/apple,secure-mailbox.yaml index 0bdb3a73cadc5..d9a92eefd1356 100644 --- a/Documentation/devicetree/bindings/mailbox/apple,secure-mailbox.yaml +++ b/Documentation/devicetree/bindings/mailbox/apple,secure-mailbox.yaml @@ -21,7 +21,6 @@ properties: - const: apple,secure-mailbox reg: - minItems: 1 maxItems: 1 description: Register apertures in hardware-description order. @@ -30,7 +29,6 @@ properties: maxItems: 2 iommus: - minItems: 1 maxItems: 1 required: diff --git a/Documentation/devicetree/bindings/media/apple,scaler.yaml b/Documentation/devicetree/bindings/media/apple,scaler.yaml index 62ae10462d76b..b5f2f5b0e50eb 100644 --- a/Documentation/devicetree/bindings/media/apple,scaler.yaml +++ b/Documentation/devicetree/bindings/media/apple,scaler.yaml @@ -42,7 +42,6 @@ properties: maxItems: 2 clocks: - minItems: 1 maxItems: 1 resets: diff --git a/Documentation/devicetree/bindings/soc/apple/apple,aop2.yaml b/Documentation/devicetree/bindings/soc/apple/apple,aop2.yaml index 3bb8d1a5ff384..54e5b2d87d875 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,aop2.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,aop2.yaml @@ -30,11 +30,9 @@ properties: maxItems: 4 power-domains: - minItems: 1 maxItems: 1 iommus: - minItems: 1 maxItems: 1 required: diff --git a/Documentation/devicetree/bindings/soc/apple/apple,cpu-debug.yaml b/Documentation/devicetree/bindings/soc/apple/apple,cpu-debug.yaml index 1770af2c28fc1..da180b772ad2d 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,cpu-debug.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,cpu-debug.yaml @@ -26,7 +26,6 @@ properties: description: Register apertures in hardware-description order. interrupts: - minItems: 1 maxItems: 1 required: diff --git a/Documentation/devicetree/bindings/soc/apple/apple,debug-dock.yaml b/Documentation/devicetree/bindings/soc/apple/apple,debug-dock.yaml index 836fa12906e65..ec730e0b96211 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,debug-dock.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,debug-dock.yaml @@ -20,7 +20,6 @@ properties: - const: apple,debug-dock reg: - minItems: 1 maxItems: 1 interrupts: diff --git a/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml b/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml index f6d84bf0f371c..e067b3f3665b9 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml @@ -24,16 +24,13 @@ properties: - const: apple,dwi reg: - minItems: 1 maxItems: 1 description: Register apertures in hardware-description order. interrupts: - minItems: 1 maxItems: 1 power-domains: - minItems: 1 maxItems: 1 required: diff --git a/Documentation/devicetree/bindings/soc/apple/apple,esm.yaml b/Documentation/devicetree/bindings/soc/apple/apple,esm.yaml index f9f73a9215b99..0565bb2dfdf95 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,esm.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,esm.yaml @@ -21,7 +21,6 @@ properties: - const: apple,esm reg: - minItems: 1 maxItems: 1 description: Register apertures in hardware-description order. @@ -30,7 +29,6 @@ properties: maxItems: 2 iommus: - minItems: 1 maxItems: 1 required: diff --git a/Documentation/devicetree/bindings/soc/apple/apple,rsm.yaml b/Documentation/devicetree/bindings/soc/apple/apple,rsm.yaml index 24e8e20f688a5..15e3e504b06ba 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,rsm.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,rsm.yaml @@ -25,11 +25,9 @@ properties: description: Register apertures in hardware-description order. interrupts: - minItems: 1 maxItems: 1 iommus: - minItems: 1 maxItems: 1 required: diff --git a/Documentation/devicetree/bindings/timer/apple,aic-timebase.yaml b/Documentation/devicetree/bindings/timer/apple,aic-timebase.yaml index 8e31d99e85792..19a606988c907 100644 --- a/Documentation/devicetree/bindings/timer/apple,aic-timebase.yaml +++ b/Documentation/devicetree/bindings/timer/apple,aic-timebase.yaml @@ -20,7 +20,6 @@ properties: - const: apple,aic-timebase reg: - minItems: 1 maxItems: 1 description: Register apertures in hardware-description order. diff --git a/Documentation/devicetree/bindings/timer/apple,secure-timebase.yaml b/Documentation/devicetree/bindings/timer/apple,secure-timebase.yaml index 527cf5841a6e1..e2f3489775fbd 100644 --- a/Documentation/devicetree/bindings/timer/apple,secure-timebase.yaml +++ b/Documentation/devicetree/bindings/timer/apple,secure-timebase.yaml @@ -20,7 +20,6 @@ properties: - const: apple,secure-timebase reg: - minItems: 1 maxItems: 1 description: Register apertures in hardware-description order. diff --git a/Documentation/devicetree/bindings/watchdog/apple,secure-watchdog.yaml b/Documentation/devicetree/bindings/watchdog/apple,secure-watchdog.yaml index 83e6ebc7e17ff..706d1ed52ef64 100644 --- a/Documentation/devicetree/bindings/watchdog/apple,secure-watchdog.yaml +++ b/Documentation/devicetree/bindings/watchdog/apple,secure-watchdog.yaml @@ -20,7 +20,6 @@ properties: - const: apple,secure-watchdog reg: - minItems: 1 maxItems: 1 description: Register apertures in hardware-description order. diff --git a/arch/arm64/boot/dts/apple/t8140-j700.dts b/arch/arm64/boot/dts/apple/t8140-j700.dts index 60bf9b2c84541..030b98b270cda 100644 --- a/arch/arm64/boot/dts/apple/t8140-j700.dts +++ b/arch/arm64/boot/dts/apple/t8140-j700.dts @@ -2015,4 +2015,3 @@ swclk-gpios = <&pinctrl_ap 86 GPIO_ACTIVE_HIGH>; swdio-gpios = <&pinctrl_ap 85 GPIO_ACTIVE_HIGH>; }; - From 35e0901e4881d8b932e1fa52ee2a6106b9a73d8b Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sat, 7 Nov 2026 23:19:52 +1100 Subject: [PATCH 18/20] dt-bindings: gpu: apple: allow named T8140 resources in either order T8140 resource consumers use reg-names. Accept the SGX-first order that gives the GPU its own unit address while preserving the existing ASC-first DTB interface. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../devicetree/bindings/gpu/apple,agx.yaml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/gpu/apple,agx.yaml b/Documentation/devicetree/bindings/gpu/apple,agx.yaml index 882756aa0067d..87ecebae8d5c7 100644 --- a/Documentation/devicetree/bindings/gpu/apple,agx.yaml +++ b/Documentation/devicetree/bindings/gpu/apple,agx.yaml @@ -251,13 +251,17 @@ allOf: then: properties: reg: - items: - - description: GFX coprocessor control registers - - description: GPU block MMIO registers + minItems: 2 + maxItems: 2 + description: GPU and GFX coprocessor registers, ordered by reg-names. reg-names: - items: - - const: asc - - const: sgx + oneOf: + - items: + - const: asc + - const: sgx + - items: + - const: sgx + - const: asc mboxes: items: - description: GFX coprocessor mailbox From 36f3a97e1255b2f92964fbd28334161e687edbc3 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sat, 7 Nov 2026 23:51:54 +1100 Subject: [PATCH 19/20] arm64: dts: apple: describe disabled T8140 EDAC register banks Retain the native error and event bank resources for future qualified T8140 status decoding. Reuse the generic EDAC binding with SoC-specific resource counts. Both instances remain disabled; preserve the current qualified T6041 NI register contract. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../edac/apple,soc-error-handler.yaml | 16 +++++++-- arch/arm64/boot/dts/apple/t8140.dtsi | 33 +++++++++++++++++-- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml b/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml index 71053bd3841a5..157b0f836b1e3 100644 --- a/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml +++ b/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml @@ -35,10 +35,13 @@ properties: maxItems: 89 reg: - minItems: 25 + minItems: 10 maxItems: 25 description: | - T6041 per-source NI0 through NI6 status apertures, in interrupt order. + T6041 uses the qualified per-source NI status apertures in interrupt + order. T8140 publishes its native error/event register banks in + hardware-description order; their presence does not establish safe + AP access and the instances remain disabled until qualified. required: - compatible @@ -55,6 +58,9 @@ allOf: interrupts: minItems: 89 maxItems: 89 + reg: + minItems: 25 + maxItems: 25 required: - reg - if: @@ -67,6 +73,9 @@ allOf: interrupts: minItems: 26 maxItems: 26 + reg: + minItems: 17 + maxItems: 17 - if: properties: compatible: @@ -87,6 +96,9 @@ allOf: interrupts: minItems: 9 maxItems: 9 + reg: + minItems: 10 + maxItems: 10 additionalProperties: false diff --git a/arch/arm64/boot/dts/apple/t8140.dtsi b/arch/arm64/boot/dts/apple/t8140.dtsi index fbe4314221cff..b98c374805216 100644 --- a/arch/arm64/boot/dts/apple/t8140.dtsi +++ b/arch/arm64/boot/dts/apple/t8140.dtsi @@ -474,8 +474,26 @@ }; }; - error-handler { + error-handler@220000000 { compatible = "apple,t8140-error-handler", "apple,soc-error-handler"; + /* ADT /arm-io/error-handler banks; firmware/AP access is unqualified. */ + reg = <0x2 0x20000000 0x0 0x2f000000>, + <0x2 0x80d00000 0x0 0x40000>, + <0x2 0x80900000 0x0 0x8000>, + <0x3 0x00000000 0x0 0x70000>, + <0x3 0x00728000 0x0 0x4000>, + <0x3 0x082dc000 0x0 0x18000>, + <0x3 0x003d0000 0x0 0x4000>, + <0x3 0x00768000 0x0 0x4000>, + <0x3 0x02000000 0x0 0x1000000>, + <0x2 0x4f000000 0x0 0x4000>, + <0x2 0x50000000 0x0 0x4000>, + <0x2 0x51000000 0x0 0x4000>, + <0x2 0x52000000 0x0 0x4000>, + <0x2 0x5f000000 0x0 0x4000>, + <0x2 0x6f000000 0x0 0x4000>, + <0x2 0x5300a000 0x0 0x9a4>, + <0x2 0x54000000 0x0 0x20000>; interrupt-parent = <&aic>; interrupts = , , @@ -507,8 +525,19 @@ status = "disabled"; }; - event-log-handler { + event-log-handler@300700000 { compatible = "apple,t8140-event-log", "apple,soc-event-log"; + /* ADT /arm-io/event-log-handler banks; firmware/AP access is unqualified. */ + reg = <0x3 0x00700000 0x0 0xcc000>, + <0x3 0x08280000 0x0 0x80000>, + <0x3 0x00000000 0x0 0x70000>, + <0x3 0x08200000 0x0 0x7c000>, + <0x3 0x0028c000 0x0 0x4000>, + <0x3 0x00280000 0x0 0x8000>, + <0x4 0x01878000 0x0 0x4000>, + <0x4 0x01868000 0x0 0x8000>, + <0x3 0x02800000 0x0 0xbc000>, + <0x3 0x02900000 0x0 0x4000>; interrupt-parent = <&aic>; interrupts = , , From c3927c878145967185cab992601453f901a140dc Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 00:27:42 +1100 Subject: [PATCH 20/20] arm64: dts: apple: place new MMIO devices on the SoC bus Preserve the established GPU path, named-resource order and loader reservation forms. Put new physical resource descriptors under /soc. Waive unqualified native firmware objects instead of representing them as root platform devices, and remove their unused bindings. Keep routed existing interfaces and the real ADMAC pair-count correction. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../bindings/clock/apple,nco-service.yaml | 41 --- .../bindings/display/apple,dcp-expert.yaml | 40 --- .../display/apple,dcp-ioreporting.yaml | 27 -- .../display/apple,sac-controller.yaml | 33 -- .../display/apple,secure-display-pipe.yaml | 36 -- .../devicetree/bindings/gpu/apple,agx.yaml | 16 +- .../media/apple,isp-service-proxy.yaml | 26 -- .../bindings/soc/apple/apple,debug-port.yaml | 38 --- .../soc/apple/apple,hid-transport-mux.yaml | 29 -- .../soc/apple/apple,processor-trace.yaml | 29 -- .../bindings/soc/apple/apple,sac-manager.yaml | 29 -- .../soc/apple/apple,wireless-debug-dock.yaml | 26 -- .../sound/apple,audio-dart-proxy.yaml | 31 -- .../sound/apple,audio-leap-loopback.yaml | 36 -- .../sound/apple,audio-listening-client.yaml | 31 -- .../sound/apple,audio-low-power-mic.yaml | 31 -- .../sound/apple,audio-mca-loopback.yaml | 36 -- .../sound/apple,audio-mic-buffer.yaml | 35 -- .../sound/apple,audio-mic-injection.yaml | 34 -- .../bindings/sound/apple,audio-mic-proxy.yaml | 26 -- .../sound/apple,audio-speaker-tap.yaml | 34 -- .../sound/apple,audio-voice-trigger.yaml | 31 -- .../bindings/sound/apple,smc-mogul.yaml | 37 -- .../bindings/sound/apple,t6030-dpaudio.yaml | 22 +- .../apple/t6040-j616s-extdisp-mem-loader.dtsi | 12 +- arch/arm64/boot/dts/apple/t6040-j616s.dts | 4 - .../boot/dts/apple/t6040-peripherals.dtsi | 150 +-------- .../arm64/boot/dts/apple/t604x-j614-j616.dtsi | 12 +- arch/arm64/boot/dts/apple/t604x.dtsi | 3 + arch/arm64/boot/dts/apple/t8140-j700.dts | 5 - .../boot/dts/apple/t8140-peripherals.dtsi | 318 +++++------------- arch/arm64/boot/dts/apple/t8140.dtsi | 97 +----- 32 files changed, 125 insertions(+), 1230 deletions(-) delete mode 100644 Documentation/devicetree/bindings/clock/apple,nco-service.yaml delete mode 100644 Documentation/devicetree/bindings/display/apple,dcp-expert.yaml delete mode 100644 Documentation/devicetree/bindings/display/apple,dcp-ioreporting.yaml delete mode 100644 Documentation/devicetree/bindings/display/apple,sac-controller.yaml delete mode 100644 Documentation/devicetree/bindings/display/apple,secure-display-pipe.yaml delete mode 100644 Documentation/devicetree/bindings/media/apple,isp-service-proxy.yaml delete mode 100644 Documentation/devicetree/bindings/soc/apple/apple,debug-port.yaml delete mode 100644 Documentation/devicetree/bindings/soc/apple/apple,hid-transport-mux.yaml delete mode 100644 Documentation/devicetree/bindings/soc/apple/apple,processor-trace.yaml delete mode 100644 Documentation/devicetree/bindings/soc/apple/apple,sac-manager.yaml delete mode 100644 Documentation/devicetree/bindings/soc/apple/apple,wireless-debug-dock.yaml delete mode 100644 Documentation/devicetree/bindings/sound/apple,audio-dart-proxy.yaml delete mode 100644 Documentation/devicetree/bindings/sound/apple,audio-leap-loopback.yaml delete mode 100644 Documentation/devicetree/bindings/sound/apple,audio-listening-client.yaml delete mode 100644 Documentation/devicetree/bindings/sound/apple,audio-low-power-mic.yaml delete mode 100644 Documentation/devicetree/bindings/sound/apple,audio-mca-loopback.yaml delete mode 100644 Documentation/devicetree/bindings/sound/apple,audio-mic-buffer.yaml delete mode 100644 Documentation/devicetree/bindings/sound/apple,audio-mic-injection.yaml delete mode 100644 Documentation/devicetree/bindings/sound/apple,audio-mic-proxy.yaml delete mode 100644 Documentation/devicetree/bindings/sound/apple,audio-speaker-tap.yaml delete mode 100644 Documentation/devicetree/bindings/sound/apple,audio-voice-trigger.yaml delete mode 100644 Documentation/devicetree/bindings/sound/apple,smc-mogul.yaml diff --git a/Documentation/devicetree/bindings/clock/apple,nco-service.yaml b/Documentation/devicetree/bindings/clock/apple,nco-service.yaml deleted file mode 100644 index 78c553ce9b7bf..0000000000000 --- a/Documentation/devicetree/bindings/clock/apple,nco-service.yaml +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/clock/apple,nco-service.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Apple firmware NCO clock service - -maintainers: - - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> - -description: | - Firmware-managed numerically controlled oscillator service. Unlike the - directly programmed NCO binding, no AP register window is published. - The selectors identify clocks in the PMGR clock namespace. Their - firmware service association is preserved without assuming a direct - AP-programmable NCO input/output clock topology. - -properties: - compatible: - oneOf: - - items: - - const: apple,t8140-nco-service - - const: apple,nco-service - - apple,clock-controller: - $ref: /schemas/types.yaml#/definitions/phandle - description: Provider defining the SoC hardware clock selector namespace. - - apple,clock-selectors: - $ref: /schemas/types.yaml#/definitions/uint32-array - minItems: 4 - maxItems: 4 - description: Clock selectors published for this firmware NCO service. - -required: - - compatible - - apple,clock-controller - - apple,clock-selectors - -additionalProperties: false diff --git a/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml b/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml deleted file mode 100644 index d8cb7328d7df0..0000000000000 --- a/Documentation/devicetree/bindings/display/apple,dcp-expert.yaml +++ /dev/null @@ -1,40 +0,0 @@ -# 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. - -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 - -additionalProperties: false diff --git a/Documentation/devicetree/bindings/display/apple,dcp-ioreporting.yaml b/Documentation/devicetree/bindings/display/apple,dcp-ioreporting.yaml deleted file mode 100644 index 009c1df8f082d..0000000000000 --- a/Documentation/devicetree/bindings/display/apple,dcp-ioreporting.yaml +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/display/apple,dcp-ioreporting.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Apple secure display reporting service - -maintainers: - - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> - -description: | - Secure display coprocessor reporting endpoint. It is a firmware service - without an independently published AP MMIO window or interrupt. A host - client must establish the reporting transport and its lifecycle before - using it; the service is not an additional display engine. - -properties: - compatible: - items: - - const: apple,t8140-dcp-ioreporting - - const: apple,dcp-ioreporting - -required: - - compatible - -additionalProperties: false diff --git a/Documentation/devicetree/bindings/display/apple,sac-controller.yaml b/Documentation/devicetree/bindings/display/apple,sac-controller.yaml deleted file mode 100644 index b2c2770fb5f2f..0000000000000 --- a/Documentation/devicetree/bindings/display/apple,sac-controller.yaml +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/display/apple,sac-controller.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Apple display SAC controller - -maintainers: - - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> - -description: | - Display SAC firmware controller associated with the SAC manager. - -properties: - compatible: - oneOf: - - items: - - const: apple,t6041-sac-controller - - const: apple,sac-controller - - items: - - const: apple,t8140-sac-controller - - const: apple,sac-controller - - apple,manager: - $ref: /schemas/types.yaml#/definitions/phandle - description: Firmware SAC manager. - -required: - - compatible - - apple,manager - -additionalProperties: false diff --git a/Documentation/devicetree/bindings/display/apple,secure-display-pipe.yaml b/Documentation/devicetree/bindings/display/apple,secure-display-pipe.yaml deleted file mode 100644 index 8ec1c0ef71480..0000000000000 --- a/Documentation/devicetree/bindings/display/apple,secure-display-pipe.yaml +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/display/apple,secure-display-pipe.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Apple secure display pipeline - -maintainers: - - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> - -description: | - Secure display pipeline firmware endpoint, its interrupts and DART - streams. Firmware retains control of the display registers. - -properties: - compatible: - oneOf: - - items: - - const: apple,t8140-secure-display-pipe - - const: apple,secure-display-pipe - - interrupts: - minItems: 4 - maxItems: 4 - - iommus: - minItems: 2 - maxItems: 2 - -required: - - compatible - - interrupts - - iommus - -additionalProperties: false diff --git a/Documentation/devicetree/bindings/gpu/apple,agx.yaml b/Documentation/devicetree/bindings/gpu/apple,agx.yaml index 87ecebae8d5c7..882756aa0067d 100644 --- a/Documentation/devicetree/bindings/gpu/apple,agx.yaml +++ b/Documentation/devicetree/bindings/gpu/apple,agx.yaml @@ -251,17 +251,13 @@ allOf: then: properties: reg: - minItems: 2 - maxItems: 2 - description: GPU and GFX coprocessor registers, ordered by reg-names. + items: + - description: GFX coprocessor control registers + - description: GPU block MMIO registers reg-names: - oneOf: - - items: - - const: asc - - const: sgx - - items: - - const: sgx - - const: asc + items: + - const: asc + - const: sgx mboxes: items: - description: GFX coprocessor mailbox diff --git a/Documentation/devicetree/bindings/media/apple,isp-service-proxy.yaml b/Documentation/devicetree/bindings/media/apple,isp-service-proxy.yaml deleted file mode 100644 index 217e3933f6868..0000000000000 --- a/Documentation/devicetree/bindings/media/apple,isp-service-proxy.yaml +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/media/apple,isp-service-proxy.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Apple image processor firmware service proxy - -maintainers: - - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> - -description: | - Image processor secure firmware service endpoint. This is separate - from the AP image processor and has no AP register window. - -properties: - compatible: - oneOf: - - items: - - const: apple,t8140-isp-service-proxy - - const: apple,isp-service-proxy - -required: - - compatible - -additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,debug-port.yaml b/Documentation/devicetree/bindings/soc/apple/apple,debug-port.yaml deleted file mode 100644 index 549ad92ccaf14..0000000000000 --- a/Documentation/devicetree/bindings/soc/apple/apple,debug-port.yaml +++ /dev/null @@ -1,38 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/soc/apple/apple,debug-port.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Apple auxiliary on-chip debug port - -maintainers: - - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> - -description: | - Auxiliary on-chip debug port. Firmware describes the port separately - from the processor debug MMIO apertures. Pin ownership and the debug - transport must be established before this endpoint is used. - -properties: - compatible: - oneOf: - - items: - - const: apple,t6041-debug-port - - const: apple,debug-port - - items: - - const: apple,t8140-debug-port - - const: apple,debug-port - - swclk-gpios: - maxItems: 1 - description: Serial wire clock pin. - - swdio-gpios: - maxItems: 1 - description: Bidirectional serial wire data pin. - -required: - - compatible - -additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,hid-transport-mux.yaml b/Documentation/devicetree/bindings/soc/apple/apple,hid-transport-mux.yaml deleted file mode 100644 index ae444f86cd0c0..0000000000000 --- a/Documentation/devicetree/bindings/soc/apple/apple,hid-transport-mux.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/soc/apple/apple,hid-transport-mux.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Apple HID transport multiplexer - -maintainers: - - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> - -description: | - Firmware HID transport multiplexer between the MTP and AOP services. - The hardware description provides no independent register aperture. - -properties: - compatible: - oneOf: - - items: - - const: apple,t6041-hid-transport-mux - - const: apple,hid-transport-mux - - items: - - const: apple,t8140-hid-transport-mux - - const: apple,hid-transport-mux - -required: - - compatible - -additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,processor-trace.yaml b/Documentation/devicetree/bindings/soc/apple/apple,processor-trace.yaml deleted file mode 100644 index 6207bfbe14d0b..0000000000000 --- a/Documentation/devicetree/bindings/soc/apple/apple,processor-trace.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/soc/apple/apple,processor-trace.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Apple processor trace service - -maintainers: - - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> - -description: | - Processor trace service. The hardware description provides no AP MMIO - register aperture; a driver must establish its firmware transport. - -properties: - compatible: - oneOf: - - items: - - const: apple,t6041-processor-trace - - const: apple,processor-trace - - items: - - const: apple,t8140-processor-trace - - const: apple,processor-trace - -required: - - compatible - -additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,sac-manager.yaml b/Documentation/devicetree/bindings/soc/apple/apple,sac-manager.yaml deleted file mode 100644 index 3e6a309f0a694..0000000000000 --- a/Documentation/devicetree/bindings/soc/apple/apple,sac-manager.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/soc/apple/apple,sac-manager.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Apple display SAC manager - -maintainers: - - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> - -description: | - Firmware display SAC manager. It has no independent register aperture - in the hardware description. - -properties: - compatible: - oneOf: - - items: - - const: apple,t6041-sac-manager - - const: apple,sac-manager - - items: - - const: apple,t8140-sac-manager - - const: apple,sac-manager - -required: - - compatible - -additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,wireless-debug-dock.yaml b/Documentation/devicetree/bindings/soc/apple/apple,wireless-debug-dock.yaml deleted file mode 100644 index beee156b0b223..0000000000000 --- a/Documentation/devicetree/bindings/soc/apple/apple,wireless-debug-dock.yaml +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/soc/apple/apple,wireless-debug-dock.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Apple wireless debug dock endpoint - -maintainers: - - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> - -description: | - Wireless debug dock firmware endpoint. It does not describe a second - wireless radio or transfer ownership of the existing radio. - -properties: - compatible: - oneOf: - - items: - - const: apple,t8140-wireless-debug-dock - - const: apple,wireless-debug-dock - -required: - - compatible - -additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,audio-dart-proxy.yaml b/Documentation/devicetree/bindings/sound/apple,audio-dart-proxy.yaml deleted file mode 100644 index 96a0e4a2892fc..0000000000000 --- a/Documentation/devicetree/bindings/sound/apple,audio-dart-proxy.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/sound/apple,audio-dart-proxy.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Apple isolated audio DART service proxy - -maintainers: - - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> - -description: | - Isolated audio firmware endpoint and its DART streams. The firmware - retains ownership of the stream mappings at boot. - -properties: - compatible: - oneOf: - - items: - - const: apple,t8140-audio-dart-proxy - - const: apple,audio-dart-proxy - - iommus: - minItems: 2 - maxItems: 2 - -required: - - compatible - - iommus - -additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,audio-leap-loopback.yaml b/Documentation/devicetree/bindings/sound/apple,audio-leap-loopback.yaml deleted file mode 100644 index 50dc5c5f685b2..0000000000000 --- a/Documentation/devicetree/bindings/sound/apple,audio-leap-loopback.yaml +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/sound/apple,audio-leap-loopback.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Apple leap loopback firmware audio service - -maintainers: - - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> - -description: | - Firmware audio service endpoint, separate from the active sound card. - It has no independently published AP MMIO aperture. DMA and DART - references describe the service resources, without transferring audio - fabric ownership or authorizing a stream to start. The endpoint remains - disabled until its host client and ownership protocol are qualified. - Acoustic tuning and runtime buffer contents are not static properties. - -properties: - compatible: - items: - - enum: - - apple,t6041-audio-leap-loopback - - apple,t8140-audio-leap-loopback - - const: apple,audio-leap-loopback - - dmas: - minItems: 2 - maxItems: 2 - -required: - - compatible - - dmas - -additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,audio-listening-client.yaml b/Documentation/devicetree/bindings/sound/apple,audio-listening-client.yaml deleted file mode 100644 index 3558bb37de1e1..0000000000000 --- a/Documentation/devicetree/bindings/sound/apple,audio-listening-client.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/sound/apple,audio-listening-client.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Apple listening client firmware audio service - -maintainers: - - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> - -description: | - Firmware audio service endpoint, separate from the active sound card. - It has no independently published AP MMIO aperture. DMA and DART - references describe the service resources, without transferring audio - fabric ownership or authorizing a stream to start. The endpoint remains - disabled until its host client and ownership protocol are qualified. - Acoustic tuning and runtime buffer contents are not static properties. - -properties: - compatible: - items: - - enum: - - apple,t6041-audio-listening-client - - apple,t8140-audio-listening-client - - const: apple,audio-listening-client - -required: - - compatible - -additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,audio-low-power-mic.yaml b/Documentation/devicetree/bindings/sound/apple,audio-low-power-mic.yaml deleted file mode 100644 index 798fa55ff313a..0000000000000 --- a/Documentation/devicetree/bindings/sound/apple,audio-low-power-mic.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/sound/apple,audio-low-power-mic.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Apple low power mic firmware audio service - -maintainers: - - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> - -description: | - Firmware audio service endpoint, separate from the active sound card. - It has no independently published AP MMIO aperture. DMA and DART - references describe the service resources, without transferring audio - fabric ownership or authorizing a stream to start. The endpoint remains - disabled until its host client and ownership protocol are qualified. - Acoustic tuning and runtime buffer contents are not static properties. - -properties: - compatible: - items: - - enum: - - apple,t6041-audio-low-power-mic - - apple,t8140-audio-low-power-mic - - const: apple,audio-low-power-mic - -required: - - compatible - -additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,audio-mca-loopback.yaml b/Documentation/devicetree/bindings/sound/apple,audio-mca-loopback.yaml deleted file mode 100644 index beed35f018c69..0000000000000 --- a/Documentation/devicetree/bindings/sound/apple,audio-mca-loopback.yaml +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/sound/apple,audio-mca-loopback.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Apple mca loopback firmware audio service - -maintainers: - - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> - -description: | - Firmware audio service endpoint, separate from the active sound card. - It has no independently published AP MMIO aperture. DMA and DART - references describe the service resources, without transferring audio - fabric ownership or authorizing a stream to start. The endpoint remains - disabled until its host client and ownership protocol are qualified. - Acoustic tuning and runtime buffer contents are not static properties. - -properties: - compatible: - items: - - enum: - - apple,t6041-audio-mca-loopback - - apple,t8140-audio-mca-loopback - - const: apple,audio-mca-loopback - - dmas: - minItems: 2 - maxItems: 2 - -required: - - compatible - - dmas - -additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,audio-mic-buffer.yaml b/Documentation/devicetree/bindings/sound/apple,audio-mic-buffer.yaml deleted file mode 100644 index 85350cf05fd7e..0000000000000 --- a/Documentation/devicetree/bindings/sound/apple,audio-mic-buffer.yaml +++ /dev/null @@ -1,35 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/sound/apple,audio-mic-buffer.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Apple mic buffer firmware audio service - -maintainers: - - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> - -description: | - Firmware audio service endpoint, separate from the active sound card. - It has no independently published AP MMIO aperture. DMA and DART - references describe the service resources, without transferring audio - fabric ownership or authorizing a stream to start. The endpoint remains - disabled until its host client and ownership protocol are qualified. - Acoustic tuning and runtime buffer contents are not static properties. - -properties: - compatible: - items: - - enum: - - apple,t6041-audio-mic-buffer - - apple,t8140-audio-mic-buffer - - const: apple,audio-mic-buffer - - iommus: - maxItems: 1 - -required: - - compatible - - iommus - -additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,audio-mic-injection.yaml b/Documentation/devicetree/bindings/sound/apple,audio-mic-injection.yaml deleted file mode 100644 index d7c9713a9d241..0000000000000 --- a/Documentation/devicetree/bindings/sound/apple,audio-mic-injection.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/sound/apple,audio-mic-injection.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Apple mic injection firmware audio service - -maintainers: - - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> - -description: | - Firmware audio service endpoint, separate from the active sound card. - It has no independently published AP MMIO aperture. DMA and DART - references describe the service resources, without transferring audio - fabric ownership or authorizing a stream to start. The endpoint remains - disabled until its host client and ownership protocol are qualified. - Acoustic tuning and runtime buffer contents are not static properties. - -properties: - compatible: - items: - - enum: - - apple,t8140-audio-mic-injection - - const: apple,audio-mic-injection - - dmas: - maxItems: 1 - -required: - - compatible - - dmas - -additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,audio-mic-proxy.yaml b/Documentation/devicetree/bindings/sound/apple,audio-mic-proxy.yaml deleted file mode 100644 index 6bc04371a4420..0000000000000 --- a/Documentation/devicetree/bindings/sound/apple,audio-mic-proxy.yaml +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/sound/apple,audio-mic-proxy.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Apple isolated microphone service proxy - -maintainers: - - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> - -description: | - Isolated microphone firmware endpoint. Buffer geometry and calibration - are runtime data and are not static hardware resources. - -properties: - compatible: - oneOf: - - items: - - const: apple,t8140-audio-mic-proxy - - const: apple,audio-mic-proxy - -required: - - compatible - -additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,audio-speaker-tap.yaml b/Documentation/devicetree/bindings/sound/apple,audio-speaker-tap.yaml deleted file mode 100644 index 0f42cf7ae40a0..0000000000000 --- a/Documentation/devicetree/bindings/sound/apple,audio-speaker-tap.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/sound/apple,audio-speaker-tap.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Apple speaker tap firmware audio service - -maintainers: - - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> - -description: | - Firmware audio service endpoint, separate from the active sound card. - It has no independently published AP MMIO aperture. DMA and DART - references describe the service resources, without transferring audio - fabric ownership or authorizing a stream to start. The endpoint remains - disabled until its host client and ownership protocol are qualified. - Acoustic tuning and runtime buffer contents are not static properties. - -properties: - compatible: - items: - - enum: - - apple,t8140-audio-speaker-tap - - const: apple,audio-speaker-tap - - dmas: - maxItems: 1 - -required: - - compatible - - dmas - -additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,audio-voice-trigger.yaml b/Documentation/devicetree/bindings/sound/apple,audio-voice-trigger.yaml deleted file mode 100644 index 154839a2e053b..0000000000000 --- a/Documentation/devicetree/bindings/sound/apple,audio-voice-trigger.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/sound/apple,audio-voice-trigger.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Apple voice trigger firmware audio service - -maintainers: - - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> - -description: | - Firmware audio service endpoint, separate from the active sound card. - It has no independently published AP MMIO aperture. DMA and DART - references describe the service resources, without transferring audio - fabric ownership or authorizing a stream to start. The endpoint remains - disabled until its host client and ownership protocol are qualified. - Acoustic tuning and runtime buffer contents are not static properties. - -properties: - compatible: - items: - - enum: - - apple,t6041-audio-voice-trigger - - apple,t8140-audio-voice-trigger - - const: apple,audio-voice-trigger - -required: - - compatible - -additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,smc-mogul.yaml b/Documentation/devicetree/bindings/sound/apple,smc-mogul.yaml deleted file mode 100644 index 1e628186118ac..0000000000000 --- a/Documentation/devicetree/bindings/sound/apple,smc-mogul.yaml +++ /dev/null @@ -1,37 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/sound/apple,smc-mogul.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Apple SMC Mogul control endpoint - -maintainers: - - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> - -description: | - Mogul control endpoint published below the SMC firmware node. Its - control address belongs to the SMC-mediated peripheral namespace and - must not be interpreted as an AP physical address. - -properties: - compatible: - items: - - enum: - - apple,t8140-smc-mogul - - const: apple,smc-mogul - - apple,smc: - $ref: /schemas/types.yaml#/definitions/phandle - description: SMC firmware transport provider. - - apple,control-address: - $ref: /schemas/types.yaml#/definitions/uint32 - description: Peripheral address in the SMC-mediated control namespace. - -required: - - compatible - - apple,smc - - apple,control-address - -additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/apple,t6030-dpaudio.yaml b/Documentation/devicetree/bindings/sound/apple,t6030-dpaudio.yaml index 1ae364f691740..b511202f35c7e 100644 --- a/Documentation/devicetree/bindings/sound/apple,t6030-dpaudio.yaml +++ b/Documentation/devicetree/bindings/sound/apple,t6030-dpaudio.yaml @@ -4,7 +4,7 @@ $id: http://devicetree.org/schemas/sound/apple,t6030-dpaudio.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Apple T6030, T6041 and T8140 DisplayPort audio +title: Apple T6030 and T6041 DisplayPort audio maintainers: - Ryan Murray @@ -15,10 +15,7 @@ description: | Samples arrive through SIO, and the graph connects this interface to port 0 of the display processor that owns the audio service. - Unrouted interfaces can be described disabled without inventing an audio - connection to a display processor. A route is required before enabling. - - T6041 and T8140 interfaces remain disabled until a generation-specific SIO firmware + T6041 interfaces remain disabled until a generation-specific SIO firmware backend and loader handoff are available and display audio is qualified. select: @@ -28,7 +25,6 @@ select: enum: - apple,t6030-dpaudio - apple,t6041-dpaudio - - apple,t8140-dpaudio required: - compatible @@ -38,7 +34,6 @@ properties: - enum: - apple,t6030-dpaudio - apple,t6041-dpaudio - - apple,t8140-dpaudio - const: apple,dpaudio dmas: @@ -64,17 +59,6 @@ required: - dmas - dma-names - power-domains - -allOf: - - if: - not: - properties: - status: - const: disabled - required: - - status - then: - required: - - ports + - ports additionalProperties: false diff --git a/arch/arm64/boot/dts/apple/t6040-j616s-extdisp-mem-loader.dtsi b/arch/arm64/boot/dts/apple/t6040-j616s-extdisp-mem-loader.dtsi index 53f8e1fbc9482..08d4768494634 100644 --- a/arch/arm64/boot/dts/apple/t6040-j616s-extdisp-mem-loader.dtsi +++ b/arch/arm64/boot/dts/apple/t6040-j616s-extdisp-mem-loader.dtsi @@ -17,42 +17,42 @@ / { reserved-memory { - dcpext0_text: dcpext0-text@0 { + dcpext0_text: dcpext0-text { compatible = "apple,asc-mem"; reg = <0x0 0x0 0x0 0x4000>; no-map; status = "disabled"; }; - dcpext0_data: dcpext0-data@0 { + dcpext0_data: dcpext0-data { compatible = "apple,asc-mem"; reg = <0x0 0x0 0x0 0x4000>; no-map; status = "disabled"; }; - dcpext0_heap: dcpext0-heap@0 { + dcpext0_heap: dcpext0-heap { compatible = "apple,asc-mem"; reg = <0x0 0x0 0x0 0x4000>; no-map; status = "disabled"; }; - dcpext1_text: dcpext1-text@0 { + dcpext1_text: dcpext1-text { compatible = "apple,asc-mem"; reg = <0x0 0x0 0x0 0x4000>; no-map; status = "disabled"; }; - dcpext1_data: dcpext1-data@0 { + dcpext1_data: dcpext1-data { compatible = "apple,asc-mem"; reg = <0x0 0x0 0x0 0x4000>; no-map; status = "disabled"; }; - dcpext1_heap: dcpext1-heap@0 { + dcpext1_heap: dcpext1-heap { compatible = "apple,asc-mem"; reg = <0x0 0x0 0x0 0x4000>; no-map; diff --git a/arch/arm64/boot/dts/apple/t6040-j616s.dts b/arch/arm64/boot/dts/apple/t6040-j616s.dts index c362061e506df..32f589aa2971f 100644 --- a/arch/arm64/boot/dts/apple/t6040-j616s.dts +++ b/arch/arm64/boot/dts/apple/t6040-j616s.dts @@ -105,10 +105,6 @@ status = "okay"; }; -&debug_port2 { - swclk-gpios = <&pinctrl 42 GPIO_ACTIVE_HIGH>; - swdio-gpios = <&pinctrl 43 GPIO_ACTIVE_HIGH>; -}; &i2c4 { sd_card_control: card-control@20 { diff --git a/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi b/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi index 53e986ddbf96b..3cddc40aac79a 100644 --- a/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi +++ b/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi @@ -6,7 +6,16 @@ */ / { + soc: soc { + compatible = "simple-bus"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + nonposted-mmio; + }; +}; +&soc { /* ADT /arm-io/dwi. */ dwi: dwi@5029b0000 { compatible = "apple,t6041-dwi", "apple,dwi"; @@ -241,38 +250,8 @@ status = "disabled"; }; - /* ADT /arm-io/dcp0-expert. */ - dcp_expert: display-expert@4023a8050 { - compatible = "apple,t6041-dcp-expert", "apple,dcp-expert"; - reg = <0x4 0x023a8050 0x0 0x4>, - <0x4 0x02374000 0x0 0x40>, - <0x4 0x02370000 0x0 0x40>; - interrupt-parent = <&aic>; - interrupts = ; - status = "disabled"; - }; - /* ADT /arm-io/dcpext0-expert. */ - dcpext0_expert: display-expert@3a23a8050 { - compatible = "apple,t6041-dcp-expert", "apple,dcp-expert"; - reg = <0x3 0xa23a8050 0x0 0x4>, - <0x3 0xa2374000 0x0 0x40>, - <0x3 0xa2370000 0x0 0x40>; - interrupt-parent = <&aic>; - interrupts = ; - status = "disabled"; - }; - /* ADT /arm-io/dcpext1-expert. */ - dcpext1_expert: display-expert@6023a8050 { - compatible = "apple,t6041-dcp-expert", "apple,dcp-expert"; - reg = <0x6 0x023a8050 0x0 0x4>, - <0x6 0x02374000 0x0 0x40>, - <0x6 0x02370000 0x0 0x40>; - interrupt-parent = <&aic>; - interrupts = ; - status = "disabled"; - }; /* Clock IDs are SoC hardware selectors, not ADT phandles. */ peripheral_clocks: clock-controller@502800000 { @@ -347,42 +326,6 @@ }; }; - -/ { - - /* ADT /arm-io/mtp-aop-mux; no qualified host transport/ownership contract. */ - hid_mux: hid-transport-mux { - compatible = "apple,t6041-hid-transport-mux", "apple,hid-transport-mux"; - status = "disabled"; - }; - - /* ADT /arm-io/apple-processor-trace; no qualified host transport/ownership contract. */ - processor_trace: processor-trace { - compatible = "apple,t6041-processor-trace", "apple,processor-trace"; - status = "disabled"; - }; - - /* ADT /arm-io/aod2; no qualified host transport/ownership contract. */ - debug_port2: debug-port-2 { - compatible = "apple,t6041-debug-port", "apple,debug-port"; - status = "disabled"; - }; - - /* ADT /sacm; no qualified host transport/ownership contract. */ - sac_manager: sac-manager { - compatible = "apple,t6041-sac-manager", "apple,sac-manager"; - status = "disabled"; - }; - - /* ADT /arm-io/dcp0-sac-controller; no qualified host transport/ownership contract. */ - sac_controller: sac-controller { - compatible = "apple,t6041-sac-controller", "apple,sac-controller"; - apple,manager = <&sac_manager>; - status = "disabled"; - }; -}; - - &aon_ptd { interrupt-controller; #interrupt-cells = <1>; @@ -406,78 +349,3 @@ status = "disabled"; }; }; - -/* Register-less DP audio interfaces: ADT DMA channels and PMGR gates. */ -/ { - - dpaudio0: audio-controller-0 { - compatible = "apple,t6041-dpaudio", "apple,dpaudio"; - dmas = <&sio 0x64>; - dma-names = "tx"; - power-domains = <&ps_dpa0>; - /* No qualified firmware audio route is assigned at boot. */ - status = "disabled"; - }; - - dpaudio3: audio-controller-3 { - compatible = "apple,t6041-dpaudio", "apple,dpaudio"; - dmas = <&sio 0x6a>; - dma-names = "tx"; - power-domains = <&ps_dpa3>; - /* No qualified firmware audio route is assigned at boot. */ - status = "disabled"; - }; - - dpaudio4: audio-controller-4 { - compatible = "apple,t6041-dpaudio", "apple,dpaudio"; - dmas = <&sio 0x6c>; - dma-names = "tx"; - power-domains = <&ps_dpa4>; - /* No qualified firmware audio route is assigned at boot. */ - status = "disabled"; - }; -}; - - -/* Firmware audio endpoints with no qualified independent host client. */ -/ { - - /* ADT /arm-io/iop-voicetrigger-controller/audio-vt-device. */ - audio_voice_trigger: audio-voice-trigger { - compatible = "apple,t6041-audio-voice-trigger", "apple,audio-voice-trigger"; - status = "disabled"; - }; - - /* ADT /arm-io/iop-audio-controller/audio-mca-loopback. */ - audio_mca_loopback: audio-mca-loopback { - compatible = "apple,t6041-audio-mca-loopback", "apple,audio-mca-loopback"; - dmas = <&admac1 6>, <&admac1 7>; - status = "disabled"; - }; - - /* ADT /arm-io/iop-audio-controller/audio-leap-internal-loopback. */ - audio_leap_loopback: audio-leap-loopback { - compatible = "apple,t6041-audio-leap-loopback", "apple,audio-leap-loopback"; - dmas = <&admac0 8>, <&admac0 9>; - status = "disabled"; - }; - - /* ADT /arm-io/iop-audio-controller/lp-mic-device. */ - audio_low_power_mic: audio-low-power-mic { - compatible = "apple,t6041-audio-low-power-mic", "apple,audio-low-power-mic"; - status = "disabled"; - }; - - /* ADT /arm-io/iop-audio-controller/lp-mic-io-buffer-device. */ - audio_mic_buffer: audio-mic-buffer { - compatible = "apple,t6041-audio-mic-buffer", "apple,audio-mic-buffer"; - iommus = <&aop_dart 8>; - status = "disabled"; - }; - - /* ADT /arm-io/iop-audio-controller/siri-listening-device. */ - audio_listening_client: audio-listening-client { - compatible = "apple,t6041-audio-listening-client", "apple,audio-listening-client"; - status = "disabled"; - }; -}; diff --git a/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi b/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi index 7e8f9950c4afb..2c4e9d8cec2bc 100644 --- a/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi +++ b/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi @@ -108,7 +108,7 @@ * segment-ranges[0]); the driver identifies the build from it. */ gpu_fw_text: gpu-fw-text { - size = <0 0>; /* The loader adds reg before enabling this region. */ + reg = <0 0 0 0>; status = "disabled"; no-map; }; @@ -118,7 +118,7 @@ * places its crash log here. */ gpu_fw_data: gpu-fw-data { - size = <0 0>; /* The loader adds reg before enabling this region. */ + reg = <0 0 0 0>; status = "disabled"; no-map; }; @@ -129,25 +129,25 @@ * the boot loader adds them to /memory. */ uat_ttbs: uat-ttbs { - size = <0 0>; /* The loader adds reg before enabling this region. */ + reg = <0 0 0 0>; status = "disabled"; no-map; }; uat_pagetables: uat-pagetables { - size = <0 0>; /* The loader adds reg before enabling this region. */ + reg = <0 0 0 0>; status = "disabled"; no-map; }; uat_l2_pagetables: uat-l2-pagetables { - size = <0 0>; /* The loader adds reg before enabling this region. */ + reg = <0 0 0 0>; status = "disabled"; no-map; }; uat_handoff: uat-handoff { - size = <0 0>; /* The loader adds reg before enabling this region. */ + reg = <0 0 0 0>; status = "disabled"; no-map; }; diff --git a/arch/arm64/boot/dts/apple/t604x.dtsi b/arch/arm64/boot/dts/apple/t604x.dtsi index dea79511112a3..091adfdfda6df 100644 --- a/arch/arm64/boot/dts/apple/t604x.dtsi +++ b/arch/arm64/boot/dts/apple/t604x.dtsi @@ -915,6 +915,9 @@ iommus = <&dcp_dart 23>; apple,bw-scratch = <&pmgr_dcp 0 4 0x20000>; apple,iomfb-surfaces = <1 1 0 0>; + /* the boot loader describes the piodma's regions with 2+2 cells */ + #address-cells = <2>; + #size-cells = <2>; /* enabled once the boot loader has handed the display over */ status = "disabled"; diff --git a/arch/arm64/boot/dts/apple/t8140-j700.dts b/arch/arm64/boot/dts/apple/t8140-j700.dts index 7cdbf633dbf3f..5841470c3c28d 100644 --- a/arch/arm64/boot/dts/apple/t8140-j700.dts +++ b/arch/arm64/boot/dts/apple/t8140-j700.dts @@ -2029,8 +2029,3 @@ &ane_dart2 { status = "okay"; }; - -&debug_port4 { - swclk-gpios = <&pinctrl_ap 86 GPIO_ACTIVE_HIGH>; - swdio-gpios = <&pinctrl_ap 85 GPIO_ACTIVE_HIGH>; -}; diff --git a/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi b/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi index 6a00fc2f4ad69..5198e90c72d52 100644 --- a/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi +++ b/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi @@ -5,7 +5,83 @@ * ownership from firmware or make their registers safe to access. */ -/ { +&soc { + error-handler@220000000 { + compatible = "apple,t8140-error-handler", "apple,soc-error-handler"; + /* ADT /arm-io/error-handler banks; firmware/AP access is unqualified. */ + reg = <0x2 0x20000000 0x0 0x2f000000>, + <0x2 0x80d00000 0x0 0x40000>, + <0x2 0x80900000 0x0 0x8000>, + <0x3 0x00000000 0x0 0x70000>, + <0x3 0x00728000 0x0 0x4000>, + <0x3 0x082dc000 0x0 0x18000>, + <0x3 0x003d0000 0x0 0x4000>, + <0x3 0x00768000 0x0 0x4000>, + <0x3 0x02000000 0x0 0x1000000>, + <0x2 0x4f000000 0x0 0x4000>, + <0x2 0x50000000 0x0 0x4000>, + <0x2 0x51000000 0x0 0x4000>, + <0x2 0x52000000 0x0 0x4000>, + <0x2 0x5f000000 0x0 0x4000>, + <0x2 0x6f000000 0x0 0x4000>, + <0x2 0x5300a000 0x0 0x9a4>, + <0x2 0x54000000 0x0 0x20000>; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + /* Not yet qualified on the J700. */ + status = "disabled"; + }; + event-log-handler@300700000 { + compatible = "apple,t8140-event-log", "apple,soc-event-log"; + /* ADT /arm-io/event-log-handler banks; firmware/AP access is unqualified. */ + reg = <0x3 0x00700000 0x0 0xcc000>, + <0x3 0x08280000 0x0 0x80000>, + <0x3 0x00000000 0x0 0x70000>, + <0x3 0x08200000 0x0 0x7c000>, + <0x3 0x0028c000 0x0 0x4000>, + <0x3 0x00280000 0x0 0x8000>, + <0x4 0x01878000 0x0 0x4000>, + <0x4 0x01868000 0x0 0x8000>, + <0x3 0x02800000 0x0 0xbc000>, + <0x3 0x02900000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + , + , + , + , + ; + /* Not yet qualified on the J700. */ + status = "disabled"; + }; /* ADT /arm-io/dwi. */ dwi: dwi@300200000 { @@ -154,48 +230,6 @@ status = "disabled"; }; - /* ADT /arm-io/dcp0-expert. */ - /* ADT /arm-io/dcp-exclave-ioreporting. */ - dcp_ioreporting: dcp-ioreporting { - compatible = "apple,t8140-dcp-ioreporting", "apple,dcp-ioreporting"; - status = "disabled"; - }; - - /* ADT /arm-io/dcp0-expert. */ - dcp_expert: display-expert@3082b8044 { - compatible = "apple,t8140-dcp-expert", "apple,dcp-expert"; - reg = <0x3 0x082b8044 0x0 0xc>, - <0x3 0x08008000 0x0 0x4>, - <0x4 0x123ac050 0x0 0x4>, - <0x4 0x12370000 0x0 0x40>, - <0x4 0x12384000 0x0 0x40>, - <0x4 0x12378000 0x0 0x40>, - <0x4 0x1237c000 0x0 0x40>, - <0x4 0x12380000 0x0 0x40>, - <0x4 0x12374000 0x0 0x40>, - <0x4 0x123b8000 0x0 0x40>, - <0x4 0x1239c000 0x0 0x40>, - <0x4 0x123a0000 0x0 0x40>, - <0x4 0x12388000 0x0 0x40>, - <0x4 0x1238c000 0x0 0x40>, - <0x4 0x12394000 0x0 0x40>, - <0x4 0x12398000 0x0 0x40>, - <0x4 0x12390000 0x0 0x40>; - interrupt-parent = <&aic>; - interrupts = ; - status = "disabled"; - }; - - /* ADT /arm-io/dcpext-expert. */ - dcpext_expert: display-expert@4163ac050 { - compatible = "apple,t8140-dcp-expert", "apple,dcp-expert"; - reg = <0x4 0x163ac050 0x0 0x4>, - <0x4 0x16370000 0x0 0x40>, - <0x4 0x16374000 0x0 0x40>; - interrupt-parent = <&aic>; - interrupts = ; - status = "disabled"; - }; /* ADT /arm-io/dcp-exclave-mailbox. */ dcp_secure_mbox: mailbox@452e7c000 { @@ -292,9 +326,6 @@ apple,pmgr = <&pmgr>; status = "disabled"; }; -}; - -/ { /* ADT /arm-io/aop-gpio; coprocessor/firmware ownership unqualified. */ pinctrl_aop: pinctrl@310824000 { @@ -479,97 +510,6 @@ power-domains = <&ps_sio_cpu>; status = "disabled"; }; -}; - -/ { - - /* ADT /arm-io/mtp-aop-mux; no qualified host transport/ownership contract. */ - hid_mux: hid-transport-mux { - compatible = "apple,t8140-hid-transport-mux", "apple,hid-transport-mux"; - status = "disabled"; - }; - - /* ADT /arm-io/apple-processor-trace; no qualified host transport/ownership contract. */ - processor_trace: processor-trace { - compatible = "apple,t8140-processor-trace", "apple,processor-trace"; - status = "disabled"; - }; - - /* ADT /arm-io/aod2; no qualified host transport/ownership contract. */ - debug_port2: debug-port-2 { - compatible = "apple,t8140-debug-port", "apple,debug-port"; - status = "disabled"; - }; - - /* ADT /arm-io/aod3; no qualified host transport/ownership contract. */ - debug_port3: debug-port-3 { - compatible = "apple,t8140-debug-port", "apple,debug-port"; - status = "disabled"; - }; - - /* ADT /arm-io/aod4; no qualified host transport/ownership contract. */ - debug_port4: debug-port-4 { - compatible = "apple,t8140-debug-port", "apple,debug-port"; - status = "disabled"; - }; - - /* ADT /sacm; no qualified host transport/ownership contract. */ - sac_manager: sac-manager { - compatible = "apple,t8140-sac-manager", "apple,sac-manager"; - status = "disabled"; - }; - - /* ADT /arm-io/dcp-sac-controller; no qualified host transport/ownership contract. */ - sac_controller: sac-controller { - compatible = "apple,t8140-sac-controller", "apple,sac-controller"; - apple,manager = <&sac_manager>; - status = "disabled"; - }; - - /* ADT /arm-io/nco; no qualified host transport/ownership contract. */ - nco_service: nco-service { - compatible = "apple,t8140-nco-service", "apple,nco-service"; - apple,clock-controller = <&peripheral_clocks>; - apple,clock-selectors = <377 378 375 376>; - status = "disabled"; - }; - - /* ADT /arm-io/exdisplaypipe; no qualified host transport/ownership contract. */ - secure_display_pipe: secure-display-pipe { - compatible = "apple,t8140-secure-display-pipe", "apple,secure-display-pipe"; - interrupt-parent = <&aic>; - interrupts = , - , - , - ; - iommus = <&disp0_dart 3>, <&disp0_dart 4>; - status = "disabled"; - }; - - /* ADT /arm-io/isp-exclave-proxy; no qualified host transport/ownership contract. */ - isp_service_proxy: isp-service-proxy { - compatible = "apple,t8140-isp-service-proxy", "apple,isp-service-proxy"; - status = "disabled"; - }; - - /* ADT /arm-io/audio-hp-mic-proxy; no qualified host transport/ownership contract. */ - audio_mic_proxy: audio-mic-proxy { - compatible = "apple,t8140-audio-mic-proxy", "apple,audio-mic-proxy"; - status = "disabled"; - }; - - /* ADT /arm-io/audio-shared-dart-proxy; no qualified host transport/ownership contract. */ - audio_dart_proxy: audio-dart-proxy { - compatible = "apple,t8140-audio-dart-proxy", "apple,audio-dart-proxy"; - iommus = <&aop_dart 9>, <&aop_dart 11>; - status = "disabled"; - }; - - /* ADT /dock-debug-wireless; no qualified host transport/ownership contract. */ - wireless_debug_dock: wireless-debug-dock { - compatible = "apple,t8140-wireless-debug-dock", "apple,wireless-debug-dock"; - status = "disabled"; - }; /* ADT /dock-connect; no qualified host transport/ownership contract. */ debug_dock: debug-dock@3082d8008 { @@ -580,9 +520,7 @@ ; status = "disabled"; }; -}; -/ { /* ADT /arm-io/eic named MMIO apertures are absolute addresses. */ eic: secure-controller@340700000 { compatible = "apple,t8140-eic", "apple,eic"; @@ -595,6 +533,13 @@ reg-names = "ps", "wd-isp", "gpio", "fpwm", "gltb", "wd-e"; status = "disabled"; }; + + xspmi_controller: spmi-proxy-controller@348614000 { + compatible = "apple,t8140-xspmi-controller", "apple,xspmi-controller"; + reg = <0x3 0x48614000 0x0 0x4000>; + apple,response-vector = <256>; + status = "disabled"; + }; }; &aon_ptd { @@ -627,98 +572,3 @@ status = "disabled"; }; }; - -/ { - xspmi_controller: spmi-proxy-controller@348614000 { - compatible = "apple,t8140-xspmi-controller", "apple,xspmi-controller"; - reg = <0x3 0x48614000 0x0 0x4000>; - apple,response-vector = <256>; - status = "disabled"; - }; - - smc_mogul: smc-mogul { - compatible = "apple,t8140-smc-mogul", "apple,smc-mogul"; - apple,smc = <&smc>; - apple,control-address = <0x10>; - status = "disabled"; - }; -}; - -/* Register-less DP audio interfaces: ADT DMA channels and PMGR gates. */ -/ { - - dpaudio0: audio-controller-0 { - compatible = "apple,t8140-dpaudio", "apple,dpaudio"; - dmas = <&sio 0x64>; - dma-names = "tx"; - power-domains = <&ps_dpa0>; - /* No qualified firmware audio route is assigned at boot. */ - status = "disabled"; - }; - - dpaudio1: audio-controller-1 { - compatible = "apple,t8140-dpaudio", "apple,dpaudio"; - dmas = <&sio 0x66>; - dma-names = "tx"; - power-domains = <&ps_dpa1>; - /* No qualified firmware audio route is assigned at boot. */ - status = "disabled"; - }; -}; - -/* Firmware audio endpoints with no qualified independent host client. */ -/ { - - /* ADT /arm-io/iop-voicetrigger-controller/audio-vt-device. */ - audio_voice_trigger: audio-voice-trigger { - compatible = "apple,t8140-audio-voice-trigger", "apple,audio-voice-trigger"; - status = "disabled"; - }; - - /* ADT /arm-io/iop-audio-controller/audio-mca-loopback. */ - audio_mca_loopback: audio-mca-loopback { - compatible = "apple,t8140-audio-mca-loopback", "apple,audio-mca-loopback"; - dmas = <&admac_base_ns 6>, <&admac_base_ns 7>; - status = "disabled"; - }; - - /* ADT /arm-io/iop-audio-controller/audio-leap-internal-loopback. */ - audio_leap_loopback: audio-leap-loopback { - compatible = "apple,t8140-audio-leap-loopback", "apple,audio-leap-loopback"; - dmas = <&admac_leap_ns 8>, <&admac_leap_ns 9>; - status = "disabled"; - }; - - /* ADT /arm-io/iop-audio-controller/lp-mic-device. */ - audio_low_power_mic: audio-low-power-mic { - compatible = "apple,t8140-audio-low-power-mic", "apple,audio-low-power-mic"; - status = "disabled"; - }; - - /* ADT /arm-io/iop-audio-controller/lp-mic-io-buffer-device. */ - audio_mic_buffer: audio-mic-buffer { - compatible = "apple,t8140-audio-mic-buffer", "apple,audio-mic-buffer"; - iommus = <&aop_dart 9>; - status = "disabled"; - }; - - /* ADT /arm-io/iop-audio-controller/siri-listening-device. */ - audio_listening_client: audio-listening-client { - compatible = "apple,t8140-audio-listening-client", "apple,audio-listening-client"; - status = "disabled"; - }; - - /* ADT /arm-io/iop-audio-controller/audio-speaker-tap. */ - audio_speaker_tap: audio-speaker-tap { - compatible = "apple,t8140-audio-speaker-tap", "apple,audio-speaker-tap"; - dmas = <&admac_base_ns 3>; - status = "disabled"; - }; - - /* ADT /arm-io/iop-audio-controller/lp-mic-injection-device. */ - audio_mic_injection: audio-mic-injection { - compatible = "apple,t8140-audio-mic-injection", "apple,audio-mic-injection"; - dmas = <&admac_base_ns 10>; - status = "disabled"; - }; -}; diff --git a/arch/arm64/boot/dts/apple/t8140.dtsi b/arch/arm64/boot/dts/apple/t8140.dtsi index b98c374805216..dbe9bd0d4e59c 100644 --- a/arch/arm64/boot/dts/apple/t8140.dtsi +++ b/arch/arm64/boot/dts/apple/t8140.dtsi @@ -430,8 +430,7 @@ ranges; uat_handoff: uat-handoff { - size = <0 0>; /* The loader supplies reg and enables the region. */ - status = "disabled"; + reg = <0 0 0 0>; }; /* @@ -459,98 +458,18 @@ /* Only reserved: the GPU node does not reference it */ uat_l2_pagetables: uat-l2-pagetables { - size = <0 0>; /* The loader supplies reg and enables the region. */ - status = "disabled"; + reg = <0 0 0 0>; }; uat_pagetables: uat-pagetables { - size = <0 0>; /* The loader supplies reg and enables the region. */ - status = "disabled"; + reg = <0 0 0 0>; }; uat_ttbs: uat-ttbs { - size = <0 0>; /* The loader supplies reg and enables the region. */ - status = "disabled"; + reg = <0 0 0 0>; }; }; - error-handler@220000000 { - compatible = "apple,t8140-error-handler", "apple,soc-error-handler"; - /* ADT /arm-io/error-handler banks; firmware/AP access is unqualified. */ - reg = <0x2 0x20000000 0x0 0x2f000000>, - <0x2 0x80d00000 0x0 0x40000>, - <0x2 0x80900000 0x0 0x8000>, - <0x3 0x00000000 0x0 0x70000>, - <0x3 0x00728000 0x0 0x4000>, - <0x3 0x082dc000 0x0 0x18000>, - <0x3 0x003d0000 0x0 0x4000>, - <0x3 0x00768000 0x0 0x4000>, - <0x3 0x02000000 0x0 0x1000000>, - <0x2 0x4f000000 0x0 0x4000>, - <0x2 0x50000000 0x0 0x4000>, - <0x2 0x51000000 0x0 0x4000>, - <0x2 0x52000000 0x0 0x4000>, - <0x2 0x5f000000 0x0 0x4000>, - <0x2 0x6f000000 0x0 0x4000>, - <0x2 0x5300a000 0x0 0x9a4>, - <0x2 0x54000000 0x0 0x20000>; - interrupt-parent = <&aic>; - interrupts = , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - ; - /* Not yet qualified on the J700. */ - status = "disabled"; - }; - - event-log-handler@300700000 { - compatible = "apple,t8140-event-log", "apple,soc-event-log"; - /* ADT /arm-io/event-log-handler banks; firmware/AP access is unqualified. */ - reg = <0x3 0x00700000 0x0 0xcc000>, - <0x3 0x08280000 0x0 0x80000>, - <0x3 0x00000000 0x0 0x70000>, - <0x3 0x08200000 0x0 0x7c000>, - <0x3 0x0028c000 0x0 0x4000>, - <0x3 0x00280000 0x0 0x8000>, - <0x4 0x01878000 0x0 0x4000>, - <0x4 0x01868000 0x0 0x8000>, - <0x3 0x02800000 0x0 0xbc000>, - <0x3 0x02900000 0x0 0x4000>; - interrupt-parent = <&aic>; - interrupts = , - , - , - , - , - , - , - , - ; - /* Not yet qualified on the J700. */ - status = "disabled"; - }; soc: soc { compatible = "simple-bus"; @@ -1377,11 +1296,11 @@ status = "disabled"; }; - gpu: gpu@480000000 { + gpu: gpu@482600000 { compatible = "apple,agx-t8140"; - reg = <0x4 0x80000000 0x0 0x4000000>, - <0x4 0x82600000 0x0 0x88000>; - reg-names = "sgx", "asc"; + reg = <0x4 0x82600000 0x0 0x88000>, + <0x4 0x80000000 0x0 0x4000000>; + reg-names = "asc", "sgx"; mboxes = <&gfx_mbox>, <&gfx1_mbox>; power-domains = <&ps_gfx>; memory-region = <&uat_ttbs>, <&uat_pagetables>,