[PATCH 00/15] NVMe support for Apple M4, M4 Pro/Max and M5 devices

[PATCH 00/15] NVMe support for Apple M4, M4 Pro/Max and M5 devices

[Yureka Lilian]

Hi!

this series adds the dt-bindings and device tree nodes for NVMe on the
M4, M4 Pro/Max and M5 SoCs. A previous patch series[1] already included
M4 (t8132) driver support and ANS dt-bindings and is part of 7.4-rc1,
but omitted the device tree nodes.

Add the SoC-specific ANS NVMe controller compatibles for M4 Pro/Max and
M5 SoCs to go with the t8132 base compatible.
Also add the SoC-specific SART and mailbox compatibles for all three
SoCs, which have remained functionally unchanged from previous Apple
Silicon generations.
Finally, add the device tree nodes required for the internal NVMe on 
these devices.

As the t8132-nvme-ans2 compatible has already landed in 7.4-rc1, this
cleanly passes `make dtbs_check` without any additional prerequisites.

Merge strategy:
There are no changes to the driver in this patch series. Thus, I would
prefer to merge the dt-bindings through apple-soc, provided the Acked-by
from the respective maintainers.

Happy hacking,

Link[1]: https://lore.kernel.org/asahi/20260906-apple-nvme-t8132-v2-0-ac0328590823@cyberchaos.dev/

Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev>
---
Yureka Lilian (15):
      dt-bindings: nvme: apple: Add apple,t8140-nvme-ans2 compatible
      dt-bindings: nvme: apple: Add apple,t6041-nvme-ans2 compatible
      dt-bindings: nvme: apple: Add apple,t8142-nvme-ans2 compatible
      dt-bindings: mailbox: apple,mailbox: Add t8132 compatible
      dt-bindings: mailbox: apple,mailbox: Add t8140 compatible
      dt-bindings: mailbox: apple,mailbox: Add t6041 compatible
      dt-bindings: mailbox: apple,mailbox: Add t8142 compatible
      dt-bindings: iommu: apple,sart: Add t8132 compatibles
      dt-bindings: iommu: apple,sart: Add t8140 compatibles
      dt-bindings: iommu: apple,sart: Add t6041 compatibles
      dt-bindings: iommu: apple,sart: Add t8142 compatibles
      arm64: dts: apple: t8132: Add NVMe nodes
      arm64: dts: apple: t8140: Add NVMe nodes
      arm64: dts: apple: t604x: Add NVMe nodes
      arm64: dts: apple: t8142: Add NVMe nodes

 .../devicetree/bindings/iommu/apple,sart.yaml      |  4 ++
 .../devicetree/bindings/mailbox/apple,mailbox.yaml |  4 ++
 .../devicetree/bindings/nvme/apple,nvme-ans.yaml   |  7 ++++
 arch/arm64/boot/dts/apple/t6041-pmgr.dtsi          |  1 +
 arch/arm64/boot/dts/apple/t6041.dtsi               | 44 ++++++++++++++++++++++
 arch/arm64/boot/dts/apple/t8132-pmgr.dtsi          |  1 +
 arch/arm64/boot/dts/apple/t8132.dtsi               | 41 ++++++++++++++++++++
 arch/arm64/boot/dts/apple/t8140-pmgr.dtsi          |  1 +
 arch/arm64/boot/dts/apple/t8140.dtsi               | 42 +++++++++++++++++++++
 arch/arm64/boot/dts/apple/t8142-pmgr.dtsi          |  5 ++-
 arch/arm64/boot/dts/apple/t8142.dtsi               | 42 +++++++++++++++++++++
 11 files changed, 190 insertions(+), 2 deletions(-)
---
base-commit: 1492e5e32d3bc21b80fa1ca9835e1876431113b7
change-id: 20261105-apple-dts-m4-m5-nvme-76987565a190

Best regards,
--  
Yureka Lilian <yureka@cyberchaos.dev>

[PATCH 01/15] dt-bindings: nvme: apple: Add apple,t8140-nvme-ans2 compatible

