From 2361f9eda52d6425474dbd9aaa56c0265ce981f5 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 00:22:50 +1100 Subject: [PATCH 1/4] arm64: dts: apple: describe M4 Pro and Max sibling boards Add J614c, J575c and J773s board descriptions with disabled headphone codecs and amplifiers. Resolve their board GPIO references against the integration pin controller label. Shared T604x resources remain owned by the J616s series. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- arch/arm64/boot/dts/apple/Makefile | 3 + .../boot/dts/apple/t6040-j773s-audio.dtsi | 40 +++++++++ arch/arm64/boot/dts/apple/t6040-j773s.dts | 52 +++++++++++ .../boot/dts/apple/t6041-j575c-audio.dtsi | 40 +++++++++ arch/arm64/boot/dts/apple/t6041-j575c.dts | 56 ++++++++++++ .../boot/dts/apple/t6041-j614c-audio.dtsi | 88 +++++++++++++++++++ arch/arm64/boot/dts/apple/t6041-j614c.dts | 56 ++++++++++++ 7 files changed, 335 insertions(+) create mode 100644 arch/arm64/boot/dts/apple/t6040-j773s-audio.dtsi create mode 100644 arch/arm64/boot/dts/apple/t6040-j773s.dts create mode 100644 arch/arm64/boot/dts/apple/t6041-j575c-audio.dtsi create mode 100644 arch/arm64/boot/dts/apple/t6041-j575c.dts create mode 100644 arch/arm64/boot/dts/apple/t6041-j614c-audio.dtsi create mode 100644 arch/arm64/boot/dts/apple/t6041-j614c.dts diff --git a/arch/arm64/boot/dts/apple/Makefile b/arch/arm64/boot/dts/apple/Makefile index 52b15f4bdb8cb..22216f2ded901 100644 --- a/arch/arm64/boot/dts/apple/Makefile +++ b/arch/arm64/boot/dts/apple/Makefile @@ -120,3 +120,6 @@ dtb-$(CONFIG_ARCH_APPLE) += t8142-j813.dtb dtb-$(CONFIG_ARCH_APPLE) += t8152-j873g.dtb # Explicit cold-ANE lead test; never select as the production board DTB. +dtb-$(CONFIG_ARCH_APPLE) += t6041-j614c.dtb +dtb-$(CONFIG_ARCH_APPLE) += t6041-j575c.dtb +dtb-$(CONFIG_ARCH_APPLE) += t6040-j773s.dtb diff --git a/arch/arm64/boot/dts/apple/t6040-j773s-audio.dtsi b/arch/arm64/boot/dts/apple/t6040-j773s-audio.dtsi new file mode 100644 index 0000000000000..f269726a296f5 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t6040-j773s-audio.dtsi @@ -0,0 +1,40 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* J773S audio endpoints. Keep the routes and hardware disabled until qualified. */ + +#include +#include + +/ { + speaker_sdz: regulator-speaker-sdz { + compatible = "regulator-fixed"; + regulator-name = "speaker-sdz"; + gpios = <&pinctrl 54 GPIO_ACTIVE_HIGH>; + enable-active-high; + status = "disabled"; + }; +}; + +&i2c1 { + audio_speaker: codec@38 { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x38>; + #sound-dai-cells = <0>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + interrupts-extended = <&pinctrl 55 IRQ_TYPE_LEVEL_LOW>; + status = "disabled"; + }; + +}; + +&i2c2 { + audio_codec_output: codec@4b { + compatible = "cirrus,cs42l84"; + reg = <0x4b>; + #sound-dai-cells = <0>; + reset-gpios = <&pinctrl_nub 58 GPIO_ACTIVE_HIGH>; + interrupts-extended = <&pinctrl 106 IRQ_TYPE_LEVEL_LOW>; + status = "disabled"; + }; + +}; diff --git a/arch/arm64/boot/dts/apple/t6040-j773s.dts b/arch/arm64/boot/dts/apple/t6040-j773s.dts new file mode 100644 index 0000000000000..dc1234a21eb13 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t6040-j773s.dts @@ -0,0 +1,52 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* Apple Mac mini (M4 Pro, 2024). Unqualified peripherals remain disabled. */ + +/dts-v1/; + +#include "t6040.dtsi" + +/ { + compatible = "apple,j773s", "apple,t6040", "apple,arm-platform"; + model = "Apple Mac mini (M4 Pro, 2024)"; + chassis-type = "desktop"; + + aliases { + serial0 = &serial0; + sep = &sep; + pmp = &pmp; + gpu = &gpu; + }; + + chosen { + #address-cells = <2>; + #size-cells = <2>; + ranges; + stdout-path = "serial0:115200n8"; + + framebuffer0: framebuffer@0 { + compatible = "apple,simple-framebuffer", "simple-framebuffer"; + reg = <0 0 0 0>; + /* The loader supplies this boot's framebuffer allocation. */ + status = "disabled"; + }; + }; + + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + /* Runtime firmware reservations are supplied by the loader. */ + }; + + memory@0 { + device_type = "memory"; + reg = <0 0 0 0>; /* Filled by the loader. */ + }; +}; + +&serial0 { + status = "okay"; +}; + + +#include "t6040-j773s-audio.dtsi" diff --git a/arch/arm64/boot/dts/apple/t6041-j575c-audio.dtsi b/arch/arm64/boot/dts/apple/t6041-j575c-audio.dtsi new file mode 100644 index 0000000000000..efa6ef2430220 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t6041-j575c-audio.dtsi @@ -0,0 +1,40 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* J575C audio endpoints. Keep the routes and hardware disabled until qualified. */ + +#include +#include + +/ { + speaker_sdz: regulator-speaker-sdz { + compatible = "regulator-fixed"; + regulator-name = "speaker-sdz"; + gpios = <&pinctrl 54 GPIO_ACTIVE_HIGH>; + enable-active-high; + status = "disabled"; + }; +}; + +&i2c1 { + audio_speaker: codec@38 { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x38>; + #sound-dai-cells = <0>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + interrupts-extended = <&pinctrl 55 IRQ_TYPE_LEVEL_LOW>; + status = "disabled"; + }; + +}; + +&i2c2 { + audio_codec_output: codec@4b { + compatible = "cirrus,cs42l84"; + reg = <0x4b>; + #sound-dai-cells = <0>; + reset-gpios = <&pinctrl_nub 58 GPIO_ACTIVE_HIGH>; + interrupts-extended = <&pinctrl 106 IRQ_TYPE_LEVEL_LOW>; + status = "disabled"; + }; + +}; diff --git a/arch/arm64/boot/dts/apple/t6041-j575c.dts b/arch/arm64/boot/dts/apple/t6041-j575c.dts new file mode 100644 index 0000000000000..21cb2671836e1 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t6041-j575c.dts @@ -0,0 +1,56 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* Apple Mac Studio (M4 Max, 2025). Unqualified peripherals remain disabled. */ + +/dts-v1/; + +#include "t6041.dtsi" + +/ { + compatible = "apple,j575c", "apple,t6041", "apple,arm-platform"; + model = "Apple Mac Studio (M4 Max, 2025)"; + chassis-type = "desktop"; + + aliases { + serial0 = &serial0; + sep = &sep; + pmp = &pmp; + gpu = &gpu; + }; + + chosen { + #address-cells = <2>; + #size-cells = <2>; + ranges; + stdout-path = "serial0:115200n8"; + + framebuffer0: framebuffer@0 { + compatible = "apple,simple-framebuffer", "simple-framebuffer"; + reg = <0 0 0 0>; + /* The loader supplies this boot's framebuffer allocation. */ + status = "disabled"; + }; + }; + + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + /* Runtime firmware reservations are supplied by the loader. */ + }; + + memory@0 { + device_type = "memory"; + reg = <0 0 0 0>; /* Filled by the loader. */ + }; +}; + +&serial0 { + status = "okay"; +}; + +/* The Max console has the same register interface as the Pro. */ +&serial0 { + reg = <0x4 0x29200000 0 0x4000>; +}; + +#include "t6041-j575c-audio.dtsi" diff --git a/arch/arm64/boot/dts/apple/t6041-j614c-audio.dtsi b/arch/arm64/boot/dts/apple/t6041-j614c-audio.dtsi new file mode 100644 index 0000000000000..4b07519f0a2c4 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t6041-j614c-audio.dtsi @@ -0,0 +1,88 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* J614C audio endpoints. Keep the routes and hardware disabled until qualified. */ + +#include +#include + +/ { + speaker_sdz: regulator-speaker-sdz { + compatible = "regulator-fixed"; + regulator-name = "speaker-sdz"; + gpios = <&pinctrl 54 GPIO_ACTIVE_HIGH>; + enable-active-high; + status = "disabled"; + }; +}; + +&i2c1 { + audio_speaker: codec@38 { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x38>; + #sound-dai-cells = <0>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + interrupts-extended = <&pinctrl 55 IRQ_TYPE_LEVEL_LOW>; + status = "disabled"; + }; + + audio_speaker_left_woofer_2: codec@39 { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x39>; + #sound-dai-cells = <0>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + status = "disabled"; + }; + + audio_speaker_left_tweeter: codec@3a { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x3a>; + #sound-dai-cells = <0>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + status = "disabled"; + }; + +}; + +&i2c2 { + audio_codec_output: codec@4b { + compatible = "cirrus,cs42l84"; + reg = <0x4b>; + #sound-dai-cells = <0>; + reset-gpios = <&pinctrl_nub 58 GPIO_ACTIVE_HIGH>; + interrupts-extended = <&pinctrl 106 IRQ_TYPE_LEVEL_LOW>; + status = "disabled"; + }; + +}; + +&i2c3 { + audio_speaker_right_woofer_1: codec@3b { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x3b>; + #sound-dai-cells = <0>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + status = "disabled"; + }; + + audio_speaker_right_woofer_2: codec@3c { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x3c>; + #sound-dai-cells = <0>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + status = "disabled"; + }; + + audio_speaker_right_tweeter: codec@3d { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x3d>; + #sound-dai-cells = <0>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + status = "disabled"; + }; + +}; diff --git a/arch/arm64/boot/dts/apple/t6041-j614c.dts b/arch/arm64/boot/dts/apple/t6041-j614c.dts new file mode 100644 index 0000000000000..c92c8e68c4d2d --- /dev/null +++ b/arch/arm64/boot/dts/apple/t6041-j614c.dts @@ -0,0 +1,56 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* Apple MacBook Pro (14-inch, M4 Max, 2024). Unqualified peripherals remain disabled. */ + +/dts-v1/; + +#include "t6041.dtsi" + +/ { + compatible = "apple,j614c", "apple,t6041", "apple,arm-platform"; + model = "Apple MacBook Pro (14-inch, M4 Max, 2024)"; + chassis-type = "laptop"; + + aliases { + serial0 = &serial0; + sep = &sep; + pmp = &pmp; + gpu = &gpu; + }; + + chosen { + #address-cells = <2>; + #size-cells = <2>; + ranges; + stdout-path = "serial0:115200n8"; + + framebuffer0: framebuffer@0 { + compatible = "apple,simple-framebuffer", "simple-framebuffer"; + reg = <0 0 0 0>; + /* The loader supplies this boot's framebuffer allocation. */ + status = "disabled"; + }; + }; + + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + /* Runtime firmware reservations are supplied by the loader. */ + }; + + memory@0 { + device_type = "memory"; + reg = <0 0 0 0>; /* Filled by the loader. */ + }; +}; + +&serial0 { + status = "okay"; +}; + +/* The Max console has the same register interface as the Pro. */ +&serial0 { + reg = <0x4 0x29200000 0 0x4000>; +}; + +#include "t6041-j614c-audio.dtsi" From f7526ebe9a6f3942680ec305f5ebfbab2270da33 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 01:36:20 +1100 Subject: [PATCH 2/4] arm64: dts: apple: leave new sibling UARTs disabled Keep the initial board descriptions free of enablement changes as required by DT2 ADDENDUM 3. Preserve their console aliases and register descriptions for a separate qualified enablement change. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- arch/arm64/boot/dts/apple/t6040-j773s.dts | 4 +--- arch/arm64/boot/dts/apple/t6041-j575c.dts | 4 +--- arch/arm64/boot/dts/apple/t6041-j614c.dts | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t6040-j773s.dts b/arch/arm64/boot/dts/apple/t6040-j773s.dts index dc1234a21eb13..ff7d77c28ff96 100644 --- a/arch/arm64/boot/dts/apple/t6040-j773s.dts +++ b/arch/arm64/boot/dts/apple/t6040-j773s.dts @@ -44,9 +44,7 @@ }; }; -&serial0 { - status = "okay"; -}; +/* UART enablement is qualified separately from this description. */ #include "t6040-j773s-audio.dtsi" diff --git a/arch/arm64/boot/dts/apple/t6041-j575c.dts b/arch/arm64/boot/dts/apple/t6041-j575c.dts index 21cb2671836e1..f32eaf67f17fc 100644 --- a/arch/arm64/boot/dts/apple/t6041-j575c.dts +++ b/arch/arm64/boot/dts/apple/t6041-j575c.dts @@ -44,9 +44,7 @@ }; }; -&serial0 { - status = "okay"; -}; +/* UART enablement is qualified separately from this description. */ /* The Max console has the same register interface as the Pro. */ &serial0 { diff --git a/arch/arm64/boot/dts/apple/t6041-j614c.dts b/arch/arm64/boot/dts/apple/t6041-j614c.dts index c92c8e68c4d2d..91510f73c1ce4 100644 --- a/arch/arm64/boot/dts/apple/t6041-j614c.dts +++ b/arch/arm64/boot/dts/apple/t6041-j614c.dts @@ -44,9 +44,7 @@ }; }; -&serial0 { - status = "okay"; -}; +/* UART enablement is qualified separately from this description. */ /* The Max console has the same register interface as the Pro. */ &serial0 { From 30f87ea48eaa254b610854e0dea714bd1a1e1d40 Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 03:04:11 +1100 Subject: [PATCH 3/4] arm64: dts: apple: describe both disabled M4 Max scalers Add both Max scaler apertures, IRQ pairs, DART streams and clock selectors on J614c, J616c and J575c from the preferred live J616c description, cross-checked against the sibling templates. Restore only their disabled physical power providers. Give the DART requests their MSRn-DART labels, preserving the verified PMGR alias to the physical MSRn domain instead of inventing duplicate MMIO providers. Use only MSRn-V and ASE_CORE for engine domains; keep scaler1 absent from live-pruned T6040 descriptions. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- arch/arm64/boot/dts/apple/t6041-j575c.dts | 1 + .../apple/t6041-j614-j616-j575-scaler.dtsi | 188 ++++++++++++++++++ arch/arm64/boot/dts/apple/t6041-j614c.dts | 1 + arch/arm64/boot/dts/apple/t6041-j616c.dts | 1 + arch/arm64/boot/dts/apple/t604x-pmgr.dtsi | 3 +- arch/arm64/boot/dts/apple/t604x.dtsi | 2 +- 6 files changed, 194 insertions(+), 2 deletions(-) create mode 100644 arch/arm64/boot/dts/apple/t6041-j614-j616-j575-scaler.dtsi diff --git a/arch/arm64/boot/dts/apple/t6041-j575c.dts b/arch/arm64/boot/dts/apple/t6041-j575c.dts index f32eaf67f17fc..5aaee2a5ccd64 100644 --- a/arch/arm64/boot/dts/apple/t6041-j575c.dts +++ b/arch/arm64/boot/dts/apple/t6041-j575c.dts @@ -4,6 +4,7 @@ /dts-v1/; #include "t6041.dtsi" +#include "t6041-j614-j616-j575-scaler.dtsi" / { compatible = "apple,j575c", "apple,t6041", "apple,arm-platform"; diff --git a/arch/arm64/boot/dts/apple/t6041-j614-j616-j575-scaler.dtsi b/arch/arm64/boot/dts/apple/t6041-j614-j616-j575-scaler.dtsi new file mode 100644 index 0000000000000..d2b708379daa9 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t6041-j614-j616-j575-scaler.dtsi @@ -0,0 +1,188 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* Disabled M4 Max scaler resources from the preferred live J616c description. */ +/* MSR-DART gate IDs 425/457 alias physical MSR0/MSR1; do not duplicate MMIO providers. */ + +&pmgr_aux { + ps_msr0: ps_msr0_dart: power-controller@470 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x470 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "msr0"; + power-domains = <&ps_fab5_soc>; + status = "disabled"; + }; +}; + +&pmgr_aux { + ps_msr0_ase_core: power-controller@478 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x478 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "msr0_ase_core"; + power-domains = <&ps_msr0>; + status = "disabled"; + }; +}; + +&pmgr_aux { + ps_fab5_soc: power-controller@440 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x440 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "fab5_soc"; + power-domains = <&ps_afi>; + apple,always-on; + status = "disabled"; + }; +}; + +&pmgr_mini { + ps_msr1: ps_msr1_dart: power-controller@3b0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x3b0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "msr1"; + power-domains = <&ps_fab6_soc>; + status = "disabled"; + }; + + ps_msr1_ase_core: power-controller@3b8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x3b8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "msr1_ase_core"; + power-domains = <&ps_msr1>; + status = "disabled"; + }; +}; + +/ { + scaler0_dart: iommu@521260000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x5 0x21260000 0x0 0xc000>; + #iommu-cells = <1>; + apple,dma-range = <0x100 0x0 0x300 0x0>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_msr0_dart>; + status = "disabled"; + }; + + scaler1_dart: iommu@587260000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x5 0x87260000 0x0 0x20000>; + #iommu-cells = <1>; + apple,dma-range = <0x100 0x0 0x300 0x0>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_msr1_dart>; + status = "disabled"; + }; + + 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>; + resets = <&ps_msr0>; + iommus = <&scaler0_dart 0>, <&scaler0_dart 1>; + clocks = <&max_scaler_clocks 417>; + status = "disabled"; + }; + + scaler1: scaler@587000000 { + compatible = "apple,t6041-scaler", "apple,scaler"; + reg = <0x5 0x87000000 0x0 0x38000>, + <0x5 0x87210000 0x0 0x4000>, + <0x5 0x87204000 0x0 0x4000>, + <0x5 0x86000000 0x0 0x8000>; + interrupt-parent = <&aic>; + interrupts = , + ; + power-domains = <&ps_msr1>, <&ps_msr1_ase_core>; + resets = <&ps_msr1>; + iommus = <&scaler1_dart 0>, <&scaler1_dart 1>; + clocks = <&max_scaler_clocks 418>; + status = "disabled"; + }; + + max_scaler_clocks: clock-controller@502800000 { + compatible = "apple,t6041-pmgr-clocks", "apple,pmgr-clocks"; + reg = <0x5 0x02800000 0x0 0x1e0000>, + <0x5 0x08300000 0x0 0x80000>, + <0x5 0x02280000 0x0 0x100000>, + <0x5 0x00000000 0x0 0x80000>, + <0x5 0x08200000 0x0 0x80000>, + <0x5 0x08004000 0x0 0x1000>, + <0x2 0x10e20000 0x0 0x2000>, + <0x2 0x10050000 0x0 0xef1000>, + <0x2 0x10e40000 0x0 0x9000>, + <0x2 0x10e50000 0x0 0xe81000>, + <0x2 0x10e70000 0x0 0x1000>, + <0x2 0x10050000 0x0 0x10000>, + <0x2 0x10150000 0x0 0x10000>, + <0x2 0x10250000 0x0 0x10000>, + <0x2 0x10350000 0x0 0x10000>, + <0x2 0x11e20000 0x0 0x2000>, + <0x2 0x11050000 0x0 0xef1000>, + <0x2 0x11e40000 0x0 0xb000>, + <0x2 0x11e50000 0x0 0xe81000>, + <0x2 0x11e70000 0x0 0x1000>, + <0x2 0x11050000 0x0 0x10000>, + <0x2 0x11150000 0x0 0x10000>, + <0x2 0x11250000 0x0 0x10000>, + <0x2 0x11350000 0x0 0x10000>, + <0x2 0x11450000 0x0 0x10000>, + <0x2 0x11550000 0x0 0x10000>, + <0x2 0x12e20000 0x0 0x2000>, + <0x2 0x12050000 0x0 0xef1000>, + <0x2 0x12e40000 0x0 0xb000>, + <0x2 0x12e50000 0x0 0xe81000>, + <0x2 0x12e70000 0x0 0x1000>, + <0x2 0x12050000 0x0 0x10000>, + <0x2 0x12150000 0x0 0x10000>, + <0x2 0x12250000 0x0 0x10000>, + <0x2 0x12350000 0x0 0x10000>, + <0x2 0x12450000 0x0 0x10000>, + <0x2 0x12550000 0x0 0x10000>, + <0x5 0x02800000 0x0 0x18000>, + <0x5 0x0282c000 0x0 0x4000>, + <0x5 0x02850000 0x0 0x4000>, + <0x5 0x02880000 0x0 0x1c000>, + <0x5 0x02900000 0x0 0x24000>, + <0x5 0x028f0000 0x0 0x4000>, + <0x5 0x028e0000 0x0 0x4000>, + <0x5 0x02820000 0x0 0x4000>, + <0x5 0x08330000 0x0 0x10000>, + <0x5 0x08374000 0x0 0x4000>, + <0x5 0x08360000 0x0 0x4000>, + <0x5 0x00200000 0x0 0x8000>, + <0x5 0x00400000 0x0 0x34000>, + <0x5 0x003c0000 0x0 0x30000>, + <0x5 0x08800000 0x0 0xa8000>, + <0x4 0x85878000 0x0 0x4000>, + <0x2 0x88eb0000 0x0 0x4000>, + <0x2 0x88e80000 0x0 0x30000>, + <0x5 0x08900000 0x0 0x18000>, + <0x5 0x00210000 0x0 0x8000>, + <0x5 0x0020c000 0x0 0x4000>, + <0x5 0x08004000 0x0 0x1000>, + <0x5 0x0007a000 0x0 0x4000>, + <0x5 0x04000000 0x0 0x1000000>, + <0x2 0x88e1c000 0x0 0x4000>, + <0x5 0x022a0000 0x0 0x4000>; + #clock-cells = <1>; + apple,pmgr = <&pmgr>; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t6041-j614c.dts b/arch/arm64/boot/dts/apple/t6041-j614c.dts index 91510f73c1ce4..1dabc876ec3ab 100644 --- a/arch/arm64/boot/dts/apple/t6041-j614c.dts +++ b/arch/arm64/boot/dts/apple/t6041-j614c.dts @@ -4,6 +4,7 @@ /dts-v1/; #include "t6041.dtsi" +#include "t6041-j614-j616-j575-scaler.dtsi" / { compatible = "apple,j614c", "apple,t6041", "apple,arm-platform"; diff --git a/arch/arm64/boot/dts/apple/t6041-j616c.dts b/arch/arm64/boot/dts/apple/t6041-j616c.dts index 713cc25859f86..4f380dca947b1 100644 --- a/arch/arm64/boot/dts/apple/t6041-j616c.dts +++ b/arch/arm64/boot/dts/apple/t6041-j616c.dts @@ -4,6 +4,7 @@ /dts-v1/; #include "t6041.dtsi" +#include "t6041-j614-j616-j575-scaler.dtsi" #include "t6041-j616c-ane.dtsi" #include #include diff --git a/arch/arm64/boot/dts/apple/t604x-pmgr.dtsi b/arch/arm64/boot/dts/apple/t604x-pmgr.dtsi index 735df142bd0eb..c4a7f8cf3c3dc 100644 --- a/arch/arm64/boot/dts/apple/t604x-pmgr.dtsi +++ b/arch/arm64/boot/dts/apple/t604x-pmgr.dtsi @@ -1876,7 +1876,8 @@ status = "disabled"; }; - ps_msr0: power-controller@470 { + /* MSR0-DART (gate 425) aliases physical MSR0 (130), like MSR0-V. */ + ps_msr0: ps_msr0_dart: power-controller@470 { compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; reg = <0x470 4>; #power-domain-cells = <0>; diff --git a/arch/arm64/boot/dts/apple/t604x.dtsi b/arch/arm64/boot/dts/apple/t604x.dtsi index 091adfdfda6df..feb33ed48a359 100644 --- a/arch/arm64/boot/dts/apple/t604x.dtsi +++ b/arch/arm64/boot/dts/apple/t604x.dtsi @@ -2277,7 +2277,7 @@ apple,dma-range = <0x100 0x0 0x300 0x0>; interrupt-parent = <&aic>; interrupts = ; - power-domains = <&ps_msr0>; + power-domains = <&ps_msr0_dart>; status = "disabled"; }; From db5f2eefb35c52b7cb756ff54d66592ef2de462d Mon Sep 17 00:00:00 2001 From: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Date: Sun, 8 Nov 2026 03:19:07 +1100 Subject: [PATCH 4/4] arm64: dts: apple: resolve Max MSR1 through the PMGR group map Use the ps-groups mapping, rather than treating the group number as a reg index. Group 1 maps the MSR1 and ASE_CORE offsets to the main PMGR bank at 0x502280000. All added providers remain disabled. Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com> Assisted-by: LLM --- arch/arm64/boot/dts/apple/t6041-j614-j616-j575-scaler.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/apple/t6041-j614-j616-j575-scaler.dtsi b/arch/arm64/boot/dts/apple/t6041-j614-j616-j575-scaler.dtsi index d2b708379daa9..34ecb3b560df9 100644 --- a/arch/arm64/boot/dts/apple/t6041-j614-j616-j575-scaler.dtsi +++ b/arch/arm64/boot/dts/apple/t6041-j614-j616-j575-scaler.dtsi @@ -39,7 +39,8 @@ }; }; -&pmgr_mini { +/* PMGR group 1 resolves via ps-groups to the main bank at 0x502280000. */ +&pmgr { ps_msr1: ps_msr1_dart: power-controller@3b0 { compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; reg = <0x3b0 4>;