From 82e661f274f9e3a3b9819649e519f5177bb3a4a9 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 01:41:54 +1100 Subject: [PATCH 1/2] dt-bindings: apple: cover reference Mac motion, PMIC and audio identities Extend the existing motion and PMIC bindings for J316s and J413. Reuse the merged register-bearing DisplayPort-audio binding for T8112 and allow the t8103 SPI/SPMI fallbacks on the new T6000/T8112 controllers. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- .../devicetree/bindings/iio/imu/apple,aop-motion.yaml | 4 ++++ Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml | 2 ++ .../devicetree/bindings/sound/apple,t6000-dpaudio.yaml | 4 +++- Documentation/devicetree/bindings/spi/apple,spi.yaml | 2 ++ Documentation/devicetree/bindings/spmi/apple,spmi.yaml | 2 ++ 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/iio/imu/apple,aop-motion.yaml b/Documentation/devicetree/bindings/iio/imu/apple,aop-motion.yaml index e358c89ab18a3..2fe2474ee0987 100644 --- a/Documentation/devicetree/bindings/iio/imu/apple,aop-motion.yaml +++ b/Documentation/devicetree/bindings/iio/imu/apple,aop-motion.yaml @@ -25,12 +25,16 @@ properties: oneOf: - items: - enum: + - apple,t6000-aop-accel - apple,t6041-aop-accel + - apple,t8112-aop-accel - apple,t8132-aop-accel - const: apple,aop-accel - items: - enum: + - apple,t6000-aop-gyro - apple,t6041-aop-gyro + - apple,t8112-aop-gyro - apple,t8132-aop-gyro - const: apple,aop-gyro diff --git a/Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml b/Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml index bd28dc14068e1..fa484e773d5a9 100644 --- a/Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml +++ b/Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml @@ -22,8 +22,10 @@ properties: - apple,baku-pmic - apple,chapel-pmic - apple,maverick-pmic + - apple,monaco-pmic - apple,sera-pmic - apple,stowe-pmic + - apple,vale-pmic - const: apple,spmi-nvmem reg: diff --git a/Documentation/devicetree/bindings/sound/apple,t6000-dpaudio.yaml b/Documentation/devicetree/bindings/sound/apple,t6000-dpaudio.yaml index 7c409d4ea2c72..09d72dc6412fd 100644 --- a/Documentation/devicetree/bindings/sound/apple,t6000-dpaudio.yaml +++ b/Documentation/devicetree/bindings/sound/apple,t6000-dpaudio.yaml @@ -4,7 +4,7 @@ $id: http://devicetree.org/schemas/sound/apple,t6000-dpaudio.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Apple T6000 and T6020 DisplayPort audio +title: Apple T6000, T6020 and T8112 DisplayPort audio maintainers: - Ryan Murray @@ -22,6 +22,7 @@ select: enum: - apple,t6000-dpaudio - apple,t6020-dpaudio + - apple,t8112-dpaudio required: - compatible @@ -31,6 +32,7 @@ properties: - enum: - apple,t6000-dpaudio - apple,t6020-dpaudio + - apple,t8112-dpaudio - const: apple,dpaudio reg: diff --git a/Documentation/devicetree/bindings/spi/apple,spi.yaml b/Documentation/devicetree/bindings/spi/apple,spi.yaml index 515d3dab78b65..46f9330f5ea55 100644 --- a/Documentation/devicetree/bindings/spi/apple,spi.yaml +++ b/Documentation/devicetree/bindings/spi/apple,spi.yaml @@ -17,10 +17,12 @@ properties: oneOf: - items: - enum: + - apple,t6000-spi - apple,t6020-spi - apple,t6030-spi - apple,t6031-spi - apple,t6041-spi + - apple,t8112-spi - apple,t8122-spi - apple,t8132-spi - apple,t8140-spi diff --git a/Documentation/devicetree/bindings/spmi/apple,spmi.yaml b/Documentation/devicetree/bindings/spmi/apple,spmi.yaml index 0b35a017bb808..4caa16e98ab8e 100644 --- a/Documentation/devicetree/bindings/spmi/apple,spmi.yaml +++ b/Documentation/devicetree/bindings/spmi/apple,spmi.yaml @@ -19,12 +19,14 @@ properties: oneOf: - items: - enum: + - apple,t6000-spmi - apple,t6020-spmi - apple,t6030-spmi - apple,t6031-spmi - apple,t6041-spmi - apple,t8012-spmi - apple,t8015-spmi + - apple,t8112-spmi - apple,t8122-spmi - apple,t8132-spmi - apple,t8140-spmi From 165f4bd7ffcfd6d3f84dccb32d9c12f6d4111d28 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 01:41:54 +1100 Subject: [PATCH 2/2] arm64: dts: apple: describe reference Mac motion and peripheral endpoints Describe SPI4 and additional SPMI controllers, with board-specific motion services and read-only auxiliary PMIC endpoints from the saved J316s/J413 hardware trees. Every new node stays disabled. Remove unused T8112 reset-domains properties without changing DMA, power or display routes. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- arch/arm64/boot/dts/apple/t6000-j316s.dts | 48 ++++++++++++++++++ arch/arm64/boot/dts/apple/t600x-die0.dtsi | 60 +++++++++++++++++++++++ arch/arm64/boot/dts/apple/t8112-j413.dts | 19 +++++++ arch/arm64/boot/dts/apple/t8112.dtsi | 38 +++++++++++++- 4 files changed, 163 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t6000-j316s.dts b/arch/arm64/boot/dts/apple/t6000-j316s.dts index 8ec8a0c91715c..5fca6c4d4a8c9 100644 --- a/arch/arm64/boot/dts/apple/t6000-j316s.dts +++ b/arch/arm64/boot/dts/apple/t6000-j316s.dts @@ -72,6 +72,54 @@ apple,machine-kind = "MacBook Pro"; }; +&aop { + accel { + compatible = "apple,t6000-aop-accel", "apple,aop-accel"; + status = "disabled"; + }; + + gyro { + compatible = "apple,t6000-aop-gyro", "apple,aop-gyro"; + status = "disabled"; + }; +}; + +&nub_spmi1 { + pmic@e { + compatible = "apple,maverick-pmic", "apple,spmi-nvmem"; + reg = <0xe SPMI_USID>; + read-only; + status = "disabled"; + }; +}; + +&clvr_spmi0 { + pmic@f { + compatible = "apple,monaco-pmic", "apple,spmi-nvmem"; + reg = <0xf SPMI_USID>; + read-only; + status = "disabled"; + }; +}; + +&clvr_spmi1 { + pmic@f { + compatible = "apple,monaco-pmic", "apple,spmi-nvmem"; + reg = <0xf SPMI_USID>; + read-only; + status = "disabled"; + }; +}; + +&clvr_spmi2 { + pmic@f { + compatible = "apple,monaco-pmic", "apple,spmi-nvmem"; + reg = <0xf SPMI_USID>; + read-only; + status = "disabled"; + }; +}; + &sound { compatible = "apple,j316-macaudio", "apple,macaudio"; model = "MacBook Pro J316"; diff --git a/arch/arm64/boot/dts/apple/t600x-die0.dtsi b/arch/arm64/boot/dts/apple/t600x-die0.dtsi index 8ccbc3e45971f..dd36e7e53ebea 100644 --- a/arch/arm64/boot/dts/apple/t600x-die0.dtsi +++ b/arch/arm64/boot/dts/apple/t600x-die0.dtsi @@ -90,6 +90,30 @@ status = "disabled"; }; + clvr_spmi0: spmi@28e501100 { + compatible = "apple,t6000-spmi", "apple,t8103-spmi"; + reg = <0x2 0x8e501100 0x0 0x100>; + #address-cells = <2>; + #size-cells = <0>; + status = "disabled"; + }; + + clvr_spmi1: spmi@28e509100 { + compatible = "apple,t6000-spmi", "apple,t8103-spmi"; + reg = <0x2 0x8e509100 0x0 0x100>; + #address-cells = <2>; + #size-cells = <0>; + status = "disabled"; + }; + + clvr_spmi2: spmi@28e511100 { + compatible = "apple,t6000-spmi", "apple,t8103-spmi"; + reg = <0x2 0x8e511100 0x0 0x100>; + #address-cells = <2>; + #size-cells = <0>; + status = "disabled"; + }; + nco: clock-controller@28e03c000 { compatible = "apple,t6000-nco", "apple,nco"; reg = <0x2 0x8e03c000 0x0 0x14000>; @@ -435,6 +459,14 @@ }; }; + nub_spmi1: spmi@2920a9300 { + compatible = "apple,t6000-spmi", "apple,t8103-spmi"; + reg = <0x2 0x920a9300 0x0 0x100>; + #address-cells = <2>; + #size-cells = <0>; + status = "disabled"; + }; + wdt: watchdog@2922b0000 { compatible = "apple,t6000-wdt", "apple,wdt"; reg = <0x2 0x922b0000 0x0 0x4000>; @@ -466,6 +498,22 @@ status = "disabled"; }; + aop_spmi0: spmi@293829300 { + compatible = "apple,t6000-spmi", "apple,t8103-spmi"; + reg = <0x2 0x93829300 0x0 0x100>; + #address-cells = <2>; + #size-cells = <0>; + status = "disabled"; + }; + + aop_spmi1: spmi@29382d300 { + compatible = "apple,t6000-spmi", "apple,t8103-spmi"; + reg = <0x2 0x9382d300 0x0 0x100>; + #address-cells = <2>; + #size-cells = <0>; + status = "disabled"; + }; + aop_admac: dma-controller@293980000 { compatible = "apple,t6000-admac", "apple,admac"; reg = <0x2 0x93980000 0x0 0x34000>; @@ -787,6 +835,18 @@ status = "disabled"; }; + spi4: spi@39b110000 { + compatible = "apple,t6000-spi", "apple,t8103-spi"; + reg = <0x3 0x9b110000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #address-cells = <1>; + #size-cells = <0>; + clocks = <&clkref>; + power-domains = <&ps_spi4>; + status = "disabled"; + }; + serial0: serial@39b200000 { compatible = "apple,s5l-uart"; reg = <0x3 0x9b200000 0x0 0x1000>; diff --git a/arch/arm64/boot/dts/apple/t8112-j413.dts b/arch/arm64/boot/dts/apple/t8112-j413.dts index 86314d4ecc0ca..1af1fb5e5e86a 100644 --- a/arch/arm64/boot/dts/apple/t8112-j413.dts +++ b/arch/arm64/boot/dts/apple/t8112-j413.dts @@ -182,6 +182,16 @@ &aop { status = "okay"; + + accel { + compatible = "apple,t8112-aop-accel", "apple,aop-accel"; + status = "disabled"; + }; + + gyro { + compatible = "apple,t8112-aop-gyro", "apple,aop-gyro"; + status = "disabled"; + }; }; &aop_audio { @@ -292,3 +302,12 @@ &pmp_report_isp_sys { status = "okay"; }; + +&nub_spmi1 { + pmic@e { + compatible = "apple,vale-pmic", "apple,spmi-nvmem"; + reg = <0xe SPMI_USID>; + read-only; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t8112.dtsi b/arch/arm64/boot/dts/apple/t8112.dtsi index 23369ae0246a2..ec3c2e968ff93 100644 --- a/arch/arm64/boot/dts/apple/t8112.dtsi +++ b/arch/arm64/boot/dts/apple/t8112.dtsi @@ -961,6 +961,18 @@ status = "disabled"; /* only used in J493 */ }; + spi4: spi@235110000 { + compatible = "apple,t8112-spi", "apple,t8103-spi"; + reg = <0x2 0x35110000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + clocks = <&clkref>; + power-domains = <&ps_spi4>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + serial0: serial@235200000 { compatible = "apple,s5l-uart"; reg = <0x2 0x35200000 0x0 0x1000>; @@ -1035,7 +1047,6 @@ dmas = <&sio 0x64>; dma-names = "tx"; power-domains = <&ps_dpa0>; - reset-domains = <&ps_dpa0>; status = "disabled"; ports { @@ -1056,7 +1067,6 @@ dmas = <&sio 0x66>; dma-names = "tx"; power-domains = <&ps_dpa1>; - reset-domains = <&ps_dpa1>; status = "disabled"; ports { @@ -1484,6 +1494,14 @@ }; }; + nub_spmi1: spmi@23d794000 { + compatible = "apple,t8112-spmi", "apple,t8103-spmi"; + reg = <0x2 0x3d794000 0x0 0x100>; + #address-cells = <2>; + #size-cells = <0>; + status = "disabled"; + }; + smc: smc@23e400000 { compatible = "apple,t8112-smc", "apple,smc"; reg = <0x2 0x3e400000 0x0 0x4000>, @@ -1602,6 +1620,22 @@ status = "disabled"; }; + aop_spmi0: spmi@24a894000 { + compatible = "apple,t8112-spmi", "apple,t8103-spmi"; + reg = <0x2 0x4a894000 0x0 0x100>; + #address-cells = <2>; + #size-cells = <0>; + status = "disabled"; + }; + + aop_spmi1: spmi@24a8d4000 { + compatible = "apple,t8112-spmi", "apple,t8103-spmi"; + reg = <0x2 0x4a8d4000 0x0 0x100>; + #address-cells = <2>; + #size-cells = <0>; + status = "disabled"; + }; + aop_admac: dma-controller@24a980000 { compatible = "apple,t8112-admac", "apple,admac"; reg = <0x2 0x4a980000 0x0 0x34000>;