[Yureka Lilian]

"apple,t8140-nvme-ans2" on the Apple A18 Pro SoC is compatible
with "apple,t8132-nvme-ans2" so add its per-SoC compatible.
---
 Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml b/Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml
index 1179667d8723..da260cb5597b 100644
--- a/Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml
+++ b/Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml
@@ -21,6 +21,9 @@ properties:
               - apple,t8122-nvme-ans2
           - const: apple,t8103-nvme-ans2
       - const: apple,t8132-nvme-ans2
+      - items:
+          - const: apple,t8140-nvme-ans2
+          - const: apple,t8132-nvme-ans2
       - items:
           - enum:
               # Do not add additional SoC to this list.

-- 
2.56.0

Re: [PATCH 01/15] dt-bindings: nvme: apple: Add apple,t8140-nvme-ans2 compatible

[Krzysztof Kozlowski]

On Fri, Nov 06, 2026 at 10:04:10PM +0100, Yureka Lilian wrote:
> "apple,t8140-nvme-ans2" on the Apple A18 Pro SoC is compatible
> with "apple,t8132-nvme-ans2" so add its per-SoC compatible.
> ---
>  Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml | 3 +++
>  1 file changed, 3 insertions(+)
> 

Please run scripts/checkpatch.pl on the patches and fix reported
warnings. After that, run also 'scripts/checkpatch.pl --strict' on the
patches and (probably) fix more warnings. Some warnings can be ignored,
especially from --strict run, but the code here looks like it needs a
fix. Feel free to get in touch if the warning is not clear.

Best regards,
Krzysztof

[PATCH 02/15] dt-bindings: nvme: apple: Add apple,t6041-nvme-ans2 compatible

[Yureka Lilian]

"apple,t6041-nvme-ans2" on the Apple M4 Pro/Max SoCs is compatible with
"apple,t8132-nvme-ans2" so add the per-SoC compatible.

Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev>
---
 Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml b/Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml
index da260cb5597b..24c2be3b9544 100644
--- a/Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml
+++ b/Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml
@@ -22,7 +22,9 @@ properties:
           - const: apple,t8103-nvme-ans2
       - const: apple,t8132-nvme-ans2
       - items:
-          - const: apple,t8140-nvme-ans2
+          - enum:
+              - apple,t8140-nvme-ans2
+              - apple,t6041-nvme-ans2
           - const: apple,t8132-nvme-ans2
       - items:
           - enum:
@@ -84,6 +86,7 @@ if:
           - apple,t6000-nvme-ans2
           - apple,t6020-nvme-ans2
           - apple,t6031-nvme-ans2
+          - apple,t6041-nvme-ans2
 then:
   properties:
     power-domains:

-- 
2.56.0

[PATCH 03/15] dt-bindings: nvme: apple: Add apple,t8142-nvme-ans2 compatible

[Yureka Lilian]

"apple,t8142-nvme-ans2" on the Apple M5 SoC is compatible with
"apple,t8132-nvme-ans2" so add its per-SoC compatible.

Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev>
---
 Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml b/Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml
index 24c2be3b9544..b8b779f050bc 100644
--- a/Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml
+++ b/Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml
@@ -24,6 +24,7 @@ properties:
       - items:
           - enum:
               - apple,t8140-nvme-ans2
+              - apple,t8142-nvme-ans2
               - apple,t6041-nvme-ans2
           - const: apple,t8132-nvme-ans2
       - items:

-- 
2.56.0

Re: [PATCH 03/15] dt-bindings: nvme: apple: Add apple,t8142-nvme-ans2 compatible

[Krzysztof Kozlowski]

On Fri, Nov 06, 2026 at 10:04:12PM +0100, Yureka Lilian wrote:
> "apple,t8142-nvme-ans2" on the Apple M5 SoC is compatible with
> "apple,t8132-nvme-ans2" so add its per-SoC compatible.
> 
> Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev>
> ---
>  Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml | 1 +
>  1 file changed, 1 insertion(+)
> 

