From 5417d5ba6953a448b4d0b57cdf6e29ae1b8c1ce1 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 01:33:47 +1100 Subject: [PATCH 1/6] arm64: dts: apple: describe dormant T8103 hardware resources Describe codec, crypto, clock, thermal and board control resources while retaining firmware ownership. Every new endpoint remains disabled. Reuse the integrated generic bindings; omit firmware-only services and diagnostic CPU views. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../bindings/clock/apple,pmgr-clocks.yaml | 19 +- .../devicetree/bindings/crypto/apple,aes.yaml | 43 +- .../bindings/display/apple,dpin.yaml | 6 + .../bindings/dma/apple,pciec-piodma.yaml | 6 + .../edac/apple,soc-error-handler.yaml | 153 +++- .../bindings/iommu/apple,ave-dma.yaml | 47 + .../devicetree/bindings/media/apple,jpeg.yaml | 21 +- .../bindings/media/apple,scaler.yaml | 35 +- .../bindings/media/apple,t8140-ave.yaml | 36 +- .../bindings/net/apple,aqc107-i2c.yaml | 32 + .../bindings/nvmem/apple,spmi-nvmem.yaml | 1 + .../devicetree/bindings/phy/apple,atcrt.yaml | 31 + .../devicetree/bindings/pwm/apple,pwm.yaml | 48 ++ .../bindings/soc/apple/apple,dockchannel.yaml | 31 +- .../bindings/soc/apple/apple,dwi.yaml | 6 + .../bindings/soc/apple/apple,pmp.yaml | 43 +- .../bindings/soc/apple/apple,t8140-mcc.yaml | 7 +- .../thermal/apple,die-temperature-sensor.yaml | 62 ++ .../bindings/timer/apple,aic-timebase.yaml | 6 + .../boot/dts/apple/t8103-j274-control.dtsi | 10 + arch/arm64/boot/dts/apple/t8103-j274.dts | 2 + .../boot/dts/apple/t8103-j293-control.dtsi | 31 + arch/arm64/boot/dts/apple/t8103-j293.dts | 2 + .../boot/dts/apple/t8103-j313-control.dtsi | 24 + arch/arm64/boot/dts/apple/t8103-j313.dts | 2 + .../boot/dts/apple/t8103-j456-control.dtsi | 10 + arch/arm64/boot/dts/apple/t8103-j456.dts | 2 + .../boot/dts/apple/t8103-j457-control.dtsi | 10 + arch/arm64/boot/dts/apple/t8103-j457.dts | 2 + .../boot/dts/apple/t8103-peripherals.dtsi | 813 ++++++++++++++++++ arch/arm64/boot/dts/apple/t8103.dtsi | 2 + 31 files changed, 1497 insertions(+), 46 deletions(-) create mode 100644 Documentation/devicetree/bindings/iommu/apple,ave-dma.yaml create mode 100644 Documentation/devicetree/bindings/net/apple,aqc107-i2c.yaml create mode 100644 Documentation/devicetree/bindings/phy/apple,atcrt.yaml create mode 100644 Documentation/devicetree/bindings/pwm/apple,pwm.yaml create mode 100644 Documentation/devicetree/bindings/thermal/apple,die-temperature-sensor.yaml create mode 100644 arch/arm64/boot/dts/apple/t8103-j274-control.dtsi create mode 100644 arch/arm64/boot/dts/apple/t8103-j293-control.dtsi create mode 100644 arch/arm64/boot/dts/apple/t8103-j313-control.dtsi create mode 100644 arch/arm64/boot/dts/apple/t8103-j456-control.dtsi create mode 100644 arch/arm64/boot/dts/apple/t8103-j457-control.dtsi create mode 100644 arch/arm64/boot/dts/apple/t8103-peripherals.dtsi diff --git a/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml b/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml index 71e74f7d59a83..4b824f33d4928 100644 --- a/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml +++ b/Documentation/devicetree/bindings/clock/apple,pmgr-clocks.yaml @@ -16,14 +16,23 @@ description: | 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. + Selectors are scoped by the referenced PMGR; a dual-die platform has + one provider per die. properties: compatible: - items: - - enum: - - apple,t6041-pmgr-clocks - - apple,t8140-pmgr-clocks - - const: apple,pmgr-clocks + oneOf: + - items: + - enum: + - apple,t6041-pmgr-clocks + - apple,t8140-pmgr-clocks + - const: apple,pmgr-clocks + - items: + - const: apple,t8103-pmgr-clocks + - const: apple,pmgr-clocks + - items: + - const: apple,t6000-pmgr-clocks + - const: apple,pmgr-clocks reg: description: PMGR control apertures in hardware-description order. diff --git a/Documentation/devicetree/bindings/crypto/apple,aes.yaml b/Documentation/devicetree/bindings/crypto/apple,aes.yaml index 1b55625851940..9c097d77fb32d 100644 --- a/Documentation/devicetree/bindings/crypto/apple,aes.yaml +++ b/Documentation/devicetree/bindings/crypto/apple,aes.yaml @@ -11,7 +11,8 @@ maintainers: description: | AES hardware attached to the SIO DART. The register banks are the - engine, shared control and auxiliary control windows, in that order. + engine and shared control windows, with a third auxiliary window on + newer variants. T6000 uses both SIO translation banks for the same stream. properties: compatible: @@ -22,11 +23,16 @@ properties: - items: - const: apple,t8140-aes - const: apple,aes + - items: + - const: apple,t8103-aes + - const: apple,aes + - items: + - const: apple,t6000-aes + - const: apple,aes reg: - minItems: 3 + minItems: 2 maxItems: 3 - description: Register apertures in hardware-description order. interrupts: maxItems: 1 @@ -35,7 +41,8 @@ properties: maxItems: 1 iommus: - maxItems: 1 + minItems: 1 + maxItems: 2 required: - compatible @@ -44,4 +51,32 @@ required: - power-domains - iommus +allOf: + - if: + properties: + compatible: + contains: + enum: ["apple,t8103-aes", "apple,t6000-aes"] + then: + properties: + reg: + maxItems: 2 + else: + properties: + reg: + minItems: 3 + - if: + properties: + compatible: + contains: + const: apple,t6000-aes + then: + properties: + iommus: + minItems: 2 + else: + properties: + iommus: + maxItems: 1 + additionalProperties: false diff --git a/Documentation/devicetree/bindings/display/apple,dpin.yaml b/Documentation/devicetree/bindings/display/apple,dpin.yaml index 340d078c054d1..bbe5c90cd8965 100644 --- a/Documentation/devicetree/bindings/display/apple,dpin.yaml +++ b/Documentation/devicetree/bindings/display/apple,dpin.yaml @@ -18,6 +18,12 @@ properties: - items: - const: apple,t6041-dpin - const: apple,dpin + - items: + - const: apple,t8103-dpin + - const: apple,dpin + - items: + - const: apple,t6000-dpin + - const: apple,dpin reg: maxItems: 1 diff --git a/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml b/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml index 7381a24bba808..dfff7c7b5eb12 100644 --- a/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml +++ b/Documentation/devicetree/bindings/dma/apple,pciec-piodma.yaml @@ -19,6 +19,12 @@ properties: - items: - const: apple,t6041-pciec-piodma - const: apple,pciec-piodma + - items: + - const: apple,t8103-pciec-piodma + - const: apple,pciec-piodma + - items: + - const: apple,t6000-pciec-piodma + - const: apple,pciec-piodma reg: minItems: 4 diff --git a/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml b/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml index 157b0f836b1e3..a5bdb6cf48407 100644 --- a/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml +++ b/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml @@ -17,6 +17,20 @@ description: | properties: compatible: oneOf: + - items: + - enum: + - apple,t8103-error-handler + - apple,t6000-error-handler + - apple,t6001-error-handler + - apple,t6002-error-handler + - const: apple,soc-error-handler + - items: + - enum: + - apple,t8103-event-log + - apple,t6000-event-log + - apple,t6001-event-log + - apple,t6002-event-log + - const: apple,soc-event-log - items: - const: apple,t6041-error-handler - const: apple,soc-error-handler @@ -32,16 +46,15 @@ properties: interrupts: minItems: 9 - maxItems: 89 + maxItems: 268 reg: minItems: 10 - maxItems: 25 + maxItems: 205 description: | - 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. + Per-source status and event-log register apertures. These views may + overlap controller resources; their description does not establish + safe AP ownership. Instances remain disabled until qualified. required: - compatible @@ -100,6 +113,134 @@ allOf: minItems: 10 maxItems: 10 + - if: + properties: + compatible: + contains: + const: apple,t8103-error-handler + then: + properties: + interrupts: + minItems: 11 + maxItems: 11 + reg: + minItems: 18 + maxItems: 18 + required: + - reg + + - if: + properties: + compatible: + contains: + const: apple,t8103-event-log + then: + properties: + interrupts: + minItems: 16 + maxItems: 16 + reg: + minItems: 16 + maxItems: 16 + required: + - reg + + - if: + properties: + compatible: + contains: + const: apple,t6000-error-handler + then: + properties: + interrupts: + minItems: 76 + maxItems: 76 + reg: + minItems: 55 + maxItems: 55 + required: + - reg + + - if: + properties: + compatible: + contains: + const: apple,t6000-event-log + then: + properties: + interrupts: + minItems: 28 + maxItems: 28 + reg: + minItems: 28 + maxItems: 28 + required: + - reg + + - if: + properties: + compatible: + contains: + const: apple,t6001-error-handler + then: + properties: + interrupts: + minItems: 127 + maxItems: 127 + reg: + minItems: 90 + maxItems: 90 + required: + - reg + + - if: + properties: + compatible: + contains: + const: apple,t6001-event-log + then: + properties: + interrupts: + minItems: 28 + maxItems: 28 + reg: + minItems: 28 + maxItems: 28 + required: + - reg + + - if: + properties: + compatible: + contains: + const: apple,t6002-error-handler + then: + properties: + interrupts: + minItems: 268 + maxItems: 268 + reg: + minItems: 205 + maxItems: 205 + required: + - reg + + - if: + properties: + compatible: + contains: + const: apple,t6002-event-log + then: + properties: + interrupts: + minItems: 54 + maxItems: 54 + reg: + minItems: 54 + maxItems: 54 + required: + - reg + additionalProperties: false examples: diff --git a/Documentation/devicetree/bindings/iommu/apple,ave-dma.yaml b/Documentation/devicetree/bindings/iommu/apple,ave-dma.yaml new file mode 100644 index 0000000000000..447b2b541cd33 --- /dev/null +++ b/Documentation/devicetree/bindings/iommu/apple,ave-dma.yaml @@ -0,0 +1,47 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/iommu/apple,ave-dma.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple video encoder auxiliary DMA apertures + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Auxiliary translation and protection apertures accompany the video + encoder DMA DARTs. They are described separately because they do not + implement the programming model of the general-purpose DART driver. + The interrupt is shared with the codec DART instances. + +properties: + compatible: + oneOf: + - items: + - enum: + - apple,t8103-ave-dma + - const: apple,ave-dma + - items: + - const: apple,t6000-ave-dma + - const: apple,ave-dma + + reg: + minItems: 2 + maxItems: 2 + + 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/media/apple,jpeg.yaml b/Documentation/devicetree/bindings/media/apple,jpeg.yaml index 056e1d33c00fd..5f546f1236f08 100644 --- a/Documentation/devicetree/bindings/media/apple,jpeg.yaml +++ b/Documentation/devicetree/bindings/media/apple,jpeg.yaml @@ -12,8 +12,9 @@ maintainers: description: | Apple Silicon JPEG engines are directly programmed memory-to-memory codecs. Each engine has a dedicated interrupt and DART stream. Multiple engines can - share a power domain. The power controller manages the gate; no separate - clock or firmware interface is required. + share a power domain. The power controller manages the gate. Earlier + engines also identify native input-clock selectors. The codec has no + firmware interface. On T6041 the DMA window reserves one 4 GiB slice of the DART high alias for the engine's 32-bit buffer pointer registers. T8140 engines take 64-bit @@ -21,9 +22,15 @@ description: | properties: compatible: - enum: - - apple,t6041-jpeg - - apple,t8140-jpeg + oneOf: + - enum: + - apple,t6041-jpeg + - apple,t8140-jpeg + - items: + - enum: + - apple,t8103-jpeg + - apple,t6000-jpeg + - const: apple,jpeg reg: maxItems: 1 @@ -34,6 +41,10 @@ properties: iommus: maxItems: 1 + clocks: + minItems: 1 + maxItems: 2 + power-domains: minItems: 1 items: diff --git a/Documentation/devicetree/bindings/media/apple,scaler.yaml b/Documentation/devicetree/bindings/media/apple,scaler.yaml index b5f2f5b0e50eb..2e58f40ae4bd4 100644 --- a/Documentation/devicetree/bindings/media/apple,scaler.yaml +++ b/Documentation/devicetree/bindings/media/apple,scaler.yaml @@ -23,11 +23,16 @@ properties: - items: - const: apple,t8140-scaler - const: apple,scaler + - items: + - const: apple,t8103-scaler + - const: apple,scaler + - items: + - const: apple,t6000-scaler + - const: apple,scaler reg: - minItems: 4 + minItems: 2 maxItems: 4 - description: Register apertures in hardware-description order. interrupts: minItems: 2 @@ -56,4 +61,30 @@ required: - iommus - clocks +allOf: + - if: + properties: + compatible: + contains: + const: apple,t8103-scaler + then: + properties: + reg: + maxItems: 2 + else: + if: + properties: + compatible: + contains: + const: apple,t6000-scaler + then: + properties: + reg: + minItems: 3 + maxItems: 3 + else: + properties: + reg: + minItems: 4 + additionalProperties: false diff --git a/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml b/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml index dadb98b19f822..6f0b008339ce8 100644 --- a/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml +++ b/Documentation/devicetree/bindings/media/apple,t8140-ave.yaml @@ -16,23 +16,33 @@ description: | properties: compatible: - enum: - - apple,t6000-ave - - apple,t6041-ave - - apple,t8112-ave - - apple,t8140-ave + oneOf: + - enum: + - apple,t6000-ave + - apple,t6041-ave + - apple,t8112-ave + - apple,t8140-ave + - items: + - const: apple,t8103-ave + - const: apple,ave reg: + minItems: 3 items: - description: Codec registers - description: Mailbox registers - description: Coprocessor registers + - description: Power-management registers + - description: Firmware PIO aperture reg-names: + minItems: 3 items: - const: codec - const: mailbox - const: coproc + - const: pmgr + - const: pio interrupts: items: @@ -42,6 +52,9 @@ properties: - description: Codec interrupt handled by the firmware - description: Codec interrupt handled by the firmware + clocks: + maxItems: 1 + power-domains: minItems: 5 maxItems: 6 @@ -77,4 +90,17 @@ required: - power-domain-names - iommus +allOf: + - if: + properties: + compatible: + contains: + enum: ["apple,t6041-ave", "apple,t8140-ave"] + then: + properties: + reg: + maxItems: 3 + reg-names: + maxItems: 3 + additionalProperties: false diff --git a/Documentation/devicetree/bindings/net/apple,aqc107-i2c.yaml b/Documentation/devicetree/bindings/net/apple,aqc107-i2c.yaml new file mode 100644 index 0000000000000..735b88c3cf354 --- /dev/null +++ b/Documentation/devicetree/bindings/net/apple,aqc107-i2c.yaml @@ -0,0 +1,32 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/apple,aqc107-i2c.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple Aquantia Ethernet I2C sideband + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + The Ethernet controller exposes an I2C control interface in addition to + its PCIe host interface. This node identifies the addressed sideband, + not a second PCIe Ethernet controller. + +properties: + compatible: + items: + - enum: + - apple,t8103-aqc107-i2c + - apple,t6000-aqc107-i2c + - const: apple,aqc107-i2c + + 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 bd28dc14068e1..646f70e15dddc 100644 --- a/Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml +++ b/Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml @@ -23,6 +23,7 @@ properties: - apple,chapel-pmic - apple,maverick-pmic - apple,sera-pmic + - apple,simetra-pmic - apple,stowe-pmic - const: apple,spmi-nvmem diff --git a/Documentation/devicetree/bindings/phy/apple,atcrt.yaml b/Documentation/devicetree/bindings/phy/apple,atcrt.yaml new file mode 100644 index 0000000000000..e2898b85fb9bb --- /dev/null +++ b/Documentation/devicetree/bindings/phy/apple,atcrt.yaml @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/phy/apple,atcrt.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple ATC retimer control interface + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + An addressed retimer control interface on an I2C bus. This does not + transfer PHY, reset or firmware ownership to the host. + +properties: + compatible: + items: + - enum: + - apple,t8103-atcrt + - apple,t6000-atcrt + - const: apple,atcrt + + reg: + maxItems: 1 + +required: + - compatible + - reg + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/pwm/apple,pwm.yaml b/Documentation/devicetree/bindings/pwm/apple,pwm.yaml new file mode 100644 index 0000000000000..d5f2bbbbfc06e --- /dev/null +++ b/Documentation/devicetree/bindings/pwm/apple,pwm.yaml @@ -0,0 +1,48 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/pwm/apple,pwm.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple timer PWM controller + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + The timer PWM controller is distinct from the FPWM keyboard-backlight + controller. It has one register aperture, one interrupt and a PMGR gate. + On T6000 the plain-PWM view shares its register bank with FPWM0, + but has a distinct gate and interrupt. Ownership must be coordinated + before either interface is used alongside the other. + +properties: + compatible: + oneOf: + - items: + - enum: + - apple,t8103-pwm + - const: apple,pwm + - items: + - const: apple,t6000-pwm + - const: apple,pwm + + reg: + minItems: 1 + maxItems: 1 + + interrupts: + minItems: 1 + maxItems: 1 + + power-domains: + minItems: 1 + maxItems: 1 + +required: + - compatible + - reg + - interrupts + - power-domains + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,dockchannel.yaml b/Documentation/devicetree/bindings/soc/apple/apple,dockchannel.yaml index ad3619b64fb0c..9ee4a45c910d9 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,dockchannel.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,dockchannel.yaml @@ -20,18 +20,25 @@ description: properties: compatible: - items: - - enum: - - apple,t6020-dockchannel - - apple,t6030-dockchannel - - apple,t6031-dockchannel - - apple,t6041-dockchannel - - apple,t8112-dockchannel - - apple,t8122-dockchannel - - apple,t8132-dockchannel - - apple,t8140-dockchannel - - apple,t8142-dockchannel - - const: apple,dockchannel + oneOf: + - items: + - enum: + - apple,t6020-dockchannel + - apple,t6030-dockchannel + - apple,t6031-dockchannel + - apple,t6041-dockchannel + - apple,t8112-dockchannel + - apple,t8122-dockchannel + - apple,t8132-dockchannel + - apple,t8140-dockchannel + - apple,t8142-dockchannel + - const: apple,dockchannel + - items: + - const: apple,t8103-dockchannel + - const: apple,dockchannel + - items: + - const: apple,t6000-dockchannel + - const: apple,dockchannel reg: maxItems: 1 diff --git a/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml b/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml index e067b3f3665b9..3b7d6645c2264 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,dwi.yaml @@ -22,6 +22,12 @@ properties: - items: - const: apple,t8140-dwi - const: apple,dwi + - items: + - const: apple,t8103-dwi + - const: apple,dwi + - items: + - const: apple,t6000-dwi + - const: apple,dwi reg: maxItems: 1 diff --git a/Documentation/devicetree/bindings/soc/apple/apple,pmp.yaml b/Documentation/devicetree/bindings/soc/apple/apple,pmp.yaml index 4337488e5392b..6b7874ffa1f46 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,pmp.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,pmp.yaml @@ -31,11 +31,17 @@ properties: - apple,t8132-pmp-v2 - apple,t8140-pmp-v2 - const: apple,t6000-pmp-v2 + - items: + - const: apple,t8103-pmp + - const: apple,pmp reg: - items: - - description: Firmware SRAM - - description: ASC control registers + minItems: 2 + maxItems: 37 + description: + Coprocessor and peripheral register views. First-generation firmware + views include shared apertures; a driver must coordinate ownership + rather than claim every view as an exclusive resource. reg-names: items: @@ -52,7 +58,8 @@ properties: maxItems: 1 power-domains: - maxItems: 1 + minItems: 1 + maxItems: 2 apple,pmp-report: $ref: /schemas/types.yaml#/definitions/phandle @@ -105,10 +112,34 @@ patternProperties: required: - compatible - reg - - reg-names + - iommus - mboxes - mbox-names - - iommus + +allOf: + - if: + properties: + compatible: + contains: + const: apple,t8103-pmp + then: + properties: + reg: + minItems: 37 + power-domains: + minItems: 2 + required: + - power-domains + else: + properties: + reg: + maxItems: 2 + power-domains: + maxItems: 1 + required: + - reg-names + - mboxes + - mbox-names additionalProperties: false diff --git a/Documentation/devicetree/bindings/soc/apple/apple,t8140-mcc.yaml b/Documentation/devicetree/bindings/soc/apple/apple,t8140-mcc.yaml index 63767db0cea1a..aaf91808584fc 100644 --- a/Documentation/devicetree/bindings/soc/apple/apple,t8140-mcc.yaml +++ b/Documentation/devicetree/bindings/soc/apple/apple,t8140-mcc.yaml @@ -18,6 +18,11 @@ description: properties: compatible: oneOf: + - items: + - enum: + - apple,t8103-mcc + - apple,t6000-mcc + - const: apple,mcc - enum: - apple,t8132-mcc - apple,t8140-mcc @@ -26,7 +31,7 @@ properties: - const: apple,t8140-mcc reg: - description: Per-plane blocks on T8140, or the two multicast apertures on T8132. + description: Per-plane blocks or multicast memory-controller apertures. minItems: 1 maxItems: 32 diff --git a/Documentation/devicetree/bindings/thermal/apple,die-temperature-sensor.yaml b/Documentation/devicetree/bindings/thermal/apple,die-temperature-sensor.yaml new file mode 100644 index 0000000000000..861f6d486b9c0 --- /dev/null +++ b/Documentation/devicetree/bindings/thermal/apple,die-temperature-sensor.yaml @@ -0,0 +1,62 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/thermal/apple,die-temperature-sensor.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple T8103 die temperature sensor registers + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + Each channel has a readback register and, where present, independent + control, accumulator and alarm registers. Channels share larger PMGR or + CPU apertures, so only their individual registers are described here. + Register addresses do not describe sensor calibration, alarm thresholds + or firmware control sequences. A driver needs a separate calibration + handoff before reporting temperatures. + +properties: + compatible: + items: + - const: apple,t8103-die-temperature-sensor + - const: apple,die-temperature-sensor + + reg: + minItems: 2 + maxItems: 17 + + reg-names: + minItems: 2 + maxItems: 17 + items: + enum: + - readbk + - readbk1 + - readcnt + - readsum + - ctl0-clr + - ctl0-set + - ctl1 + - ctl1-clr + - ctl1-set + - ctl2 + - ctl2-clr + - ctl2-set + - ctl3-clr + - ctl3-set + - ctl4-clr + - ctl4-set + - alarm0 + - alarm1 + - alarm2 + - alarm3 + - status + +required: + - compatible + - reg + - reg-names + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/timer/apple,aic-timebase.yaml b/Documentation/devicetree/bindings/timer/apple,aic-timebase.yaml index 19a606988c907..ba9f33030bcb8 100644 --- a/Documentation/devicetree/bindings/timer/apple,aic-timebase.yaml +++ b/Documentation/devicetree/bindings/timer/apple,aic-timebase.yaml @@ -18,6 +18,12 @@ properties: - items: - const: apple,t6041-aic-timebase - const: apple,aic-timebase + - items: + - const: apple,t8103-aic-timebase + - const: apple,aic-timebase + - items: + - const: apple,t6000-aic-timebase + - const: apple,aic-timebase reg: maxItems: 1 diff --git a/arch/arm64/boot/dts/apple/t8103-j274-control.dtsi b/arch/arm64/boot/dts/apple/t8103-j274-control.dtsi new file mode 100644 index 0000000000000..9d4ff5ccdac89 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8103-j274-control.dtsi @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* Populated board control clients. Transport ownership is not transferred. */ + +&i2c3 { + ethernet_sideband: ethernet-sideband@32 { + compatible = "apple,t8103-aqc107-i2c", "apple,aqc107-i2c"; + reg = <0x32>; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t8103-j274.dts b/arch/arm64/boot/dts/apple/t8103-j274.dts index 2d491408f32cb..11d55fa84da33 100644 --- a/arch/arm64/boot/dts/apple/t8103-j274.dts +++ b/arch/arm64/boot/dts/apple/t8103-j274.dts @@ -147,3 +147,5 @@ }; #include "hwmon-mini.dtsi" + +#include "t8103-j274-control.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8103-j293-control.dtsi b/arch/arm64/boot/dts/apple/t8103-j293-control.dtsi new file mode 100644 index 0000000000000..4a2c7465a9aec --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8103-j293-control.dtsi @@ -0,0 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* Populated board control clients. Transport ownership is not transferred. */ + +&spi4 { + panel_controller: panel-timing-controller@0 { + compatible = "parade,dp855"; + reg = <0>; + status = "disabled"; + + i2c { + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + 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/t8103-j293.dts b/arch/arm64/boot/dts/apple/t8103-j293.dts index bc42ad5a57043..d5006b1a2aed7 100644 --- a/arch/arm64/boot/dts/apple/t8103-j293.dts +++ b/arch/arm64/boot/dts/apple/t8103-j293.dts @@ -329,3 +329,5 @@ &isp { apple,platform-id = <1>; }; + +#include "t8103-j293-control.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8103-j313-control.dtsi b/arch/arm64/boot/dts/apple/t8103-j313-control.dtsi new file mode 100644 index 0000000000000..56f8a1959635f --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8103-j313-control.dtsi @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* Populated board control clients. Transport ownership is not transferred. */ + +&i2c2 { + atcrt0: retimer@18 { + compatible = "apple,t8103-atcrt", "apple,atcrt"; + reg = <0x18>; + status = "disabled"; + }; + + atcrt1: retimer@19 { + compatible = "apple,t8103-atcrt", "apple,atcrt"; + reg = <0x19>; + status = "disabled"; + }; +}; + +&spi4 { + panel_controller: panel-timing-controller@0 { + compatible = "parade,dp855"; + reg = <0>; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t8103-j313.dts b/arch/arm64/boot/dts/apple/t8103-j313.dts index 299227ea2b9a0..b1125b78a85d0 100644 --- a/arch/arm64/boot/dts/apple/t8103-j313.dts +++ b/arch/arm64/boot/dts/apple/t8103-j313.dts @@ -221,3 +221,5 @@ &isp { apple,platform-id = <1>; }; + +#include "t8103-j313-control.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8103-j456-control.dtsi b/arch/arm64/boot/dts/apple/t8103-j456-control.dtsi new file mode 100644 index 0000000000000..6a126b0159828 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8103-j456-control.dtsi @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* Populated board control clients. Transport ownership is not transferred. */ + +&spi4 { + panel_controller: panel-timing-controller@0 { + compatible = "parade,dp855"; + reg = <0>; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t8103-j456.dts b/arch/arm64/boot/dts/apple/t8103-j456.dts index ca3499abc17a1..be608c1a72856 100644 --- a/arch/arm64/boot/dts/apple/t8103-j456.dts +++ b/arch/arm64/boot/dts/apple/t8103-j456.dts @@ -170,3 +170,5 @@ &isp { apple,platform-id = <2>; }; + +#include "t8103-j456-control.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8103-j457-control.dtsi b/arch/arm64/boot/dts/apple/t8103-j457-control.dtsi new file mode 100644 index 0000000000000..6a126b0159828 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8103-j457-control.dtsi @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* Populated board control clients. Transport ownership is not transferred. */ + +&spi4 { + panel_controller: panel-timing-controller@0 { + compatible = "parade,dp855"; + reg = <0>; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t8103-j457.dts b/arch/arm64/boot/dts/apple/t8103-j457.dts index 5933913088bca..e15110090e75a 100644 --- a/arch/arm64/boot/dts/apple/t8103-j457.dts +++ b/arch/arm64/boot/dts/apple/t8103-j457.dts @@ -151,3 +151,5 @@ &isp { apple,platform-id = <2>; }; + +#include "t8103-j457-control.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8103-peripherals.dtsi b/arch/arm64/boot/dts/apple/t8103-peripherals.dtsi new file mode 100644 index 0000000000000..4d2257ea8a58a --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8103-peripherals.dtsi @@ -0,0 +1,813 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* Hardware resources retained for devices without a qualified OS handoff. */ + +&{/soc} { + mcc: memory-controller@200100000 { + compatible = "apple,t8103-mcc", "apple,mcc"; + reg = <0x2 0x00100000 0x0 0x100000>, + <0x2 0x00000000 0x0 0x100000>, + <0x2 0x00200000 0x0 0x200000>; + status = "disabled"; + }; + + + mtrtempsensor8: temperature-sensor@210ee4000 { + compatible = "apple,t8103-die-temperature-sensor", "apple,die-temperature-sensor"; + reg = <0x2 0x10ee4000 0x0 0x4>, + <0x2 0x10ee1014 0x0 0x4>, + <0x2 0x10ee1018 0x0 0x4>, + <0x2 0x10ee101c 0x0 0x4>, + <0x2 0x10ee1020 0x0 0x4>, + <0x2 0x10ee1004 0x0 0x4>, + <0x2 0x10ee1000 0x0 0x4>, + <0x2 0x10ee1160 0x0 0x4>, + <0x2 0x10ee115c 0x0 0x4>, + <0x2 0x10ee1168 0x0 0x4>, + <0x2 0x10ee1164 0x0 0x4>, + <0x2 0x10ee4004 0x0 0x4>, + <0x2 0x10ee1010 0x0 0x4>, + <0x2 0x10ee100c 0x0 0x4>, + <0x2 0x10ee1008 0x0 0x4>; + reg-names = "readbk", "alarm0", "alarm1", "alarm2", "alarm3", "ctl0-clr", "ctl0-set", "ctl1-clr", "ctl1-set", "ctl2-clr", "ctl2-set", "readbk1", "readcnt", "readsum", "status"; + status = "disabled"; + }; + + mtrtempsensor9: temperature-sensor@210ee4600 { + compatible = "apple,t8103-die-temperature-sensor", "apple,die-temperature-sensor"; + reg = <0x2 0x10ee4600 0x0 0x4>, + <0x2 0x10ee1614 0x0 0x4>, + <0x2 0x10ee1618 0x0 0x4>, + <0x2 0x10ee161c 0x0 0x4>, + <0x2 0x10ee1620 0x0 0x4>, + <0x2 0x10ee1604 0x0 0x4>, + <0x2 0x10ee1600 0x0 0x4>, + <0x2 0x10ee1760 0x0 0x4>, + <0x2 0x10ee175c 0x0 0x4>, + <0x2 0x10ee1768 0x0 0x4>, + <0x2 0x10ee1764 0x0 0x4>, + <0x2 0x10ee4604 0x0 0x4>, + <0x2 0x10ee1610 0x0 0x4>, + <0x2 0x10ee160c 0x0 0x4>, + <0x2 0x10ee1608 0x0 0x4>; + reg-names = "readbk", "alarm0", "alarm1", "alarm2", "alarm3", "ctl0-clr", "ctl0-set", "ctl1-clr", "ctl1-set", "ctl2-clr", "ctl2-set", "readbk1", "readcnt", "readsum", "status"; + status = "disabled"; + }; + + mtrtempsensor10: temperature-sensor@211ee4400 { + compatible = "apple,t8103-die-temperature-sensor", "apple,die-temperature-sensor"; + reg = <0x2 0x11ee4400 0x0 0x4>, + <0x2 0x11ee1414 0x0 0x4>, + <0x2 0x11ee1418 0x0 0x4>, + <0x2 0x11ee141c 0x0 0x4>, + <0x2 0x11ee1420 0x0 0x4>, + <0x2 0x11ee1404 0x0 0x4>, + <0x2 0x11ee1400 0x0 0x4>, + <0x2 0x11ee1560 0x0 0x4>, + <0x2 0x11ee155c 0x0 0x4>, + <0x2 0x11ee1568 0x0 0x4>, + <0x2 0x11ee1564 0x0 0x4>, + <0x2 0x11ee4404 0x0 0x4>, + <0x2 0x11ee1410 0x0 0x4>, + <0x2 0x11ee140c 0x0 0x4>, + <0x2 0x11ee1408 0x0 0x4>; + reg-names = "readbk", "alarm0", "alarm1", "alarm2", "alarm3", "ctl0-clr", "ctl0-set", "ctl1-clr", "ctl1-set", "ctl2-clr", "ctl2-set", "readbk1", "readcnt", "readsum", "status"; + status = "disabled"; + }; + + mtrtempsensor11: temperature-sensor@211ee4600 { + compatible = "apple,t8103-die-temperature-sensor", "apple,die-temperature-sensor"; + reg = <0x2 0x11ee4600 0x0 0x4>, + <0x2 0x11ee1614 0x0 0x4>, + <0x2 0x11ee1618 0x0 0x4>, + <0x2 0x11ee161c 0x0 0x4>, + <0x2 0x11ee1620 0x0 0x4>, + <0x2 0x11ee1604 0x0 0x4>, + <0x2 0x11ee1600 0x0 0x4>, + <0x2 0x11ee1760 0x0 0x4>, + <0x2 0x11ee175c 0x0 0x4>, + <0x2 0x11ee1768 0x0 0x4>, + <0x2 0x11ee1764 0x0 0x4>, + <0x2 0x11ee4604 0x0 0x4>, + <0x2 0x11ee1610 0x0 0x4>, + <0x2 0x11ee160c 0x0 0x4>, + <0x2 0x11ee1608 0x0 0x4>; + reg-names = "readbk", "alarm0", "alarm1", "alarm2", "alarm3", "ctl0-clr", "ctl0-set", "ctl1-clr", "ctl1-set", "ctl2-clr", "ctl2-set", "readbk1", "readcnt", "readsum", "status"; + status = "disabled"; + }; + + mtrtempsensor12: temperature-sensor@211ee4800 { + compatible = "apple,t8103-die-temperature-sensor", "apple,die-temperature-sensor"; + reg = <0x2 0x11ee4800 0x0 0x4>, + <0x2 0x11ee1814 0x0 0x4>, + <0x2 0x11ee1818 0x0 0x4>, + <0x2 0x11ee181c 0x0 0x4>, + <0x2 0x11ee1820 0x0 0x4>, + <0x2 0x11ee1804 0x0 0x4>, + <0x2 0x11ee1800 0x0 0x4>, + <0x2 0x11ee1960 0x0 0x4>, + <0x2 0x11ee195c 0x0 0x4>, + <0x2 0x11ee1968 0x0 0x4>, + <0x2 0x11ee1964 0x0 0x4>, + <0x2 0x11ee4804 0x0 0x4>, + <0x2 0x11ee1810 0x0 0x4>, + <0x2 0x11ee180c 0x0 0x4>, + <0x2 0x11ee1808 0x0 0x4>; + reg-names = "readbk", "alarm0", "alarm1", "alarm2", "alarm3", "ctl0-clr", "ctl0-set", "ctl1-clr", "ctl1-set", "ctl2-clr", "ctl2-set", "readbk1", "readcnt", "readsum", "status"; + status = "disabled"; + }; + + mtrtempsensor13: temperature-sensor@211eec000 { + compatible = "apple,t8103-die-temperature-sensor", "apple,die-temperature-sensor"; + reg = <0x2 0x11eec000 0x0 0x4>, + <0x2 0x11ee9014 0x0 0x4>, + <0x2 0x11ee9018 0x0 0x4>, + <0x2 0x11ee901c 0x0 0x4>, + <0x2 0x11ee9020 0x0 0x4>, + <0x2 0x11ee9004 0x0 0x4>, + <0x2 0x11ee9000 0x0 0x4>, + <0x2 0x11ee9160 0x0 0x4>, + <0x2 0x11ee915c 0x0 0x4>, + <0x2 0x11ee9168 0x0 0x4>, + <0x2 0x11ee9164 0x0 0x4>, + <0x2 0x11eec004 0x0 0x4>, + <0x2 0x11ee9010 0x0 0x4>, + <0x2 0x11ee900c 0x0 0x4>, + <0x2 0x11ee9008 0x0 0x4>; + reg-names = "readbk", "alarm0", "alarm1", "alarm2", "alarm3", "ctl0-clr", "ctl0-set", "ctl1-clr", "ctl1-set", "ctl2-clr", "ctl2-set", "readbk1", "readcnt", "readsum", "status"; + status = "disabled"; + }; + + mtrtempsensor14: temperature-sensor@211ef4200 { + compatible = "apple,t8103-die-temperature-sensor", "apple,die-temperature-sensor"; + reg = <0x2 0x11ef4200 0x0 0x4>, + <0x2 0x11ef1214 0x0 0x4>, + <0x2 0x11ef1218 0x0 0x4>, + <0x2 0x11ef121c 0x0 0x4>, + <0x2 0x11ef1220 0x0 0x4>, + <0x2 0x11ef1204 0x0 0x4>, + <0x2 0x11ef1200 0x0 0x4>, + <0x2 0x11ef1360 0x0 0x4>, + <0x2 0x11ef135c 0x0 0x4>, + <0x2 0x11ef1368 0x0 0x4>, + <0x2 0x11ef1364 0x0 0x4>, + <0x2 0x11ef4204 0x0 0x4>, + <0x2 0x11ef1210 0x0 0x4>, + <0x2 0x11ef120c 0x0 0x4>, + <0x2 0x11ef1208 0x0 0x4>; + reg-names = "readbk", "alarm0", "alarm1", "alarm2", "alarm3", "ctl0-clr", "ctl0-set", "ctl1-clr", "ctl1-set", "ctl2-clr", "ctl2-set", "readbk1", "readcnt", "readsum", "status"; + status = "disabled"; + }; + + mtrtempsensor15: temperature-sensor@211ef4400 { + compatible = "apple,t8103-die-temperature-sensor", "apple,die-temperature-sensor"; + reg = <0x2 0x11ef4400 0x0 0x4>, + <0x2 0x11ef1414 0x0 0x4>, + <0x2 0x11ef1418 0x0 0x4>, + <0x2 0x11ef141c 0x0 0x4>, + <0x2 0x11ef1420 0x0 0x4>, + <0x2 0x11ef1404 0x0 0x4>, + <0x2 0x11ef1400 0x0 0x4>, + <0x2 0x11ef1560 0x0 0x4>, + <0x2 0x11ef155c 0x0 0x4>, + <0x2 0x11ef1568 0x0 0x4>, + <0x2 0x11ef1564 0x0 0x4>, + <0x2 0x11ef4404 0x0 0x4>, + <0x2 0x11ef1410 0x0 0x4>, + <0x2 0x11ef140c 0x0 0x4>, + <0x2 0x11ef1408 0x0 0x4>; + reg-names = "readbk", "alarm0", "alarm1", "alarm2", "alarm3", "ctl0-clr", "ctl0-set", "ctl1-clr", "ctl1-set", "ctl2-clr", "ctl2-set", "readbk1", "readcnt", "readsum", "status"; + status = "disabled"; + }; + + mtrtempsensor16: temperature-sensor@211ef4600 { + compatible = "apple,t8103-die-temperature-sensor", "apple,die-temperature-sensor"; + reg = <0x2 0x11ef4600 0x0 0x4>, + <0x2 0x11ef1614 0x0 0x4>, + <0x2 0x11ef1618 0x0 0x4>, + <0x2 0x11ef161c 0x0 0x4>, + <0x2 0x11ef1620 0x0 0x4>, + <0x2 0x11ef1604 0x0 0x4>, + <0x2 0x11ef1600 0x0 0x4>, + <0x2 0x11ef1760 0x0 0x4>, + <0x2 0x11ef175c 0x0 0x4>, + <0x2 0x11ef1768 0x0 0x4>, + <0x2 0x11ef1764 0x0 0x4>, + <0x2 0x11ef4604 0x0 0x4>, + <0x2 0x11ef1610 0x0 0x4>, + <0x2 0x11ef160c 0x0 0x4>, + <0x2 0x11ef1608 0x0 0x4>; + reg-names = "readbk", "alarm0", "alarm1", "alarm2", "alarm3", "ctl0-clr", "ctl0-set", "ctl1-clr", "ctl1-set", "ctl2-clr", "ctl2-set", "readbk1", "readcnt", "readsum", "status"; + status = "disabled"; + }; + + aes: crypto@23500c000 { + compatible = "apple,t8103-aes", "apple,aes"; + reg = <0x2 0x3500c000 0x0 0x4000>, + <0x2 0x3d2d0000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_aes>; + iommus = <&sio_dart 1>; + status = "disabled"; + }; + + pwm0: pwm@235040000 { + compatible = "apple,t8103-pwm", "apple,pwm"; + reg = <0x2 0x35040000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_fpwm0>; + status = "disabled"; + }; + + spi4: spi@235110000 { + compatible = "apple,t8103-spi", "apple,spi"; + reg = <0x2 0x35110000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_spi4>; + clocks = <&peripheral_clocks 380>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + aic_timebase: timer@23b108000 { + compatible = "apple,t8103-aic-timebase", "apple,aic-timebase"; + reg = <0x2 0x3b108000 0x0 0x1000>; + status = "disabled"; + }; + + dwi: bus-controller@23b200000 { + compatible = "apple,t8103-dwi", "apple,dwi"; + reg = <0x2 0x3b200000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_dwi>; + status = "disabled"; + }; + + mtrtempsensor3: temperature-sensor@23b284000 { + compatible = "apple,t8103-die-temperature-sensor", "apple,die-temperature-sensor"; + reg = <0x2 0x3b284000 0x0 0x4>, + <0x2 0x3b281014 0x0 0x4>, + <0x2 0x3b281018 0x0 0x4>, + <0x2 0x3b28101c 0x0 0x4>, + <0x2 0x3b281020 0x0 0x4>, + <0x2 0x3b281004 0x0 0x4>, + <0x2 0x3b281000 0x0 0x4>, + <0x2 0x3b281160 0x0 0x4>, + <0x2 0x3b28115c 0x0 0x4>, + <0x2 0x3b281168 0x0 0x4>, + <0x2 0x3b281164 0x0 0x4>, + <0x2 0x3b284004 0x0 0x4>, + <0x2 0x3b281010 0x0 0x4>, + <0x2 0x3b28100c 0x0 0x4>, + <0x2 0x3b281008 0x0 0x4>; + reg-names = "readbk", "alarm0", "alarm1", "alarm2", "alarm3", "ctl0-clr", "ctl0-set", "ctl1-clr", "ctl1-set", "ctl2-clr", "ctl2-set", "readbk1", "readcnt", "readsum", "status"; + status = "disabled"; + }; + + mtrtempsensor4: temperature-sensor@23b284200 { + compatible = "apple,t8103-die-temperature-sensor", "apple,die-temperature-sensor"; + reg = <0x2 0x3b284200 0x0 0x4>, + <0x2 0x3b281214 0x0 0x4>, + <0x2 0x3b281218 0x0 0x4>, + <0x2 0x3b28121c 0x0 0x4>, + <0x2 0x3b281220 0x0 0x4>, + <0x2 0x3b281204 0x0 0x4>, + <0x2 0x3b281200 0x0 0x4>, + <0x2 0x3b281360 0x0 0x4>, + <0x2 0x3b28135c 0x0 0x4>, + <0x2 0x3b281368 0x0 0x4>, + <0x2 0x3b281364 0x0 0x4>, + <0x2 0x3b284204 0x0 0x4>, + <0x2 0x3b281210 0x0 0x4>, + <0x2 0x3b28120c 0x0 0x4>, + <0x2 0x3b281208 0x0 0x4>; + reg-names = "readbk", "alarm0", "alarm1", "alarm2", "alarm3", "ctl0-clr", "ctl0-set", "ctl1-clr", "ctl1-set", "ctl2-clr", "ctl2-set", "readbk1", "readcnt", "readsum", "status"; + status = "disabled"; + }; + + mtrtempsensor5: temperature-sensor@23b284400 { + compatible = "apple,t8103-die-temperature-sensor", "apple,die-temperature-sensor"; + reg = <0x2 0x3b284400 0x0 0x4>, + <0x2 0x3b281414 0x0 0x4>, + <0x2 0x3b281418 0x0 0x4>, + <0x2 0x3b28141c 0x0 0x4>, + <0x2 0x3b281420 0x0 0x4>, + <0x2 0x3b281404 0x0 0x4>, + <0x2 0x3b281400 0x0 0x4>, + <0x2 0x3b281560 0x0 0x4>, + <0x2 0x3b28155c 0x0 0x4>, + <0x2 0x3b281568 0x0 0x4>, + <0x2 0x3b281564 0x0 0x4>, + <0x2 0x3b284404 0x0 0x4>, + <0x2 0x3b281410 0x0 0x4>, + <0x2 0x3b28140c 0x0 0x4>, + <0x2 0x3b281408 0x0 0x4>; + reg-names = "readbk", "alarm0", "alarm1", "alarm2", "alarm3", "ctl0-clr", "ctl0-set", "ctl1-clr", "ctl1-set", "ctl2-clr", "ctl2-set", "readbk1", "readcnt", "readsum", "status"; + status = "disabled"; + }; + + mtrtempsensor6: temperature-sensor@23b29c200 { + compatible = "apple,t8103-die-temperature-sensor", "apple,die-temperature-sensor"; + reg = <0x2 0x3b29c200 0x0 0x4>, + <0x2 0x3b299214 0x0 0x4>, + <0x2 0x3b299218 0x0 0x4>, + <0x2 0x3b29921c 0x0 0x4>, + <0x2 0x3b299220 0x0 0x4>, + <0x2 0x3b299204 0x0 0x4>, + <0x2 0x3b299200 0x0 0x4>, + <0x2 0x3b299360 0x0 0x4>, + <0x2 0x3b29935c 0x0 0x4>, + <0x2 0x3b299368 0x0 0x4>, + <0x2 0x3b299364 0x0 0x4>, + <0x2 0x3b29c204 0x0 0x4>, + <0x2 0x3b299210 0x0 0x4>, + <0x2 0x3b29920c 0x0 0x4>, + <0x2 0x3b299208 0x0 0x4>; + reg-names = "readbk", "alarm0", "alarm1", "alarm2", "alarm3", "ctl0-clr", "ctl0-set", "ctl1-clr", "ctl1-set", "ctl2-clr", "ctl2-set", "readbk1", "readcnt", "readsum", "status"; + status = "disabled"; + }; + + mtrtempsensor7: temperature-sensor@23b2a4000 { + compatible = "apple,t8103-die-temperature-sensor", "apple,die-temperature-sensor"; + reg = <0x2 0x3b2a4000 0x0 0x4>, + <0x2 0x3b2a1014 0x0 0x4>, + <0x2 0x3b2a1018 0x0 0x4>, + <0x2 0x3b2a101c 0x0 0x4>, + <0x2 0x3b2a1020 0x0 0x4>, + <0x2 0x3b2a1004 0x0 0x4>, + <0x2 0x3b2a1000 0x0 0x4>, + <0x2 0x3b2a1160 0x0 0x4>, + <0x2 0x3b2a115c 0x0 0x4>, + <0x2 0x3b2a1168 0x0 0x4>, + <0x2 0x3b2a1164 0x0 0x4>, + <0x2 0x3b2a4004 0x0 0x4>, + <0x2 0x3b2a1010 0x0 0x4>, + <0x2 0x3b2a100c 0x0 0x4>, + <0x2 0x3b2a1008 0x0 0x4>; + reg-names = "readbk", "alarm0", "alarm1", "alarm2", "alarm3", "ctl0-clr", "ctl0-set", "ctl1-clr", "ctl1-set", "ctl2-clr", "ctl2-set", "readbk1", "readcnt", "readsum", "status"; + status = "disabled"; + }; + + mtrtempsensor17: temperature-sensor@23b2e0200 { + compatible = "apple,t8103-die-temperature-sensor", "apple,die-temperature-sensor"; + reg = <0x2 0x3b2e0200 0x0 0x4>, + <0x2 0x3b2e0204 0x0 0x4>; + reg-names = "readbk", "readbk1"; + status = "disabled"; + }; + + mtrtempsensor18: temperature-sensor@23b2e0c00 { + compatible = "apple,t8103-die-temperature-sensor", "apple,die-temperature-sensor"; + reg = <0x2 0x3b2e0c00 0x0 0x4>, + <0x2 0x3b2e0c04 0x0 0x4>; + reg-names = "readbk", "readbk1"; + status = "disabled"; + }; + + tempsensor0: temperature-sensor@23b2e4000 { + compatible = "apple,t8103-die-temperature-sensor", "apple,die-temperature-sensor"; + reg = <0x2 0x3b2e4000 0x0 0x4>, + <0x2 0x3b2c405c 0x0 0x4>, + <0x2 0x3b2c4060 0x0 0x4>, + <0x2 0x3b2c4064 0x0 0x4>, + <0x2 0x3b2c4068 0x0 0x4>, + <0x2 0x3b2c4004 0x0 0x4>, + <0x2 0x3b2c4000 0x0 0x4>, + <0x2 0x3b2c4008 0x0 0x4>, + <0x2 0x3b2c400c 0x0 0x4>, + <0x2 0x3b2c409c 0x0 0x4>, + <0x2 0x3b2c4098 0x0 0x4>, + <0x2 0x3b2c40a4 0x0 0x4>, + <0x2 0x3b2c40a0 0x0 0x4>, + <0x2 0x3b2e4004 0x0 0x4>, + <0x2 0x3b2c4058 0x0 0x4>, + <0x2 0x3b2c4054 0x0 0x4>, + <0x2 0x3b2c4010 0x0 0x4>; + reg-names = "readbk", "alarm0", "alarm1", "alarm2", "alarm3", "ctl0-clr", "ctl0-set", "ctl1", "ctl2", "ctl3-clr", "ctl3-set", "ctl4-clr", "ctl4-set", "readbk1", "readcnt", "readsum", "status"; + status = "disabled"; + }; + + tempsensor1: temperature-sensor@23b2e8000 { + compatible = "apple,t8103-die-temperature-sensor", "apple,die-temperature-sensor"; + reg = <0x2 0x3b2e8000 0x0 0x4>, + <0x2 0x3b2c805c 0x0 0x4>, + <0x2 0x3b2c8060 0x0 0x4>, + <0x2 0x3b2c8064 0x0 0x4>, + <0x2 0x3b2c8068 0x0 0x4>, + <0x2 0x3b2c8004 0x0 0x4>, + <0x2 0x3b2c8000 0x0 0x4>, + <0x2 0x3b2c8008 0x0 0x4>, + <0x2 0x3b2c800c 0x0 0x4>, + <0x2 0x3b2c809c 0x0 0x4>, + <0x2 0x3b2c8098 0x0 0x4>, + <0x2 0x3b2c80a4 0x0 0x4>, + <0x2 0x3b2c80a0 0x0 0x4>, + <0x2 0x3b2e8004 0x0 0x4>, + <0x2 0x3b2c8058 0x0 0x4>, + <0x2 0x3b2c8054 0x0 0x4>, + <0x2 0x3b2c8010 0x0 0x4>; + reg-names = "readbk", "alarm0", "alarm1", "alarm2", "alarm3", "ctl0-clr", "ctl0-set", "ctl1", "ctl2", "ctl3-clr", "ctl3-set", "ctl4-clr", "ctl4-set", "readbk1", "readcnt", "readsum", "status"; + status = "disabled"; + }; + + tempsensor2: temperature-sensor@23b2ec000 { + compatible = "apple,t8103-die-temperature-sensor", "apple,die-temperature-sensor"; + reg = <0x2 0x3b2ec000 0x0 0x4>, + <0x2 0x3b2cc05c 0x0 0x4>, + <0x2 0x3b2cc060 0x0 0x4>, + <0x2 0x3b2cc064 0x0 0x4>, + <0x2 0x3b2cc068 0x0 0x4>, + <0x2 0x3b2cc004 0x0 0x4>, + <0x2 0x3b2cc000 0x0 0x4>, + <0x2 0x3b2cc008 0x0 0x4>, + <0x2 0x3b2cc00c 0x0 0x4>, + <0x2 0x3b2cc09c 0x0 0x4>, + <0x2 0x3b2cc098 0x0 0x4>, + <0x2 0x3b2cc0a4 0x0 0x4>, + <0x2 0x3b2cc0a0 0x0 0x4>, + <0x2 0x3b2ec004 0x0 0x4>, + <0x2 0x3b2cc058 0x0 0x4>, + <0x2 0x3b2cc054 0x0 0x4>, + <0x2 0x3b2cc010 0x0 0x4>; + reg-names = "readbk", "alarm0", "alarm1", "alarm2", "alarm3", "ctl0-clr", "ctl0-set", "ctl1", "ctl2", "ctl3-clr", "ctl3-set", "ctl4-clr", "ctl4-set", "readbk1", "readcnt", "readsum", "status"; + status = "disabled"; + }; + + pmp_dart: iommu@23b300000 { + compatible = "apple,t8103-dart"; + reg = <0x2 0x3b300000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + status = "disabled"; + }; + + pmp: coprocessor@23bc00000 { + compatible = "apple,t8103-pmp", "apple,pmp"; + reg = <0x2 0x3bc00000 0x0 0x60000>, + <0x2 0x3b850000 0x0 0x200000>, + <0x2 0x3b500000 0x0 0x80000>, + <0x2 0x00024000 0x0 0x4000>, + <0x2 0x00064000 0x0 0x4000>, + <0x2 0x000a4000 0x0 0x4000>, + <0x2 0x000e4000 0x0 0x4000>, + <0x2 0x00158000 0x0 0x4000>, + <0x2 0x00204000 0x0 0x4000>, + <0x2 0x00244000 0x0 0x4000>, + <0x2 0x00284000 0x0 0x4000>, + <0x2 0x002c4000 0x0 0x4000>, + <0x2 0x04d10000 0x0 0x4000>, + <0x2 0x10058000 0x0 0x4000>, + <0x2 0x10158000 0x0 0x4000>, + <0x2 0x10258000 0x0 0x4000>, + <0x2 0x10358000 0x0 0x4000>, + <0x2 0x10e20000 0x0 0x60000>, + <0x2 0x10e48000 0x0 0x4000>, + <0x2 0x11058000 0x0 0x4000>, + <0x2 0x11158000 0x0 0x4000>, + <0x2 0x11258000 0x0 0x4000>, + <0x2 0x11358000 0x0 0x4000>, + <0x2 0x11e20000 0x0 0x60000>, + <0x2 0x11e48000 0x0 0x4000>, + <0x2 0x3d100000 0x0 0x14000>, + <0x2 0x3d128000 0x0 0x30000>, + <0x2 0x3d0d8000 0x0 0x4000>, + <0x2 0x6b90c000 0x0 0x4000>, + <0x2 0x00170000 0x0 0x4000>, + <0x2 0x3c100000 0x0 0x4000>, + <0x2 0x04e20000 0x0 0x4000>, + <0x2 0x11ee0000 0x0 0x8000>, + <0x2 0x11ee8000 0x0 0x8000>, + <0x2 0x11ef0000 0x0 0x8000>, + <0x2 0x10ee0000 0x0 0x8000>, + <0x2 0x04d80000 0x0 0x8000>; + power-domains = <&ps_pmp>, <&ps_pms_sram>; + iommus = <&pmp_dart 0>; + mboxes = <&pmp_mbox>; + mbox-names = "mbox"; + status = "disabled"; + }; + + pmp_mbox: mailbox@23bc08000 { + compatible = "apple,t8103-asc-mailbox", "apple,asc-mailbox-v4"; + reg = <0x2 0x3bc08000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = , + , + , + ; + power-domains = <&ps_pmp>, <&ps_pms_sram>; + #mbox-cells = <0>; + interrupt-names = "send-empty", "send-not-empty", "recv-empty", "recv-not-empty"; + status = "disabled"; + }; + + nub_spmi1: spmi@23d0e1300 { + compatible = "apple,t8103-spmi", "apple,spmi"; + reg = <0x2 0x3d0e1300 0x0 0x100>, + <0x2 0x3d0e0e00 0x0 0x100>, + <0x2 0x3d0e0400 0x0 0x78>; + interrupt-parent = <&aic>; + interrupts = ; + #address-cells = <2>; + #size-cells = <0>; + interrupt-controller; + #interrupt-cells = <2>; + status = "disabled"; + }; + + dockchannel_uart: fifo@23d10c000 { + compatible = "apple,t8103-dockchannel", "apple,dockchannel"; + reg = <0x2 0x3d10c000 0x0 0x18>; + interrupt-parent = <&aic>; + interrupts = ; + reg-names = "irq"; + ranges = <0 0x2 0x3d128000 0x10000>; + #address-cells = <1>; + #size-cells = <1>; + interrupt-controller; + #interrupt-cells = <2>; + status = "disabled"; + }; + + aop_spmi1: spmi@24a829300 { + compatible = "apple,t8103-spmi", "apple,spmi"; + reg = <0x2 0x4a829300 0x0 0x100>, + <0x2 0x4a828e00 0x0 0x100>, + <0x2 0x4a828400 0x0 0x78>; + interrupt-parent = <&aic>; + interrupts = ; + #address-cells = <2>; + #size-cells = <0>; + interrupt-controller; + #interrupt-cells = <2>; + status = "disabled"; + }; + + scaler0: scaler@263000000 { + compatible = "apple,t8103-scaler", "apple,scaler"; + reg = <0x2 0x63000000 0x0 0x28000>, + <0x2 0x63210000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = , + ; + power-domains = <&ps_msr>, <&ps_msr_ase_core>; + clocks = <&peripheral_clocks 365>; + iommus = <&scaler_dart 0>, <&scaler_dart 1>; + resets = <&ps_msr>; + status = "disabled"; + }; + + scaler_dart: iommu@263200000 { + compatible = "apple,t8103-dart"; + reg = <0x2 0x63200000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_msr>; + #iommu-cells = <1>; + status = "disabled"; + }; + + jpeg0: jpeg@265000000 { + compatible = "apple,t8103-jpeg", "apple,jpeg"; + reg = <0x2 0x65000000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_jpg>; + clocks = <&peripheral_clocks 363>, <&peripheral_clocks 364>; + iommus = <&jpeg0_dart 0>; + status = "disabled"; + }; + + jpeg0_dart: iommu@265004000 { + compatible = "apple,t8103-dart"; + reg = <0x2 0x65004000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_jpg>; + #iommu-cells = <1>; + status = "disabled"; + }; + + jpeg1: jpeg@265008000 { + compatible = "apple,t8103-jpeg", "apple,jpeg"; + reg = <0x2 0x65008000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_jpg>; + clocks = <&peripheral_clocks 363>, <&peripheral_clocks 364>; + iommus = <&jpeg1_dart 0>; + status = "disabled"; + }; + + jpeg1_dart: iommu@26500c000 { + compatible = "apple,t8103-dart"; + reg = <0x2 0x6500c000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_jpg>; + #iommu-cells = <1>; + status = "disabled"; + }; + + ave_dma: dma-controller@267020000 { + compatible = "apple,t8103-ave-dma", "apple,ave-dma"; + reg = <0x2 0x67020000 0x0 0x4000>, + <0x2 0x67044000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_venc_sys>; + status = "disabled"; + }; + + ave_dart1: iommu@267030000 { + compatible = "apple,t8103-dart"; + reg = <0x2 0x67030000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_venc_sys>; + #iommu-cells = <1>; + status = "disabled"; + }; + + ave_dart0: iommu@267040000 { + compatible = "apple,t8103-dart"; + reg = <0x2 0x67040000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_venc_sys>; + #iommu-cells = <1>; + status = "disabled"; + }; + + ave: video-codec@267100000 { + compatible = "apple,t8103-ave", "apple,ave"; + reg = <0x2 0x67100000 0x0 0x45c000>, + <0x2 0x67050000 0x0 0x8000>, + <0x2 0x67800000 0x0 0x800000>, + <0x2 0x3b708000 0x0 0x4000>, + <0x2 0x66000000 0x0 0x1000000>; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + ; + power-domains = <&ps_venc_dma>, <&ps_venc_pipe4>, <&ps_venc_pipe5>, <&ps_venc_me0>, <&ps_venc_me1>; + clocks = <&peripheral_clocks 350>; + iommus = <&ave_dart0 0>, <&ave_dart1 0>; + reg-names = "codec", "mailbox", "coproc", "pmgr", "pio"; + power-domain-names = "dma", "pipe4", "pipe5", "me0", "me1"; + status = "disabled"; + }; + + atc0_dpin0: displayport@381e50000 { + compatible = "apple,t8103-dpin", "apple,dpin"; + reg = <0x3 0x81e50000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + atc0_dpin1: displayport@381e58000 { + compatible = "apple,t8103-dpin", "apple,dpin"; + reg = <0x3 0x81e58000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + apciec0_piodma: dma-controller@3a2000000 { + compatible = "apple,t8103-pciec-piodma", "apple,pciec-piodma"; + reg = <0x3 0xa2000000 0x0 0x4000>, + <0x3 0xa2004000 0x0 0x4000>, + <0x3 0xa2008000 0x0 0x4000>, + <0x3 0xa0008000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + iommus = <&apciec0_dart 15>; + status = "disabled"; + }; + + atc1_dpin0: displayport@501e50000 { + compatible = "apple,t8103-dpin", "apple,dpin"; + reg = <0x5 0x01e50000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + atc1_dpin1: displayport@501e58000 { + compatible = "apple,t8103-dpin", "apple,dpin"; + reg = <0x5 0x01e58000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + apciec1_piodma: dma-controller@522000000 { + compatible = "apple,t8103-pciec-piodma", "apple,pciec-piodma"; + reg = <0x5 0x22000000 0x0 0x4000>, + <0x5 0x22004000 0x0 0x4000>, + <0x5 0x22008000 0x0 0x4000>, + <0x5 0x20008000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + iommus = <&apciec1_dart 15>; + status = "disabled"; + }; +}; + +&{/soc} { + soc_errors: error-handler@200100000 { + compatible = "apple,t8103-error-handler", "apple,soc-error-handler"; + reg = <0x2 0x00100000 0x0 0x100000>, + <0x2 0x00000000 0x0 0x1000>, + <0x2 0x0001c000 0x0 0xc000>, + <0x2 0x00004000 0x0 0x14000>, + <0x2 0x00040000 0x0 0x1000>, + <0x2 0x0005c000 0x0 0xc000>, + <0x2 0x00044000 0x0 0x14000>, + <0x2 0x00080000 0x0 0x1000>, + <0x2 0x0009c000 0x0 0xc000>, + <0x2 0x00084000 0x0 0x14000>, + <0x2 0x000c0000 0x0 0x1000>, + <0x2 0x000dc000 0x0 0xc000>, + <0x2 0x000c4000 0x0 0x14000>, + <0x2 0x41440000 0x0 0x40000>, + <0x2 0x41400000 0x0 0x40000>, + <0x2 0x3b000000 0x0 0x70000>, + <0x2 0x3b700000 0x0 0x8c000>, + <0x2 0x00200000 0x0 0x200000>; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + , + , + , + , + , + , + ; + status = "disabled"; + }; + + soc_events: event-log@23b700000 { + compatible = "apple,t8103-event-log", "apple,soc-event-log"; + reg = <0x2 0x3b700000 0x0 0x8c000>, + <0x2 0x3d280000 0x0 0x74000>, + <0x2 0x3b000000 0x0 0x70000>, + <0x2 0x3d200000 0x0 0x80000>, + <0x2 0x3b2c4000 0x0 0x4000>, + <0x2 0x3b2c8000 0x0 0x4000>, + <0x2 0x3b2cc000 0x0 0x4000>, + <0x2 0x3b2c0000 0x0 0x4000>, + <0x2 0x3b280000 0x0 0x8000>, + <0x2 0x3b288000 0x0 0x8000>, + <0x2 0x3b290000 0x0 0x8000>, + <0x2 0x3b298000 0x0 0x8000>, + <0x2 0x3b2a0000 0x0 0x8000>, + <0x2 0x3b2a8000 0x0 0x8000>, + <0x2 0x3b2b0000 0x0 0x8000>, + <0x2 0x6b868000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + status = "disabled"; + }; + + peripheral_clocks: clock-controller { + compatible = "apple,t8103-pmgr-clocks", "apple,pmgr-clocks"; + #clock-cells = <1>; + apple,pmgr = <&pmgr>; + status = "disabled"; + }; +}; + +&nub_spmi1 { + simetra: pmic@f { + compatible = "apple,simetra-pmic", "apple,spmi-nvmem"; + reg = <0xf SPMI_USID>; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t8103.dtsi b/arch/arm64/boot/dts/apple/t8103.dtsi index 3ae5a351d55f3..a8dc0a6f398bd 100644 --- a/arch/arm64/boot/dts/apple/t8103.dtsi +++ b/arch/arm64/boot/dts/apple/t8103.dtsi @@ -2294,3 +2294,5 @@ &ps_ane_set5 { status = "okay"; }; + +#include "t8103-peripherals.dtsi" From 28819ebfc9a01f28417446a29364616516a59ac0 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 01:41:20 +1100 Subject: [PATCH 2/6] arm64: dts: apple: retain disabled M1 board control and PMIC interfaces Describe the primary SPMI event block separately from the active polled bus, and keep battery-monitor and first-generation NFC endpoints disabled. Add address-only board control descriptions without firmware payloads or ownership changes. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../devicetree/bindings/misc/apple,hcpm.yaml | 30 +++++++++++ .../misc/apple,touchbar-calibration.yaml | 30 +++++++++++ .../bindings/misc/apple,touchbar-driver.yaml | 30 +++++++++++ .../net/nfc/apple,stockholm-spmi.yaml | 37 +++++++++++++ .../power/supply/apple,battery-monitor.yaml | 2 + .../bindings/spmi/apple,spmi-monitor.yaml | 52 +++++++++++++++++++ .../devicetree/bindings/spmi/apple,spmi.yaml | 4 +- .../boot/dts/apple/t8103-j293-control.dtsi | 16 ++++++ .../boot/dts/apple/t8103-j456-control.dtsi | 8 +++ .../boot/dts/apple/t8103-j457-control.dtsi | 8 +++ .../boot/dts/apple/t8103-peripherals.dtsi | 40 ++++++++++++++ 11 files changed, 256 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/misc/apple,hcpm.yaml create mode 100644 Documentation/devicetree/bindings/misc/apple,touchbar-calibration.yaml create mode 100644 Documentation/devicetree/bindings/misc/apple,touchbar-driver.yaml create mode 100644 Documentation/devicetree/bindings/net/nfc/apple,stockholm-spmi.yaml create mode 100644 Documentation/devicetree/bindings/spmi/apple,spmi-monitor.yaml diff --git a/Documentation/devicetree/bindings/misc/apple,hcpm.yaml b/Documentation/devicetree/bindings/misc/apple,hcpm.yaml new file mode 100644 index 0000000000000..926127a6cc588 --- /dev/null +++ b/Documentation/devicetree/bindings/misc/apple,hcpm.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,hcpm.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple HCPM USB power control interface + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + I2C power control endpoint on the desktop port-management bus. + Firmware personality, update data and power policy are runtime data. + +properties: + compatible: + items: + - enum: + - apple,t8103-hcpm + - const: apple,hcpm + + reg: + maxItems: 1 + +required: + - compatible + - reg + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/misc/apple,touchbar-calibration.yaml b/Documentation/devicetree/bindings/misc/apple,touchbar-calibration.yaml new file mode 100644 index 0000000000000..fc0e5ce313dd2 --- /dev/null +++ b/Documentation/devicetree/bindings/misc/apple,touchbar-calibration.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,touchbar-calibration.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple Touch Bar calibration storage + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + I2C calibration storage associated with the Touch Bar. Contents and + per-unit data are not part of the static hardware description. + +properties: + compatible: + items: + - enum: + - apple,t8103-touchbar-calibration + - const: apple,touchbar-calibration + + reg: + maxItems: 1 + +required: + - compatible + - reg + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/misc/apple,touchbar-driver.yaml b/Documentation/devicetree/bindings/misc/apple,touchbar-driver.yaml new file mode 100644 index 0000000000000..2c9a4a2da11df --- /dev/null +++ b/Documentation/devicetree/bindings/misc/apple,touchbar-driver.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,touchbar-driver.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple Touch Bar I2C control interface + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + I2C control interface associated with the Touch Bar. Its register + protocol and ownership handoff remain unqualified. + +properties: + compatible: + items: + - enum: + - apple,t8103-touchbar-driver + - const: apple,touchbar-driver + + reg: + maxItems: 1 + +required: + - compatible + - reg + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/net/nfc/apple,stockholm-spmi.yaml b/Documentation/devicetree/bindings/net/nfc/apple,stockholm-spmi.yaml new file mode 100644 index 0000000000000..7187abfb733df --- /dev/null +++ b/Documentation/devicetree/bindings/net/nfc/apple,stockholm-spmi.yaml @@ -0,0 +1,37 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/nfc/apple,stockholm-spmi.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple first-generation Stockholm SPMI endpoint + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + The endpoint occupies an SPMI follower address and exports seven event + interrupts. Event roles and the firmware-controlled enable sequence are + unqualified. This description does not select the later NCI transport. + +properties: + compatible: + items: + - enum: + - apple,t8103-stockholm-spmi + - apple,t6000-stockholm-spmi + - const: apple,stockholm-spmi + + reg: + maxItems: 1 + + interrupts: + minItems: 7 + maxItems: 7 + +required: + - compatible + - reg + - interrupts + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/power/supply/apple,battery-monitor.yaml b/Documentation/devicetree/bindings/power/supply/apple,battery-monitor.yaml index 32385b877710b..3542f86cf069b 100644 --- a/Documentation/devicetree/bindings/power/supply/apple,battery-monitor.yaml +++ b/Documentation/devicetree/bindings/power/supply/apple,battery-monitor.yaml @@ -19,6 +19,8 @@ properties: compatible: items: - enum: + - apple,t8103-battery-monitor + - apple,t6000-battery-monitor - apple,t6041-battery-monitor - apple,t8140-battery-monitor - const: apple,battery-monitor diff --git a/Documentation/devicetree/bindings/spmi/apple,spmi-monitor.yaml b/Documentation/devicetree/bindings/spmi/apple,spmi-monitor.yaml new file mode 100644 index 0000000000000..de6dcf5c30405 --- /dev/null +++ b/Documentation/devicetree/bindings/spmi/apple,spmi-monitor.yaml @@ -0,0 +1,52 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/spmi/apple,spmi-monitor.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple first-generation SPMI secondary and event resources + +maintainers: + - Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> + +description: | + The primary PMIC bus is serviced by the polled SPMI driver. Its secondary + controller and interrupt-status apertures, and its external AIC interrupt, + remain firmware-owned. Describing them separately preserves the active + polled register window without enabling an unqualified interrupt path. + +properties: + compatible: + items: + - enum: + - apple,t8103-spmi-monitor + - apple,t6000-spmi-monitor + - const: apple,spmi-monitor + + reg: + items: + - description: Secondary controller registers + - description: Interrupt-status registers + + interrupts: + maxItems: 1 + + interrupt-controller: true + + "#interrupt-cells": + const: 2 + + "#address-cells": + const: 0 + + apple,controller: + $ref: /schemas/types.yaml#/definitions/phandle + description: Primary polled SPMI controller sharing these resources. + +required: + - compatible + - reg + - interrupts + - apple,controller + +additionalProperties: false diff --git a/Documentation/devicetree/bindings/spmi/apple,spmi.yaml b/Documentation/devicetree/bindings/spmi/apple,spmi.yaml index 0b35a017bb808..13f8600a80b33 100644 --- a/Documentation/devicetree/bindings/spmi/apple,spmi.yaml +++ b/Documentation/devicetree/bindings/spmi/apple,spmi.yaml @@ -39,7 +39,9 @@ properties: - const: apple,t8142-spmi reg: - maxItems: 1 + minItems: 1 + maxItems: 3 + description: Primary controller, secondary controller and interrupt-status apertures. interrupts: maxItems: 1 diff --git a/arch/arm64/boot/dts/apple/t8103-j293-control.dtsi b/arch/arm64/boot/dts/apple/t8103-j293-control.dtsi index 4a2c7465a9aec..8b8b6da30d738 100644 --- a/arch/arm64/boot/dts/apple/t8103-j293-control.dtsi +++ b/arch/arm64/boot/dts/apple/t8103-j293-control.dtsi @@ -29,3 +29,19 @@ }; }; }; + +&i2c4 { + touchbar_control: touchbar-driver@4c { + compatible = "apple,t8103-touchbar-driver", "apple,touchbar-driver"; + reg = <0x4c>; + status = "disabled"; + }; +}; + +&i2c4 { + touchbar_calibration: touchbar-calibration@50 { + compatible = "apple,t8103-touchbar-calibration", "apple,touchbar-calibration"; + reg = <0x50>; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t8103-j456-control.dtsi b/arch/arm64/boot/dts/apple/t8103-j456-control.dtsi index 6a126b0159828..233084a6d8e69 100644 --- a/arch/arm64/boot/dts/apple/t8103-j456-control.dtsi +++ b/arch/arm64/boot/dts/apple/t8103-j456-control.dtsi @@ -8,3 +8,11 @@ status = "disabled"; }; }; + +&i2c0 { + hcpm: hcpm@8 { + compatible = "apple,t8103-hcpm", "apple,hcpm"; + reg = <0x8>; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t8103-j457-control.dtsi b/arch/arm64/boot/dts/apple/t8103-j457-control.dtsi index 6a126b0159828..233084a6d8e69 100644 --- a/arch/arm64/boot/dts/apple/t8103-j457-control.dtsi +++ b/arch/arm64/boot/dts/apple/t8103-j457-control.dtsi @@ -8,3 +8,11 @@ status = "disabled"; }; }; + +&i2c0 { + hcpm: hcpm@8 { + compatible = "apple,t8103-hcpm", "apple,hcpm"; + reg = <0x8>; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t8103-peripherals.dtsi b/arch/arm64/boot/dts/apple/t8103-peripherals.dtsi index 4d2257ea8a58a..4339e2e0de4f0 100644 --- a/arch/arm64/boot/dts/apple/t8103-peripherals.dtsi +++ b/arch/arm64/boot/dts/apple/t8103-peripherals.dtsi @@ -811,3 +811,43 @@ status = "disabled"; }; }; + +&{/soc} { + primary_spmi_monitor: spmi-monitor@23d0d8e00 { + compatible = "apple,t8103-spmi-monitor", "apple,spmi-monitor"; + reg = <0x2 0x3d0d8e00 0x0 0x100>, + <0x2 0x3d0d8400 0x0 0x78>; + interrupt-parent = <&aic>; + interrupts = ; + apple,controller = <&nub_spmi>; + interrupt-controller; + #interrupt-cells = <2>; + #address-cells = <0>; + status = "disabled"; + }; +}; + +&pmic1 { + battery_monitor: battery-monitor { + compatible = "apple,t8103-battery-monitor", "apple,battery-monitor"; + interrupt-parent = <&primary_spmi_monitor>; + interrupts = <62 IRQ_TYPE_NONE>; + status = "disabled"; + }; +}; + +&aop_spmi1 { + stockholm: nfc@c { + compatible = "apple,t8103-stockholm-spmi", "apple,stockholm-spmi"; + reg = <0xc SPMI_USID>; + interrupt-parent = <&aop_spmi1>; + interrupts = <160 IRQ_TYPE_NONE>, + <161 IRQ_TYPE_NONE>, + <162 IRQ_TYPE_NONE>, + <163 IRQ_TYPE_NONE>, + <164 IRQ_TYPE_NONE>, + <165 IRQ_TYPE_NONE>, + <166 IRQ_TYPE_NONE>; + status = "disabled"; + }; +}; From c8c761c761f34c8bd33f4437f83f82f096c85f15 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 01:44:20 +1100 Subject: [PATCH 3/6] dt-bindings: apple: correct singleton arrays and preserve clock topology Keep registerless clock selectors outside the MMIO simple bus. Permit the early SPMI resource layout while preserving the one-window contract of other generations, and remove redundant singleton minimums required by schema validation. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../edac/apple,soc-error-handler.yaml | 45 +++++++++++++------ .../bindings/iommu/apple,ave-dma.yaml | 2 - .../devicetree/bindings/pwm/apple,pwm.yaml | 3 -- .../devicetree/bindings/spmi/apple,spmi.yaml | 17 +++++-- .../boot/dts/apple/t8103-peripherals.dtsi | 15 ++++--- 5 files changed, 54 insertions(+), 28 deletions(-) diff --git a/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml b/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml index a5bdb6cf48407..9d401c90cbd3e 100644 --- a/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml +++ b/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml @@ -215,13 +215,21 @@ allOf: contains: const: apple,t6002-error-handler then: - properties: - interrupts: - minItems: 268 - maxItems: 268 - reg: - minItems: 205 - maxItems: 205 + oneOf: + - properties: + interrupts: + minItems: 138 + maxItems: 138 + reg: + minItems: 104 + maxItems: 104 + - properties: + interrupts: + minItems: 130 + maxItems: 130 + reg: + minItems: 101 + maxItems: 101 required: - reg @@ -231,16 +239,25 @@ allOf: contains: const: apple,t6002-event-log then: - properties: - interrupts: - minItems: 54 - maxItems: 54 - reg: - minItems: 54 - maxItems: 54 + oneOf: + - properties: + interrupts: + minItems: 28 + maxItems: 28 + reg: + minItems: 28 + maxItems: 28 + - properties: + interrupts: + minItems: 26 + maxItems: 26 + reg: + minItems: 26 + maxItems: 26 required: - reg + additionalProperties: false examples: diff --git a/Documentation/devicetree/bindings/iommu/apple,ave-dma.yaml b/Documentation/devicetree/bindings/iommu/apple,ave-dma.yaml index 447b2b541cd33..9421d6e38377a 100644 --- a/Documentation/devicetree/bindings/iommu/apple,ave-dma.yaml +++ b/Documentation/devicetree/bindings/iommu/apple,ave-dma.yaml @@ -31,11 +31,9 @@ properties: maxItems: 2 interrupts: - minItems: 1 maxItems: 1 power-domains: - minItems: 1 maxItems: 1 required: diff --git a/Documentation/devicetree/bindings/pwm/apple,pwm.yaml b/Documentation/devicetree/bindings/pwm/apple,pwm.yaml index d5f2bbbbfc06e..e4cd94221e1e5 100644 --- a/Documentation/devicetree/bindings/pwm/apple,pwm.yaml +++ b/Documentation/devicetree/bindings/pwm/apple,pwm.yaml @@ -28,15 +28,12 @@ properties: - const: apple,pwm reg: - minItems: 1 maxItems: 1 interrupts: - minItems: 1 maxItems: 1 power-domains: - minItems: 1 maxItems: 1 required: diff --git a/Documentation/devicetree/bindings/spmi/apple,spmi.yaml b/Documentation/devicetree/bindings/spmi/apple,spmi.yaml index 13f8600a80b33..b26338557a84e 100644 --- a/Documentation/devicetree/bindings/spmi/apple,spmi.yaml +++ b/Documentation/devicetree/bindings/spmi/apple,spmi.yaml @@ -11,9 +11,6 @@ maintainers: description: A SPMI controller present on most Apple SoCs -allOf: - - $ref: spmi.yaml# - properties: compatible: oneOf: @@ -64,6 +61,20 @@ dependentRequired: - "#interrupt-cells" - interrupts +# New controller descriptions retain all three windows without changing the +# register contract of other generations. +allOf: + - $ref: spmi.yaml# + - if: + properties: + compatible: + contains: + enum: ["apple,t8103-spmi", "apple,t6000-spmi"] + else: + properties: + reg: + maxItems: 1 + unevaluatedProperties: false examples: diff --git a/arch/arm64/boot/dts/apple/t8103-peripherals.dtsi b/arch/arm64/boot/dts/apple/t8103-peripherals.dtsi index 4339e2e0de4f0..b6b1e89162636 100644 --- a/arch/arm64/boot/dts/apple/t8103-peripherals.dtsi +++ b/arch/arm64/boot/dts/apple/t8103-peripherals.dtsi @@ -796,12 +796,6 @@ status = "disabled"; }; - peripheral_clocks: clock-controller { - compatible = "apple,t8103-pmgr-clocks", "apple,pmgr-clocks"; - #clock-cells = <1>; - apple,pmgr = <&pmgr>; - status = "disabled"; - }; }; &nub_spmi1 { @@ -851,3 +845,12 @@ status = "disabled"; }; }; + +/ { + peripheral_clocks: clock-controller { + compatible = "apple,t8103-pmgr-clocks", "apple,pmgr-clocks"; + #clock-cells = <1>; + apple,pmgr = <&pmgr>; + status = "disabled"; + }; +}; From c789811d4f02c6c690949a05406d33aff8d5b39d Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 02:03:17 +1100 Subject: [PATCH 4/6] dt-bindings: edac: apple: remove redundant schema spacing Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../devicetree/bindings/edac/apple,soc-error-handler.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml b/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml index 9d401c90cbd3e..61881c3248c14 100644 --- a/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml +++ b/Documentation/devicetree/bindings/edac/apple,soc-error-handler.yaml @@ -257,7 +257,6 @@ allOf: required: - reg - additionalProperties: false examples: From f357650f3a190281de53b9864a674c8698377d79 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 02:38:45 +1100 Subject: [PATCH 5/6] arm64: dts: apple: retain the primary PMIC event without changing polled access Record the native PMIC event through the disabled SPMI monitor. The existing NVMEM driver does not consume IRQs; no primary-controller IRQ mode or existing access policy changes. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../devicetree/bindings/nvmem/apple,spmi-nvmem.yaml | 4 ++++ arch/arm64/boot/dts/apple/t8103-peripherals.dtsi | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml b/Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml index 00976bc2fd7a0..0294cb351cc20 100644 --- a/Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml +++ b/Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml @@ -32,6 +32,10 @@ properties: reg: maxItems: 1 + interrupts: + maxItems: 1 + description: Native event in the SPMI interrupt domain. + battery-monitor: $ref: /schemas/power/supply/apple,battery-monitor.yaml# diff --git a/arch/arm64/boot/dts/apple/t8103-peripherals.dtsi b/arch/arm64/boot/dts/apple/t8103-peripherals.dtsi index b6b1e89162636..d8d908f27d18c 100644 --- a/arch/arm64/boot/dts/apple/t8103-peripherals.dtsi +++ b/arch/arm64/boot/dts/apple/t8103-peripherals.dtsi @@ -854,3 +854,8 @@ status = "disabled"; }; }; + +&pmic1 { + interrupt-parent = <&primary_spmi_monitor>; + interrupts = <2 IRQ_TYPE_NONE>; +}; From bf29e33f794fda20e7901a098861735b5b283072 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 04:46:04 +1100 Subject: [PATCH 6/6] dt-bindings: nvmem: apple: deduplicate the merged PMIC event definition Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml b/Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml index ad85382d4761e..fe8b2001f4fa5 100644 --- a/Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml +++ b/Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml @@ -40,9 +40,6 @@ properties: battery-monitor: $ref: /schemas/power/supply/apple,battery-monitor.yaml# - interrupts: - maxItems: 1 - rtc: $ref: /schemas/rtc/apple,j700-pmu-rtc.yaml#