Devicetree
 help / color / mirror / Atom feed
* [PATCH 0/3] Fix dt-style-check issues in Apple silicon multi die .dtsi
@ 2026-09-03 13:59 Janne Grunau
  2026-09-03 13:59 ` [PATCH 1/3] arm64: dts: apple: Fix style issues for t600x " Janne Grunau
                   ` (3 more replies)
  0 siblings, 4 replies; 9+ messages in thread
From: Janne Grunau @ 2026-09-03 13:59 UTC (permalink / raw)
  To: Sven Peter, Neal Gompa, Rob Herring, Krzysztof Kozlowski,
	Conor Dooley
  Cc: asahi, linux-arm-kernel, devicetree, linux-kernel, Janne Grunau,
	Krzysztof Kozlowski

The MMIO nodes in t60{0x,2x,31}-{die0,dieX,nvme}.dtsi are indented by
one level to signify that included at this level. This looks weird by
itself and dt-style-check comaplains about it. This can be fixed by
moving the referenced soc nodes into these .dtsi files. Since the parent
soc node varies add a preprocessor define for them. The multi die .dtsi
files already depend on the preprocessor. Suggested by Krzysztof
Kozlowski in [1].

1: https://lore.kernel.org/asahi/e2365307-32d6-4ef9-9919-55ba69786741@kernel.org/

Signed-off-by: Janne Grunau <j@jannau.net>
---
Janne Grunau (3):
      arm64: dts: apple: Fix style issues for t600x multi die .dtsi
      arm64: dts: apple: Fix style issues for t602x multi die .dtsi
      arm64: dts: apple: Fix style issues for t6031 multi die .dtsi

 arch/arm64/boot/dts/apple/t6001.dtsi      | 11 +++++------
 arch/arm64/boot/dts/apple/t6002.dtsi      | 18 ++++++++----------
 arch/arm64/boot/dts/apple/t600x-die0.dtsi |  3 ++-
 arch/arm64/boot/dts/apple/t600x-dieX.dtsi |  2 ++
 arch/arm64/boot/dts/apple/t600x-nvme.dtsi |  2 ++
 arch/arm64/boot/dts/apple/t6021.dtsi      | 10 ++++------
 arch/arm64/boot/dts/apple/t6022.dtsi      | 18 ++++++++----------
 arch/arm64/boot/dts/apple/t602x-die0.dtsi |  2 ++
 arch/arm64/boot/dts/apple/t602x-dieX.dtsi |  2 ++
 arch/arm64/boot/dts/apple/t602x-nvme.dtsi |  2 ++
 arch/arm64/boot/dts/apple/t6031-die0.dtsi |  2 ++
 arch/arm64/boot/dts/apple/t6031-dieX.dtsi |  2 ++
 arch/arm64/boot/dts/apple/t6031.dtsi      |  9 ++++-----
 arch/arm64/boot/dts/apple/t6032.dtsi      | 16 +++++++---------
 14 files changed, 52 insertions(+), 47 deletions(-)
---
base-commit: cee9395acd8043be0644b25c34bfa86623f2b935
change-id: 20260901-apple-soc-multi-die-style-625b2281ff68

Best regards,
-- 
Janne Grunau <j@jannau.net>


^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH 1/3] arm64: dts: apple: Fix style issues for t600x multi die .dtsi
  2026-09-03 13:59 [PATCH 0/3] Fix dt-style-check issues in Apple silicon multi die .dtsi Janne Grunau