Squash all nvmem patches. Don't add compatibles one by one.

Best regards,
Krzysztof

Re: [PATCH 03/15] dt-bindings: nvme: apple: Add apple,t8142-nvme-ans2 compatible

[Yureka]

On 11/11/26 13:46, Krzysztof Kozlowski wrote:
> On Fri, Nov 06, 2026 at 10:04:12PM +0100, Yureka Lilian wrote:
>> "apple,t8142-nvme-ans2" on the Apple M5 SoC is compatible with
>> "apple,t8132-nvme-ans2" so add its per-SoC compatible.
>>
>> Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev>
>> ---
>>   Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml | 1 +
>>   1 file changed, 1 insertion(+)
>>
> Squash all nvmem patches. Don't add compatibles one by one.
>
> Best regards,
> Krzysztof


Hello Krzysztof,


(replying to all three of your emails here)

thanks for your feedback! I did run `b4 prep --check` and `make 
dtbs_check` before sending and it passed without warnings on all 15 
patches of this series. I will now also run `checkpatch.pl --strict` as 
you suggested.

For v2, I will make one commit per type of dt-binding, so "dt-bindings: 
nvme: apple: Add t6040,t8140,t8142", and then "mailbox: apple,mailbox: 
Add t8132,t6040,t8140,t8142", etc., ok or do you have another suggested 
grouping?

 > Please stop inflating this. You are only making it difficult to 
review your work.

It would be appreciated if you can tell me clearly what is expected, as 
this statement is not actually telling me what is inflated / wrong.

Thank you!

[PATCH 04/15] dt-bindings: mailbox: apple,mailbox: Add t8132 compatible

[Yureka Lilian]

The mailbox hardware remains unchanged on M4 SoC so just add its
per-SoC compatible.

Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev>
---
 Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml b/Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
index 9a6dfb0b2f28..e870003d6cfd 100644
--- a/Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
+++ b/Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
@@ -31,6 +31,7 @@ properties:
               - apple,t8103-asc-mailbox
               - apple,t8112-asc-mailbox
               - apple,t8122-asc-mailbox
+              - apple,t8132-asc-mailbox
               - apple,t6000-asc-mailbox
               - apple,t6020-asc-mailbox
               - apple,t6030-asc-mailbox

-- 
2.56.0

[PATCH 05/15] dt-bindings: mailbox: apple,mailbox: Add t8140 compatible

[Yureka Lilian]

The mailbox hardware remains unchanged on A18 Pro SoC so just add its
per-SoC compatible.

Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev>
---
 Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml b/Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
index e870003d6cfd..774f63f0839e 100644
--- a/Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
+++ b/Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
@@ -32,6 +32,7 @@ properties:
               - apple,t8112-asc-mailbox
               - apple,t8122-asc-mailbox
               - apple,t8132-asc-mailbox
+              - apple,t8140-asc-mailbox
               - apple,t6000-asc-mailbox
               - apple,t6020-asc-mailbox
               - apple,t6030-asc-mailbox

-- 
2.56.0

[PATCH 06/15] dt-bindings: mailbox: apple,mailbox: Add t6041 compatible

[Yureka Lilian]

The mailbox hardware remains unchanged on M4 Pro/Max SoCs so just add
the per-SoC compatible.

Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev>
---
 Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml b/Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
index 774f63f0839e..1fb943e0b587 100644
--- a/Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
+++ b/Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
@@ -37,6 +37,7 @@ properties:
               - apple,t6020-asc-mailbox
               - apple,t6030-asc-mailbox
               - apple,t6031-asc-mailbox
+              - apple,t6041-asc-mailbox
           - const: apple,asc-mailbox-v4
 
       - description:

-- 
2.56.0

[PATCH 07/15] dt-bindings: mailbox: apple,mailbox: Add t8142 compatible

[Yureka Lilian]

The mailbox hardware remains unchanged on M5 SoC so just add its per-SoC
compatible.

Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev>
---
 Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml b/Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
