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..71e74f7d59a83 --- /dev/null +++ b/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml @@ -0,0 +1,68 @@ +# 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 + + reg: + description: PMGR control apertures in hardware-description order. + minItems: 44 + maxItems: 63 + + '#clock-cells': + const: 1 + + apple,pmgr: + $ref: /schemas/types.yaml#/definitions/phandle + description: Primary PMGR syscon. Additional control banks are described by reg. + +required: + - reg + - compatible + - '#clock-cells' + - apple,pmgr + +allOf: + - if: + properties: + compatible: + contains: + const: apple,t6041-pmgr-clocks + then: + properties: + reg: + minItems: 63 + maxItems: 63 + - if: + properties: + compatible: + contains: + const: apple,t8140-pmgr-clocks + then: + properties: + reg: + minItems: 44 + maxItems: 44 + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/crypto/apple,aes.yaml b/Documentation/devicetree/bindings/crypto/apple,aes.yaml new file mode 100644 index 0000000000000..1b55625851940 --- /dev/null +++ b/Documentation/devicetree/bindings/crypto/apple,aes.yaml @@ -0,0 +1,47 @@ +# 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: + maxItems: 1 + + power-domains: + maxItems: 1 + + iommus: + maxItems: 1 + +required: + - compatible + - reg + - interrupts + - power-domains + - iommus + +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..340d078c054d1 --- /dev/null +++ b/Documentation/devicetree/bindings/display/apple,dpin.yaml @@ -0,0 +1,34 @@ +# 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: + maxItems: 1 + description: Register apertures in hardware-description order. + + interrupts: + maxItems: 1 + +required: + - compatible + - reg + - interrupts + +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..846fcecfb86d3 --- /dev/null +++ b/Documentation/devicetree/bindings/display/bridge/parade,dp855.yaml @@ -0,0 +1,44 @@ +# 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 + + 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 + +unevaluatedProperties: 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/dma/apple,pcie-piodma.yaml b/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml new file mode 100644 index 0000000000000..530b4f7402804 --- /dev/null +++ b/Documentation/devicetree/bindings/dma/apple,pcie-piodma.yaml @@ -0,0 +1,40 @@ +# 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: + maxItems: 1 + + iommus: + 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..7381a24bba808 --- /dev/null +++ b/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml @@ -0,0 +1,40 @@ +# 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: + maxItems: 1 + + iommus: + 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..5a6e7e84cd469 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: 3 + maxItems: 3 + else: + properties: + reg: + maxItems: 1 properties: compatible: @@ -29,12 +43,22 @@ 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: 3 + description: | + Coprocessor control registers. T8140 also publishes an auxiliary ASC + window and the remaining ASC registers after the mailbox window. + The mailbox registers are described by the mailbox provider. + + clocks: + minItems: 1 + maxItems: 3 '#dma-cells': const: 1 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/Documentation/devicetree/bindings/mailbox/apple,secure-mailbox.yaml b/Documentation/devicetree/bindings/mailbox/apple,secure-mailbox.yaml new file mode 100644 index 0000000000000..d9a92eefd1356 --- /dev/null +++ b/Documentation/devicetree/bindings/mailbox/apple,secure-mailbox.yaml @@ -0,0 +1,40 @@ +# 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: + maxItems: 1 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 2 + maxItems: 2 + + iommus: + 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,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,scaler.yaml b/Documentation/devicetree/bindings/media/apple,scaler.yaml new file mode 100644 index 0000000000000..b5f2f5b0e50eb --- /dev/null +++ b/Documentation/devicetree/bindings/media/apple,scaler.yaml @@ -0,0 +1,59 @@ +# 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: + maxItems: 1 + + resets: + maxItems: 1 + +required: + - compatible + - reg + - interrupts + - power-domains + - resets + - iommus + - clocks + +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,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,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/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/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..13dec59b733fc --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,aon-ptd.yaml @@ -0,0 +1,51 @@ +# 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 + + 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,aop2.yaml b/Documentation/devicetree/bindings/soc/apple/apple,aop2.yaml new file mode 100644 index 0000000000000..54e5b2d87d875 --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,aop2.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,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: + maxItems: 1 + + iommus: + 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..da180b772ad2d --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,cpu-debug.yaml @@ -0,0 +1,36 @@ +# 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: + maxItems: 1 + +required: + - compatible + - reg + - interrupts + +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..ec730e0b96211 --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,debug-dock.yaml @@ -0,0 +1,34 @@ +# 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: + maxItems: 1 + + interrupts: + minItems: 2 + maxItems: 2 + +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..e067b3f3665b9 --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,dwi.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,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: + maxItems: 1 + description: Register apertures in hardware-description order. + + interrupts: + maxItems: 1 + + power-domains: + maxItems: 1 + +required: + - compatible + - reg + - interrupts + - power-domains + +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,esm.yaml b/Documentation/devicetree/bindings/soc/apple/apple,esm.yaml new file mode 100644 index 0000000000000..0565bb2dfdf95 --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,esm.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,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: + maxItems: 1 + description: Register apertures in hardware-description order. + + interrupts: + minItems: 2 + maxItems: 2 + + iommus: + 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..15e3e504b06ba --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,rsm.yaml @@ -0,0 +1,39 @@ +# 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: + maxItems: 1 + + iommus: + maxItems: 1 + +required: + - compatible + - reg + - interrupts + - iommus + +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..23de22e476d5d --- /dev/null +++ b/Documentation/devicetree/bindings/soc/apple/apple,xspmi-controller.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,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 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: + items: + - enum: + - apple,t8140-xspmi-controller + - const: apple,xspmi-controller + + reg: + maxItems: 1 + + apple,response-vector: + $ref: /schemas/types.yaml#/definitions/uint32 + description: Local response vector of the firmware transport. + +required: + - compatible + - reg + - apple,response-vector + +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..19a606988c907 --- /dev/null +++ b/Documentation/devicetree/bindings/timer/apple,aic-timebase.yaml @@ -0,0 +1,30 @@ +# 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: + 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..e2f3489775fbd --- /dev/null +++ b/Documentation/devicetree/bindings/timer/apple,secure-timebase.yaml @@ -0,0 +1,30 @@ +# 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: + 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..706d1ed52ef64 --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/apple,secure-watchdog.yaml @@ -0,0 +1,30 @@ +# 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: + maxItems: 1 + description: Register apertures in hardware-description order. + +required: + - compatible + - reg + +additionalProperties: false diff --git a/arch/arm64/boot/dts/apple/t6040-j616s.dts b/arch/arm64/boot/dts/apple/t6040-j616s.dts index 2dcc62fb617c0..32f589aa2971f 100644 --- a/arch/arm64/boot/dts/apple/t6040-j616s.dts +++ b/arch/arm64/boot/dts/apple/t6040-j616s.dts @@ -104,3 +104,52 @@ &jpeg1 { status = "okay"; }; + + +&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"; + + /* 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 new file mode 100644 index 0000000000000..3cddc40aac79a --- /dev/null +++ b/arch/arm64/boot/dts/apple/t6040-peripherals.dtsi @@ -0,0 +1,351 @@ +// 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. + */ + +/ { + 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"; + 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>; + resets = <&ps_msr0>; + 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>; + reg-names = "core", "wrapper", "aux"; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_scodec>; + iommus = <&apr0_dart 1>; + resets = <&ps_scodec>; + 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"; + }; + + + + + /* Clock IDs are SoC hardware selectors, not ADT phandles. */ + 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"; + }; +}; + +&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/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..5198e90c72d52 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8140-peripherals.dtsi @@ -0,0 +1,574 @@ +// 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. + */ + +&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 { + 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>; + resets = <&ps_msr>; + 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/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/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@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"; + }; + + /* 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"; + /* 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>; + 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"; + }; + + /* 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"; + }; + + 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 { + 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_EDGE_RISING>; + 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"; + }; +}; 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 157ac016325fe..dbe9bd0d4e59c 100644 --- a/arch/arm64/boot/dts/apple/t8140.dtsi +++ b/arch/arm64/boot/dts/apple/t8140.dtsi @@ -470,54 +470,6 @@ }; }; - error-handler { - compatible = "apple,t8140-error-handler", "apple,soc-error-handler"; - interrupt-parent = <&aic>; - interrupts = , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - ; - /* Not yet qualified on the J700. */ - status = "disabled"; - }; - - event-log-handler { - compatible = "apple,t8140-event-log", "apple,soc-event-log"; - interrupt-parent = <&aic>; - interrupts = , - , - , - , - , - , - , - , - ; - /* Not yet qualified on the J700. */ - status = "disabled"; - }; soc: soc { compatible = "simple-bus"; @@ -1816,7 +1768,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>; @@ -1836,7 +1789,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>; @@ -2050,6 +2004,7 @@ }; #include "t8140-pmgr.dtsi" +#include "t8140-peripherals.dtsi" /* * DRAM interface class: width and maximum rate are inferred from topology