@ 2026-09-03 13:59 ` Janne Grunau
  2026-09-04  6:22   ` Krzysztof Kozlowski
  2026-09-03 13:59 ` [PATCH 2/3] arm64: dts: apple: Fix style issues for t602x " Janne Grunau
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 9+ messages in thread
From: Janne Grunau @ 2026-09-03 13:59 UTC (permalink / raw)
  To: Sven Peter, Neal Gompa, Rob Herring, Krzysztof Kozlowski,
	Conor Dooley
  Cc: asahi, linux-arm-kernel, devicetree, linux-kernel, Janne Grunau,
	Krzysztof Kozlowski

The M1 Pro/Max/Ultra .dtsi files containing most MMIO nodes are a
collection of nodes without parent. The proper embedding inside a
"simple-bus" parent only happens in t6001.dtsi and t6002.dtsi.
Fix these dt style issue by using a define for their parent soc node and
bracket those MMIO nodes inside it.

Link: https://lore.kernel.org/asahi/e2365307-32d6-4ef9-9919-55ba69786741@kernel.org/
Suggested-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Janne Grunau <j@jannau.net>
---
 arch/arm64/boot/dts/apple/t6001.dtsi      | 11 +++++------
 arch/arm64/boot/dts/apple/t6002.dtsi      | 18 ++++++++----------
 arch/arm64/boot/dts/apple/t600x-die0.dtsi |  3 ++-
 arch/arm64/boot/dts/apple/t600x-dieX.dtsi |  2 ++
 arch/arm64/boot/dts/apple/t600x-nvme.dtsi |  2 ++
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/arch/arm64/boot/dts/apple/t6001.dtsi b/arch/arm64/boot/dts/apple/t6001.dtsi
index 4fb934d7e71f..e0acf2ba078b 100644
--- a/arch/arm64/boot/dts/apple/t6001.dtsi
+++ b/arch/arm64/boot/dts/apple/t6001.dtsi
@@ -35,18 +35,17 @@ soc {
 
 #define DIE
 #define DIE_NO 0
+#define SOC_NODE {/soc}
 
-&{/soc} {
-	#include "t600x-die0.dtsi"
-	#include "t600x-dieX.dtsi"
-	#include "t600x-nvme.dtsi"
-};
-
+#include "t600x-die0.dtsi"
+#include "t600x-dieX.dtsi"
+#include "t600x-nvme.dtsi"
 #include "t600x-gpio-pins.dtsi"
 #include "t600x-pmgr.dtsi"
 
 #undef DIE
 #undef DIE_NO
+#undef SOC_NODE
 
 
 &aic {
diff --git a/arch/arm64/boot/dts/apple/t6002.dtsi b/arch/arm64/boot/dts/apple/t6002.dtsi
index 0f81fc612a2a..91ce9a665cab 100644
--- a/arch/arm64/boot/dts/apple/t6002.dtsi
+++ b/arch/arm64/boot/dts/apple/t6002.dtsi
@@ -254,30 +254,28 @@ die1: soc@2200000000 {
 
 #define DIE
 #define DIE_NO 0
+#define SOC_NODE die0
 
-&die0 {
-	#include "t600x-die0.dtsi"
-	#include "t600x-dieX.dtsi"
-};
-
+#include "t600x-die0.dtsi"
+#include "t600x-dieX.dtsi"
 #include "t600x-pmgr.dtsi"
 #include "t600x-gpio-pins.dtsi"
 
 #undef DIE
 #undef DIE_NO
+#undef SOC_NODE
 
 #define DIE _die1
 #define DIE_NO 1
+#define SOC_NODE die1
 
-&die1 {
-	#include "t600x-dieX.dtsi"
-	#include "t600x-nvme.dtsi"
-};
-
+#include "t600x-dieX.dtsi"
+#include "t600x-nvme.dtsi"
 #include "t600x-pmgr.dtsi"
 
 #undef DIE
 #undef DIE_NO
+#undef SOC_NODE
 
 &aic {
 	affinities {
diff --git a/arch/arm64/boot/dts/apple/t600x-die0.dtsi b/arch/arm64/boot/dts/apple/t600x-die0.dtsi
index 49b23f3da980..122a566e75d1 100644
--- a/arch/arm64/boot/dts/apple/t600x-die0.dtsi
+++ b/arch/arm64/boot/dts/apple/t600x-die0.dtsi
@@ -6,7 +6,7 @@
  * Copyright The Asahi Linux Contributors
  */
 
-
+&SOC_NODE {
 	nco: clock-controller@28e03c000 {
 		compatible = "apple,t6000-nco", "apple,nco";
 		reg = <0x2 0x8e03c000 0x0 0x14000>;
@@ -537,3 +537,4 @@ port03: pci@3,0 {
 			status = "disabled";
 		};
 	};
+};
diff --git a/arch/arm64/boot/dts/apple/t600x-dieX.dtsi b/arch/arm64/boot/dts/apple/t600x-dieX.dtsi
index 9676d5127039..7ab60873faf1 100644
--- a/arch/arm64/boot/dts/apple/t600x-dieX.dtsi
+++ b/arch/arm64/boot/dts/apple/t600x-dieX.dtsi
@@ -6,6 +6,7 @@
  * Copyright The Asahi Linux Contributors
  */
 
+&SOC_NODE {
 	DIE_NODE(cpufreq_e): cpufreq@210e20000 {
 		compatible = "apple,t6000-cluster-cpufreq", "apple,t8103-cluster-cpufreq", "apple,cluster-cpufreq";
 		reg = <0x2 0x10e20000 0 0x1000>;
@@ -331,3 +332,4 @@ DIE_NODE(atcphy3): phy@1303000000 {
 		mode-switch;
 		power-domains = <&DIE_NODE(ps_atc3_usb)>;
 	};
+};
diff --git a/arch/arm64/boot/dts/apple/t600x-nvme.dtsi b/arch/arm64/boot/dts/apple/t600x-nvme.dtsi
index 7dff738d317e..3a8e2299eac4 100644
--- a/arch/arm64/boot/dts/apple/t600x-nvme.dtsi
+++ b/arch/arm64/boot/dts/apple/t600x-nvme.dtsi
@@ -5,6 +5,7 @@
  * Copyright The Asahi Linux Contributors
  */
 
+&SOC_NODE {
 	DIE_NODE(ans_mbox): mbox@38f408000 {
 		compatible = "apple,t6000-asc-mailbox", "apple,asc-mailbox-v4";
 		reg = <0x3 0x8f408000 0x0 0x4000>;
@@ -40,3 +41,4 @@ DIE_NODE(nvme): nvme@393cc0000 {
 		power-domain-names = "ans", "apcie0", "apcie1";
 		resets = <&DIE_NODE(ps_ans2)>;
 	};
+};

-- 
2.55.0


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH 2/3] arm64: dts: apple: Fix style issues for t602x multi die .dtsi
  2026-09-03 13:59 [PATCH 0/3] Fix dt-style-check issues in Apple silicon multi die .dtsi Janne Grunau
  2026-09-03 13:59 ` [PATCH 1/3] arm64: dts: apple: Fix style issues for t600x " Janne Grunau