index 1fb943e0b587..dd1f0bc1830a 100644
--- a/Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
+++ b/Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
@@ -33,6 +33,7 @@ properties:
               - apple,t8122-asc-mailbox
               - apple,t8132-asc-mailbox
               - apple,t8140-asc-mailbox
+              - apple,t8142-asc-mailbox
               - apple,t6000-asc-mailbox
               - apple,t6020-asc-mailbox
               - apple,t6030-asc-mailbox

-- 
2.56.0

Re: [PATCH 07/15] dt-bindings: mailbox: apple,mailbox: Add t8142 compatible

[Krzysztof Kozlowski]

On Fri, Nov 06, 2026 at 10:04:16PM +0100, Yureka Lilian wrote:
> The mailbox hardware remains unchanged on M5 SoC so just add its per-SoC
> compatible.

Please stop inflating this. You are only making it difficult to review
your work.

I am dropping entire set from DT patchwork.

Best regards,
Krzysztof

[PATCH 08/15] dt-bindings: iommu: apple,sart: Add t8132 compatibles

[Yureka Lilian]

The SART IOMMU in the Apple M4 SoC is compatible to "apple,t6000-sart".

Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev>
---
 Documentation/devicetree/bindings/iommu/apple,sart.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/iommu/apple,sart.yaml b/Documentation/devicetree/bindings/iommu/apple,sart.yaml
index 015158a9676b..8cf41473b808 100644
--- a/Documentation/devicetree/bindings/iommu/apple,sart.yaml
+++ b/Documentation/devicetree/bindings/iommu/apple,sart.yaml
@@ -36,6 +36,7 @@ properties:
               - apple,t6031-sart
               - apple,t8112-sart
               - apple,t8122-sart
+              - apple,t8132-sart
           - const: apple,t6000-sart
       - enum:
           - apple,t6000-sart

-- 
2.56.0

[PATCH 09/15] dt-bindings: iommu: apple,sart: Add t8140 compatibles

[Yureka Lilian]

The SART IOMMU in the Apple A18 Pro SoC is compatible to
"apple,t6000-sart".

Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev>
---
 Documentation/devicetree/bindings/iommu/apple,sart.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/iommu/apple,sart.yaml b/Documentation/devicetree/bindings/iommu/apple,sart.yaml
index 8cf41473b808..bf35ead191ec 100644
--- a/Documentation/devicetree/bindings/iommu/apple,sart.yaml
+++ b/Documentation/devicetree/bindings/iommu/apple,sart.yaml
@@ -37,6 +37,7 @@ properties:
               - apple,t8112-sart
               - apple,t8122-sart
               - apple,t8132-sart
+              - apple,t8140-sart
           - const: apple,t6000-sart
       - enum:
           - apple,t6000-sart

-- 
2.56.0

[PATCH 10/15] dt-bindings: iommu: apple,sart: Add t6041 compatibles

[Yureka Lilian]

The SART IOMMU in the Apple M4 Pro/Max SoCs is compatible to
"apple,t6000-sart".

Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev>
---
 Documentation/devicetree/bindings/iommu/apple,sart.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/iommu/apple,sart.yaml b/Documentation/devicetree/bindings/iommu/apple,sart.yaml
index bf35ead191ec..f79242f112df 100644
--- a/Documentation/devicetree/bindings/iommu/apple,sart.yaml
+++ b/Documentation/devicetree/bindings/iommu/apple,sart.yaml
@@ -34,6 +34,7 @@ properties:
               - apple,t6020-sart
               - apple,t6030-sart
               - apple,t6031-sart
+              - apple,t6041-sart
               - apple,t8112-sart
               - apple,t8122-sart
               - apple,t8132-sart

-- 
2.56.0

[PATCH 11/15] dt-bindings: iommu: apple,sart: Add t8142 compatibles

[Yureka Lilian]

The SART IOMMU in the Apple M5 SoC is compatible to "apple,t6000-sart".

Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev>
---
 Documentation/devicetree/bindings/iommu/apple,sart.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/iommu/apple,sart.yaml b/Documentation/devicetree/bindings/iommu/apple,sart.yaml
