Fix dt-style-check issues in Apple silicon multi die .dtsi

[PATCH 0/3] Fix dt-style-check issues in Apple silicon multi die .dtsi

Janne Grunau posted 3 patches 3 weeks, 1 day ago

Download series mbox

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(-)

Expand all Fold all

[PATCH 0/3] Fix dt-style-check issues in Apple silicon multi die .dtsi

Posted by Janne Grunau 3 weeks, 1 day ago

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>

Re: [PATCH 0/3] Fix dt-style-check issues in Apple silicon multi die .dtsi

Posted by Sven Peter 3 weeks ago

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>