@ 2026-09-03 13:59 ` Janne Grunau
  2026-09-03 14:13   ` sashiko-bot
  2026-09-04  6:22   ` Krzysztof Kozlowski
  2026-09-03 13:59 ` [PATCH 3/3] arm64: dts: apple: Fix style issues for t6031 " Janne Grunau
  2026-09-04 15:08 ` [PATCH 0/3] Fix dt-style-check issues in Apple silicon " Sven Peter
  3 siblings, 2 replies; 9+ messages in thread
From: Janne Grunau @ 2026-09-03 13:59 UTC (permalink / raw)
  To: Sven Peter, Neal Gompa, Rob Herring, Krzysztof Kozlowski,
	Conor Dooley
  Cc: asahi, linux-arm-kernel, devicetree, linux-kernel, Janne Grunau,
	Krzysztof Kozlowski

The M2 Pro/Max/Ultra .dtsi files containing most MMIO nodes are a
collection of nodes without parent. The proper embedding inside a
"simple-bus" parent only happens in t6021.dtsi and t6022.dtsi.
Fix these dt style issue by using a define for their parent soc node and
bracket those MMIO nodes inside it.

Link: https://lore.kernel.org/asahi/e2365307-32d6-4ef9-9919-55ba69786741@kernel.org/
Suggested-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Janne Grunau <j@jannau.net>
---
 arch/arm64/boot/dts/apple/t6021.dtsi      | 10 ++++------
 arch/arm64/boot/dts/apple/t6022.dtsi      | 18 ++++++++----------
 arch/arm64/boot/dts/apple/t602x-die0.dtsi |  2 ++
 arch/arm64/boot/dts/apple/t602x-dieX.dtsi |  2 ++
 arch/arm64/boot/dts/apple/t602x-nvme.dtsi |  2 ++
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/arch/arm64/boot/dts/apple/t6021.dtsi b/arch/arm64/boot/dts/apple/t6021.dtsi
index 5175797baf62..3cddc1697e14 100644
--- a/arch/arm64/boot/dts/apple/t6021.dtsi
+++ b/arch/arm64/boot/dts/apple/t6021.dtsi
@@ -35,13 +35,11 @@ soc {
 
 #define DIE
 #define DIE_NO 0
+#define SOC_NODE {/soc}
 
-&{/soc} {
-	#include "t602x-die0.dtsi"
-	#include "t602x-dieX.dtsi"
-	#include "t602x-nvme.dtsi"
-};
-
+#include "t602x-die0.dtsi"
+#include "t602x-dieX.dtsi"
+#include "t602x-nvme.dtsi"
 #include "t602x-gpio-pins.dtsi"
 #include "t602x-pmgr.dtsi"
 
diff --git a/arch/arm64/boot/dts/apple/t6022.dtsi b/arch/arm64/boot/dts/apple/t6022.dtsi
index 7585fd609d34..0feda70568ee 100644
--- a/arch/arm64/boot/dts/apple/t6022.dtsi
+++ b/arch/arm64/boot/dts/apple/t6022.dtsi
@@ -294,32 +294,30 @@ die1: soc@2200000000 {
 
 #define DIE
 #define DIE_NO 0
+#define SOC_NODE die0
 
-&die0 {
-	#include "t602x-die0.dtsi"
-	#include "t602x-dieX.dtsi"
-};
-
+#include "t602x-die0.dtsi"
+#include "t602x-dieX.dtsi"
 #include "t602x-pmgr.dtsi"
 #include "t602x-gpio-pins.dtsi"
 
 #undef DIE
 #undef DIE_NO
+#undef SOC_NODE
 
 #define DIE _die1
 #define DIE_NO 1
+#define SOC_NODE die1
 
-&die1 {
-	#include "t602x-dieX.dtsi"
-	#include "t602x-nvme.dtsi"
-};
-
+#include "t602x-dieX.dtsi"
+#include "t602x-nvme.dtsi"
 #include "t602x-pmgr.dtsi"
 
 /delete-node/ &ps_pmp_die1;
 
 #undef DIE
 #undef DIE_NO
+#undef SOC_NODE
 
 &aic {
 	affinities {
diff --git a/arch/arm64/boot/dts/apple/t602x-die0.dtsi b/arch/arm64/boot/dts/apple/t602x-die0.dtsi
index c33623f0e27a..05819755a18f 100644
--- a/arch/arm64/boot/dts/apple/t602x-die0.dtsi
+++ b/arch/arm64/boot/dts/apple/t602x-die0.dtsi
@@ -6,6 +6,7 @@
  * Copyright The Asahi Linux Contributors
  */
 
+&SOC_NODE {
 	nco: clock-controller@28e03c000 {
 		compatible = "apple,t6020-nco", "apple,t8103-nco";
 		reg = <0x2 0x8e03c000 0x0 0x14000>;
@@ -590,3 +591,4 @@ pcie0_dart_3: iommu@597000000 {
 		power-domains = <&ps_apcie_gp_sys>;
 		status = "disabled";
 	};
+};
diff --git a/arch/arm64/boot/dts/apple/t602x-dieX.dtsi b/arch/arm64/boot/dts/apple/t602x-dieX.dtsi
index ae3d535c5acb..4044c4f21795 100644
--- a/arch/arm64/boot/dts/apple/t602x-dieX.dtsi
+++ b/arch/arm64/boot/dts/apple/t602x-dieX.dtsi
@@ -5,6 +5,7 @@
  * Copyright The Asahi Linux Contributors
  */
 
+&SOC_NODE {
 	DIE_NODE(cpufreq_e): cpufreq@210e20000 {
 		compatible = "apple,t6020-cluster-cpufreq", "apple,t8112-cluster-cpufreq";
 		reg = <0x2 0x10e20000 0 0x1000>;
@@ -338,3 +339,4 @@ DIE_NODE(atcphy3): phy@1303000000 {
 		mode-switch;
 		power-domains = <&DIE_NODE(ps_atc3_usb)>;
 	};
+};
diff --git a/arch/arm64/boot/dts/apple/t602x-nvme.dtsi b/arch/arm64/boot/dts/apple/t602x-nvme.dtsi
index 590cec8ac804..d1f4267a6cd2 100644
--- a/arch/arm64/boot/dts/apple/t602x-nvme.dtsi
+++ b/arch/arm64/boot/dts/apple/t602x-nvme.dtsi
@@ -5,6 +5,7 @@
  * Copyright The Asahi Linux Contributors
  */
 
+&SOC_NODE {
 	DIE_NODE(ans_mbox): mbox@347408000 {
 		compatible = "apple,t6020-asc-mailbox", "apple,asc-mailbox-v4";
 		reg = <0x3 0x47408000 0x0 0x4000>;
@@ -40,3 +41,4 @@ DIE_NODE(nvme): nvme@34bcc0000 {
 		power-domain-names = "ans", "apcie0", "apcie1";
 		resets = <&DIE_NODE(ps_ans2)>;
 	};
+};

-- 
2.55.0


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH 3/3] arm64: dts: apple: Fix style issues for t6031 multi die .dtsi
  2026-09-03 13:59 [PATCH 0/3] Fix dt-style-check issues in Apple silicon multi die .dtsi Janne Grunau
  2026-09-03 13:59 ` [PATCH 1/3] arm64: dts: apple: Fix style issues for t600x " Janne Grunau
  2026-09-03 13:59 ` [PATCH 2/3] arm64: dts: apple: Fix style issues for t602x " Janne Grunau
@ 2026-09-03 13:59 ` Janne Grunau
  2026-09-04  6:23   ` Krzysztof Kozlowski
  2026-09-04 15:08 ` [PATCH 0/3] Fix dt-style-check issues in Apple silicon " Sven Peter
  3 siblings, 1 reply; 9+ messages in thread