index f79242f112df..e6482453d6da 100644
--- a/Documentation/devicetree/bindings/iommu/apple,sart.yaml
+++ b/Documentation/devicetree/bindings/iommu/apple,sart.yaml
@@ -39,6 +39,7 @@ properties:
               - apple,t8122-sart
               - apple,t8132-sart
               - apple,t8140-sart
+              - apple,t8142-sart
           - const: apple,t6000-sart
       - enum:
           - apple,t6000-sart

-- 
2.56.0

[PATCH 12/15] arm64: dts: apple: t8132: Add NVMe nodes

[Yureka Lilian]

Add the device nodes for the internal NVMe SSD on the Apple M4 (t8132)
SoC. Keep ps_apcie_phy_sw powered on matching t8122.

Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev>
---
 arch/arm64/boot/dts/apple/t8132-pmgr.dtsi |  1 +
 arch/arm64/boot/dts/apple/t8132.dtsi      | 41 +++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/arch/arm64/boot/dts/apple/t8132-pmgr.dtsi b/arch/arm64/boot/dts/apple/t8132-pmgr.dtsi
index 6fbf09e8f981..c9deb9b8b096 100644
--- a/arch/arm64/boot/dts/apple/t8132-pmgr.dtsi
+++ b/arch/arm64/boot/dts/apple/t8132-pmgr.dtsi
@@ -824,6 +824,7 @@ ps_apcie_phy_sw: power-controller@550 {
 		#reset-cells = <0>;
 		label = "apcie_phy_sw";
 		power-domains = <&ps_apcie_sys_st>, <&ps_apcie_sys_gp>;
+		apple,always-on;
 	};
 
 	ps_msr: power-controller@560 {
diff --git a/arch/arm64/boot/dts/apple/t8132.dtsi b/arch/arm64/boot/dts/apple/t8132.dtsi
index e2e79c7e7fd0..e7d27620a9f7 100644
--- a/arch/arm64/boot/dts/apple/t8132.dtsi
+++ b/arch/arm64/boot/dts/apple/t8132.dtsi
@@ -472,6 +472,47 @@ serial0: serial@3ad200000 {
 
 			status = "disabled";
 		};
+
+		ans_mbox: mbox@481608000 {
+			compatible = "apple,t8132-asc-mailbox",
+				     "apple,asc-mailbox-v4";
+			reg = <0x4 0x81608000 0x0 0x4000>;
+
+			interrupt-parent = <&aic>;
+			interrupts = <AIC_IRQ 1003 IRQ_TYPE_LEVEL_HIGH>,
+				     <AIC_IRQ 1004 IRQ_TYPE_LEVEL_HIGH>,
+				     <AIC_IRQ 1005 IRQ_TYPE_LEVEL_HIGH>,
+				     <AIC_IRQ 1006 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "send-empty", "send-not-empty",
+					  "recv-empty", "recv-not-empty";
+
+			#mbox-cells = <0>;
+			power-domains = <&ps_ans>;
+		};
+
+		sart: sart@485c50000 {
+			compatible = "apple,t8132-sart", "apple,t6000-sart";
+			reg = <0x4 0x85c50000 0x0 0x10000>;
+			power-domains = <&ps_ans>;
+		};
+
+		nvme: nvme@4c5cc0000 {
+			compatible = "apple,t8132-nvme-ans2";
+			reg = <0x4 0xc5cc0000 0x0 0x60000>,
+			      <0x4 0x81600000 0x0 0x4000>;
+			reg-names = "nvme", "ans";
+
+			interrupt-parent = <&aic>;
+			interrupts = <AIC_IRQ 1018 IRQ_TYPE_LEVEL_HIGH>;
+
+			mboxes = <&ans_mbox>;
+
+			power-domains = <&ps_ans>, <&ps_apcie_sys_st>;
+			power-domain-names = "ans", "apcie0";
+			resets = <&ps_ans>;
+
+			apple,sart = <&sart>;
+		};
 	};
 
 	timer {

-- 
2.56.0

[PATCH 13/15] arm64: dts: apple: t8140: Add NVMe nodes

[Yureka Lilian]

Add the device nodes for the internal NVMe SSD on the Apple A18 Pro
(t8140) SoC. Keep ps_apcie_phy_sw powered on matching t8122.

Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev>
---
 arch/arm64/boot/dts/apple/t8140-pmgr.dtsi |  1 +
 arch/arm64/boot/dts/apple/t8140.dtsi      | 42 +++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/arch/arm64/boot/dts/apple/t8140-pmgr.dtsi b/arch/arm64/boot/dts/apple/t8140-pmgr.dtsi
index dd43520394ac..ac69e57cc140 100644
--- a/arch/arm64/boot/dts/apple/t8140-pmgr.dtsi
+++ b/arch/arm64/boot/dts/apple/t8140-pmgr.dtsi
@@ -556,6 +556,7 @@ ps_apcie_phy_sw: power-controller@3c0 {
 		#power-domain-cells = <0>;
 		power-domains = <&ps_apcie_sys_st>, <&ps_apcie_sys_gp>;
 		#reset-cells = <0>;
+		apple,always-on;
 	};
 
 	ps_pmp: power-controller@3d0 {
diff --git a/arch/arm64/boot/dts/apple/t8140.dtsi b/arch/arm64/boot/dts/apple/t8140.dtsi
index 3b4f7695552b..4230af506fca 100644
--- a/arch/arm64/boot/dts/apple/t8140.dtsi
+++ b/arch/arm64/boot/dts/apple/t8140.dtsi
@@ -351,6 +351,48 @@ serial0: serial@385200000 {
 
 			status = "disabled";
 		};
+
+		ans_mbox: mbox@389608000 {
+			compatible = "apple,t8140-asc-mailbox",
+				     "apple,asc-mailbox-v4";
+			reg = <0x3 0x89608000 0x0 0x4000>;
+
+			interrupt-parent = <&aic>;
+			interrupts = <AIC_IRQ 1007 IRQ_TYPE_LEVEL_HIGH>,
+				     <AIC_IRQ 1008 IRQ_TYPE_LEVEL_HIGH>,
+				     <AIC_IRQ 1009 IRQ_TYPE_LEVEL_HIGH>,
+				     <AIC_IRQ 1010 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "send-empty", "send-not-empty",
+					  "recv-empty", "recv-not-empty";
+
+			#mbox-cells = <0>;
+			power-domains = <&ps_ans>;
+		};
+
+		sart: sart@38dc50000 {
+			compatible = "apple,t8140-sart", "apple,t6000-sart";
+			reg = <0x3 0x8dc50000 0x0 0x10000>;
+			power-domains = <&ps_ans>;
+		};
+
+		nvme: nvme@3cdcc0000 {
+			compatible = "apple,t8140-nvme-ans2",
+				     "apple,t8132-nvme-ans2";
+			reg = <0x3 0xcdcc0000 0x0 0x60000>,
+			      <0x3 0x89600000 0x0 0x4000>;
+			reg-names = "nvme", "ans";
+
+			interrupt-parent = <&aic>;
+			interrupts = <AIC_IRQ 1039 IRQ_TYPE_LEVEL_HIGH>;
+
+			mboxes = <&ans_mbox>;
+
+			power-domains = <&ps_ans>, <&ps_apcie_sys_st>;
+			power-domain-names = "ans", "apcie0";
+			resets = <&ps_ans>;
+
+			apple,sart = <&sart>;
+		};
 	};
 
 	timer {

-- 
2.56.0

[PATCH 14/15] arm64: dts: apple: t604x: Add NVMe nodes

[Yureka Lilian]

Add the device nodes for the internal NVMe SSD on the Apple M4 Pro/Max
(t6040/t6041) SoCs. Keep ps_apcie_phy_sw powered on matching t603x.

Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev>
---
 arch/arm64/boot/dts/apple/t6041-pmgr.dtsi |  1 +
 arch/arm64/boot/dts/apple/t6041.dtsi      | 44 +++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/arch/arm64/boot/dts/apple/t6041-pmgr.dtsi b/arch/arm64/boot/dts/apple/t6041-pmgr.dtsi
index 7da82f8a036b..029ecd3bda82 100644
--- a/arch/arm64/boot/dts/apple/t6041-pmgr.dtsi
+++ b/arch/arm64/boot/dts/apple/t6041-pmgr.dtsi
@@ -824,6 +824,7 @@ ps_apcie_phy_sw: power-controller@398 {
 		#power-domain-cells = <0>;
 		power-domains = <&ps_apcie_sys_st0>, <&ps_apcie_sys_st1>;
 		#reset-cells = <0>;
+		apple,always-on;
 	};
 
 	ps_jpg: power-controller@3a0 {
diff --git a/arch/arm64/boot/dts/apple/t6041.dtsi b/arch/arm64/boot/dts/apple/t6041.dtsi
index 9110d05c896d..e7c3e33f8f69 100644
--- a/arch/arm64/boot/dts/apple/t6041.dtsi
+++ b/arch/arm64/boot/dts/apple/t6041.dtsi
@@ -329,6 +329,29 @@ pmgr_gfx: power-management@288e80000 {
 			#size-cells = <1>;
 		};
 
+		ans_mbox: mbox@409608000 {
+			compatible = "apple,t6041-asc-mailbox",
+				     "apple,asc-mailbox-v4";
+			reg = <0x4 0x09608000 0x0 0x4000>;
+
+			interrupt-parent = <&aic>;
+			interrupts = <AIC_IRQ 1530 IRQ_TYPE_LEVEL_HIGH>,
+				     <AIC_IRQ 1531 IRQ_TYPE_LEVEL_HIGH>,
+				     <AIC_IRQ 1532 IRQ_TYPE_LEVEL_HIGH>,
+				     <AIC_IRQ 1533 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "send-empty", "send-not-empty",
+					  "recv-empty", "recv-not-empty";
+
+			#mbox-cells = <0>;
+			power-domains = <&ps_ans>;
+		};
+
+		sart: sart@40dc50000 {
+			compatible = "apple,t6041-sart", "apple,t6000-sart";
+			reg = <0x4 0x0dc50000 0x0 0x10000>;
+			power-domains = <&ps_ans>;
+		};
+
 		i2c0: i2c@429010000 {
 			compatible = "apple,t6041-i2c", "apple,t8103-i2c";
 			reg = <0x4 0x29010000 0x0 0x4000>;
@@ -501,6 +524,27 @@ serial0: serial@429200000 {
 			status = "disabled";
 		};
 
+		nvme: nvme@44dcc0000 {
+			compatible = "apple,t6041-nvme-ans2",
+				     "apple,t8132-nvme-ans2";
+			reg = <0x4 0x4dcc0000 0x0 0x60000>,
+			      <0x4 0x09600000 0x0 0x4000>;
+			reg-names = "nvme", "ans";
+
+			interrupt-parent = <&aic>;
+			interrupts = <AIC_IRQ 2583 IRQ_TYPE_LEVEL_HIGH>;
+
+			mboxes = <&ans_mbox>;
+
+			power-domains = <&ps_ans>,
+					<&ps_apcie_sys_st0>,
+					<&ps_apcie_sys_st1>;
+			power-domain-names = "ans", "apcie0", "apcie1";
+			resets = <&ps_ans>;
+
+			apple,sart = <&sart>;
+		};
+
 		pmgr: power-management@502280000 {
 			compatible = "apple,t6041-pmgr", "apple,t8103-pmgr",
 			             "syscon", "simple-mfd";

-- 
2.56.0

[PATCH 15/15] arm64: dts: apple: t8142: Add NVMe nodes

[Yureka Lilian]

Add the device nodes for the internal NVMe SSD on the Apple M5 (t8142)
SoC. Keep ps_apcie_phy_sw powered on and invert the ps_apcie_sys_st /
ps_apcie_phy_sw dependency to match t8122.

Signed-off-by: Yureka Lilian <yureka@cyberchaos.dev>
---
 arch/arm64/boot/dts/apple/t8142-pmgr.dtsi |  5 ++--
 arch/arm64/boot/dts/apple/t8142.dtsi      | 42 +++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/apple/t8142-pmgr.dtsi b/arch/arm64/boot/dts/apple/t8142-pmgr.dtsi
index b89c7720cf23..3c4842ab55b2 100644
--- a/arch/arm64/boot/dts/apple/t8142-pmgr.dtsi
+++ b/arch/arm64/boot/dts/apple/t8142-pmgr.dtsi
@@ -801,7 +801,7 @@ ps_apcie_sys_st: power-controller@520 {
 		reg = <0x520 4>;
 		label = "apcie_sys_st";
 		#power-domain-cells = <0>;
-		power-domains = <&ps_ans>, <&ps_apcie_st>;
+		power-domains = <&ps_ans>, <&ps_apcie_st>, <&ps_st0_aus5>;
 		#reset-cells = <0>;
 	};
 
@@ -810,8 +810,9 @@ ps_apcie_phy_sw: power-controller@560 {
 		reg = <0x560 4>;
 		label = "apcie_phy_sw";
 		#power-domain-cells = <0>;
-		power-domains = <&ps_apcie_sys_st>, <&ps_apcie_sys_gp>;
+		power-domains = <&ps_apcie_sys_gp>;
 		#reset-cells = <0>;
+		apple,always-on;
 	};
 
 	ps_sys_st_ocla: power-controller@568 {
diff --git a/arch/arm64/boot/dts/apple/t8142.dtsi b/arch/arm64/boot/dts/apple/t8142.dtsi
index 3663677f7b14..c1a61e56e2b5 100644
--- a/arch/arm64/boot/dts/apple/t8142.dtsi
+++ b/arch/arm64/boot/dts/apple/t8142.dtsi
@@ -489,6 +489,48 @@ serial0: serial@3a5200000 {
 			status = "disabled";
 		};
 
+		ans_mbox: mbox@481608000 {
+			compatible = "apple,t8142-asc-mailbox",
+				     "apple,asc-mailbox-v4";
+			reg = <0x4 0x81608000 0x0 0x4000>;
+
+			interrupt-parent = <&aic>;
+			interrupts = <AIC_IRQ 1143 IRQ_TYPE_LEVEL_HIGH>,
+				     <AIC_IRQ 1144 IRQ_TYPE_LEVEL_HIGH>,
+				     <AIC_IRQ 1145 IRQ_TYPE_LEVEL_HIGH>,
+				     <AIC_IRQ 1146 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "send-empty", "send-not-empty",
+					  "recv-empty", "recv-not-empty";
+
+			#mbox-cells = <0>;
+			power-domains = <&ps_ans>;
+		};
+
+		sart: sart@485c50000 {
+			compatible = "apple,t8142-sart", "apple,t6000-sart";
+			reg = <0x4 0x85c50000 0x0 0x10000>;
+			power-domains = <&ps_ans>;
+		};
+
+		nvme: nvme@4c5cc0000 {
+			compatible = "apple,t8142-nvme-ans2",
+				     "apple,t8132-nvme-ans2";
+			reg = <0x4 0xc5cc0000 0x0 0x60000>,
+			      <0x4 0x81600000 0x0 0x4000>;
+			reg-names = "nvme", "ans";
+
+			interrupt-parent = <&aic>;
+			interrupts = <AIC_IRQ 1155 IRQ_TYPE_LEVEL_HIGH>;
+
+			mboxes = <&ans_mbox>;
+
+			power-domains = <&ps_ans>, <&ps_apcie_sys_st>;
+			power-domain-names = "ans", "apcie0";
+			resets = <&ps_ans>;
+
+			apple,sart = <&sart>;
+		};
+
 		pmgr_gfx: power-management@580e80000 {
 			compatible = "apple,t8142-pmgr", "apple,t8103-pmgr",
 			             "syscon", "simple-mfd";

-- 
2.56.0