From: Janne Grunau @ 2026-09-03 13:59 UTC (permalink / raw)
  To: Sven Peter, Neal Gompa, Rob Herring, Krzysztof Kozlowski,
	Conor Dooley
  Cc: asahi, linux-arm-kernel, devicetree, linux-kernel, Janne Grunau,
	Krzysztof Kozlowski

The M3 Max/Ultra .dtsi files containing most MMIO nodes are a collection
of nodes without parent. The proper embedding inside a "simple-bus"
parent only happens in t6031.dtsi and t6032.dtsi.
Fix these dt style issue by using a define for their parent soc node and
bracket those MMIO nodes inside it.

Link: https://lore.kernel.org/asahi/e2365307-32d6-4ef9-9919-55ba69786741@kernel.org/
Suggested-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Janne Grunau <j@jannau.net>
---
 arch/arm64/boot/dts/apple/t6031-die0.dtsi |  2 ++
 arch/arm64/boot/dts/apple/t6031-dieX.dtsi |  2 ++
 arch/arm64/boot/dts/apple/t6031.dtsi      |  9 ++++-----
 arch/arm64/boot/dts/apple/t6032.dtsi      | 16 +++++++---------
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/arch/arm64/boot/dts/apple/t6031-die0.dtsi b/arch/arm64/boot/dts/apple/t6031-die0.dtsi
index 47d08672a047..cffab6b51d12 100644
--- a/arch/arm64/boot/dts/apple/t6031-die0.dtsi
+++ b/arch/arm64/boot/dts/apple/t6031-die0.dtsi
@@ -6,6 +6,7 @@
  * Copyright The Asahi Linux Contributors
  */
 
+&SOC_NODE {
 	aic: interrupt-controller@292400000 {
 		compatible = "apple,t6031-aic3", "apple,t8122-aic3";
 		#interrupt-cells = <4>;
@@ -195,3 +196,4 @@ serial0: serial@391200000 {
 		power-domains = <&ps_uart0>;
 		status = "disabled";
 	};
+};
diff --git a/arch/arm64/boot/dts/apple/t6031-dieX.dtsi b/arch/arm64/boot/dts/apple/t6031-dieX.dtsi
index 2e9d3d2e6dea..524a72f5483e 100644
--- a/arch/arm64/boot/dts/apple/t6031-dieX.dtsi
+++ b/arch/arm64/boot/dts/apple/t6031-dieX.dtsi
@@ -6,6 +6,7 @@
  * Copyright The Asahi Linux Contributors
  */
 
+&SOC_NODE {
 	DIE_NODE(pmgr): power-management@292280000 {
 		compatible = "apple,t6031-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd";
 		#address-cells = <1>;
@@ -105,3 +106,4 @@ DIE_NODE(pmgr_gfx): power-management@408e80000 {
 
 		reg = <0x4 0x8e80000 0 0x4000>;
 	};
+};
diff --git a/arch/arm64/boot/dts/apple/t6031.dtsi b/arch/arm64/boot/dts/apple/t6031.dtsi
index 0059afe9a844..2ba0768c33bc 100644
--- a/arch/arm64/boot/dts/apple/t6031.dtsi
+++ b/arch/arm64/boot/dts/apple/t6031.dtsi
@@ -35,14 +35,13 @@ soc: soc {
 
 #define DIE
 #define DIE_NO 0
+#define SOC_NODE soc
 
-&soc {
-	#include "t6031-die0.dtsi"
-	#include "t6031-dieX.dtsi"
-};
-
+#include "t6031-die0.dtsi"
+#include "t6031-dieX.dtsi"
 #include "t6031-gpio-pins.dtsi"
 #include "t6031-pmgr.dtsi"
 
 #undef DIE
 #undef DIE_NO
+#undef SOC_NODE
diff --git a/arch/arm64/boot/dts/apple/t6032.dtsi b/arch/arm64/boot/dts/apple/t6032.dtsi
index bbf19ecdaaec..12171efe8e2e 100644
--- a/arch/arm64/boot/dts/apple/t6032.dtsi
+++ b/arch/arm64/boot/dts/apple/t6032.dtsi
@@ -317,31 +317,29 @@ die1: soc@2200000000 {
 
 #define DIE
 #define DIE_NO 0
+#define SOC_NODE die0
 
-&die0 {
-	#include "t6031-die0.dtsi"
-	#include "t6031-dieX.dtsi"
-};
-
+#include "t6031-die0.dtsi"
+#include "t6031-dieX.dtsi"
 #include "t6031-pmgr.dtsi"
 #include "t6031-gpio-pins.dtsi"
 
 #undef DIE
 #undef DIE_NO
+#undef SOC_NODE
 
 #define DIE _die1
 #define DIE_NO 1
+#define SOC_NODE die1
 
-&die1 {
-	#include "t6031-dieX.dtsi"
-};
-
+#include "t6031-dieX.dtsi"
 #include "t6031-pmgr.dtsi"
 
 /delete-node/ &ps_pmp_die1;
 
 #undef DIE
 #undef DIE_NO
+#undef SOC_NODE
 
 /* delete non-present DISP power-states */
 /delete-node/ &ps_disp_cpu;

-- 
2.55.0


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [PATCH 2/3] arm64: dts: apple: Fix style issues for t602x multi die .dtsi
  2026-09-03 13:59 ` [PATCH 2/3] arm64: dts: apple: Fix style issues for t602x " Janne Grunau
@ 2026-09-03 14:13   ` sashiko-bot
  2026-09-04  6:22   ` Krzysztof Kozlowski
  1 sibling, 0 replies; 9+ messages in thread
From: sashiko-bot @ 2026-09-03 14:13 UTC (permalink / raw)
  To: Janne Grunau; +Cc: devicetree, robh, conor+dt

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] Missing `#undef SOC_NODE` in `t6021.dtsi` pollutes the preprocessor namespace for any files that include it.
--

commit 15841a7911d15e65ab6085742e273164257c003e
Author: Janne Grunau <j@jannau.net>

arm64: dts: apple: Fix style issues for t602x multi die .dtsi

The M2 Pro/Max/Ultra .dtsi files containing most MMIO nodes are a
collection of nodes without parent. The proper embedding inside a
"simple-bus" parent only happens in t6021.dtsi and t6022.dtsi.
Fix these dt style issue by using a define for their parent soc node and
bracket those MMIO nodes inside it.

Link: https://lore.kernel.org/asahi/e2365307-32d6-4ef9-9919-55ba69786741@kernel.org/

> diff --git a/arch/arm64/boot/dts/apple/t6021.dtsi b/arch/arm64/boot/dts/apple/t6021.dtsi
> index 5175797baf621..3cddc1697e147 100644
> --- a/arch/arm64/boot/dts/apple/t6021.dtsi
> +++ b/arch/arm64/boot/dts/apple/t6021.dtsi
> @@ -35,13 +35,11 @@ soc {
>  
>  #define DIE
>  #define DIE_NO 0
> +#define SOC_NODE {/soc}
>  
> -&{/soc} {
> -	#include "t602x-die0.dtsi"
> -	#include "t602x-dieX.dtsi"
> -	#include "t602x-nvme.dtsi"
> -};
> -
> +#include "t602x-die0.dtsi"
> +#include "t602x-dieX.dtsi"
> +#include "t602x-nvme.dtsi"
>  #include "t602x-gpio-pins.dtsi"
>  #include "t602x-pmgr.dtsi"

[Severity: Low]
Does this leave the SOC_NODE macro defined for any file including t6021.dtsi?

There are existing macro cleanups right after this block in the file:

#undef DIE
#undef DIE_NO

&aic {

Is an #undef SOC_NODE missing here? Leaving it defined pollutes the
preprocessor namespace and deviates from the cleanup pattern used in sibling
files like t6022.dtsi.

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20260903-apple-soc-multi-die-style-v1-0-eeb05ea0c187@jannau.net?part=2

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 1/3] arm64: dts: apple: Fix style issues for t600x multi die .dtsi
  2026-09-03 13:59 ` [PATCH 1/3] arm64: dts: apple: Fix style issues for t600x " Janne Grunau
@ 2026-09-04  6:22   ` Krzysztof Kozlowski
  0 siblings, 0 replies; 9+ messages in thread
From: Krzysztof Kozlowski @ 2026-09-04  6:22 UTC (permalink / raw)
  To: Janne Grunau, Sven Peter, Neal Gompa, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley
  Cc: asahi, linux-arm-kernel, devicetree, linux-kernel

On 03/09/2026 15:59, Janne Grunau wrote:
> The M1 Pro/Max/Ultra .dtsi files containing most MMIO nodes are a
> collection of nodes without parent. The proper embedding inside a
> "simple-bus" parent only happens in t6001.dtsi and t6002.dtsi.
> Fix these dt style issue by using a define for their parent soc node and
> bracket those MMIO nodes inside it.
> 
> Link: https://lore.kernel.org/asahi/e2365307-32d6-4ef9-9919-55ba69786741@kernel.org/
> Suggested-by: Krzysztof Kozlowski <krzk@kernel.org>
> Signed-off-by: Janne Grunau <j@jannau.net>
> ---

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>

Best regards,
Krzysztof

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 2/3] arm64: dts: apple: Fix style issues for t602x multi die .dtsi
  2026-09-03 13:59 ` [PATCH 2/3] arm64: dts: apple: Fix style issues for t602x " Janne Grunau
  2026-09-03 14:13   ` sashiko-bot
@ 2026-09-04  6:22   ` Krzysztof Kozlowski
  1 sibling, 0 replies; 9+ messages in thread
From: Krzysztof Kozlowski @ 2026-09-04  6:22 UTC (permalink / raw)
  To: Janne Grunau, Sven Peter, Neal Gompa, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley
  Cc: asahi, linux-arm-kernel, devicetree, linux-kernel

On 03/09/2026 15:59, Janne Grunau wrote:
> The M2 Pro/Max/Ultra .dtsi files containing most MMIO nodes are a
> collection of nodes without parent. The proper embedding inside a
> "simple-bus" parent only happens in t6021.dtsi and t6022.dtsi.
> Fix these dt style issue by using a define for their parent soc node and
> bracket those MMIO nodes inside it.
> 
> Link: https://lore.kernel.org/asahi/e2365307-32d6-4ef9-9919-55ba69786741@kernel.org/
> Suggested-by: Krzysztof Kozlowski <krzk@kernel.org>
> Signed-off-by: Janne Grunau <j@jannau.net>

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>

Best regards,
Krzysztof

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 3/3] arm64: dts: apple: Fix style issues for t6031 multi die .dtsi
  2026-09-03 13:59 ` [PATCH 3/3] arm64: dts: apple: Fix style issues for t6031 " Janne Grunau
@ 2026-09-04  6:23   ` Krzysztof Kozlowski
  0 siblings, 0 replies; 9+ messages in thread
From: Krzysztof Kozlowski @ 2026-09-04  6:23 UTC (permalink / raw)
  To: Janne Grunau, Sven Peter, Neal Gompa, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley
  Cc: asahi, linux-arm-kernel, devicetree, linux-kernel

On 03/09/2026 15:59, Janne Grunau wrote:
> The M3 Max/Ultra .dtsi files containing most MMIO nodes are a collection
> of nodes without parent. The proper embedding inside a "simple-bus"
> parent only happens in t6031.dtsi and t6032.dtsi.
> Fix these dt style issue by using a define for their parent soc node and
> bracket those MMIO nodes inside it.
> 
> Link: https://lore.kernel.org/asahi/e2365307-32d6-4ef9-9919-55ba69786741@kernel.org/
> Suggested-by: Krzysztof Kozlowski <krzk@kernel.org>
> Signed-off-by: Janne Grunau <j@jannau.net>
> ---

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>

Best regards,
Krzysztof

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 0/3] Fix dt-style-check issues in Apple silicon multi die .dtsi
  2026-09-03 13:59 [PATCH 0/3] Fix dt-style-check issues in Apple silicon multi die .dtsi Janne Grunau
                   ` (2 preceding siblings ...)
  2026-09-03 13:59 ` [PATCH 3/3] arm64: dts: apple: Fix style issues for t6031 " Janne Grunau
@ 2026-09-04 15:08 ` Sven Peter
  3 siblings, 0 replies; 9+ messages in thread
From: Sven Peter @ 2026-09-04 15:08 UTC (permalink / raw)
  To: Neal Gompa, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
	Janne Grunau
  Cc: Sven Peter, asahi, linux-arm-kernel, devicetree, linux-kernel,
	Krzysztof Kozlowski

On Thu, 03 Sep 2026 15:59:31 +0200, Janne Grunau wrote:
> The MMIO nodes in t60{0x,2x,31}-{die0,dieX,nvme}.dtsi are indented by
> one level to signify that included at this level. This looks weird by
> itself and dt-style-check comaplains about it. This can be fixed by
> moving the referenced soc nodes into these .dtsi files. Since the parent
> soc node varies add a preprocessor define for them. The multi die .dtsi
> files already depend on the preprocessor. Suggested by Krzysztof
> Kozlowski in [1].
> 
> [...]

Applied to local tree (apple-soc/dt-7.4), thanks!

[1/3] arm64: dts: apple: Fix style issues for t600x multi die .dtsi
      https://github.com/AsahiLinux/linux/commit/7973168301e4
[2/3] arm64: dts: apple: Fix style issues for t602x multi die .dtsi
      https://github.com/AsahiLinux/linux/commit/dc0336fd26c4
[3/3] arm64: dts: apple: Fix style issues for t6031 multi die .dtsi
      https://github.com/AsahiLinux/linux/commit/f3f2d38a606e

Best regards,
-- 
Sven Peter <sven@kernel.org>


^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2026-09-04 15:08 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-09-03 13:59 [PATCH 0/3] Fix dt-style-check issues in Apple silicon multi die .dtsi Janne Grunau
2026-09-03 13:59 ` [PATCH 1/3] arm64: dts: apple: Fix style issues for t600x " Janne Grunau
2026-09-04  6:22   ` Krzysztof Kozlowski
2026-09-03 13:59 ` [PATCH 2/3] arm64: dts: apple: Fix style issues for t602x " Janne Grunau
2026-09-03 14:13   ` sashiko-bot
2026-09-04  6:22   ` Krzysztof Kozlowski
2026-09-03 13:59 ` [PATCH 3/3] arm64: dts: apple: Fix style issues for t6031 " Janne Grunau
2026-09-04  6:23   ` Krzysztof Kozlowski
2026-09-04 15:08 ` [PATCH 0/3] Fix dt-style-check issues in Apple silicon " Sven Peter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox