From nobody Sat Sep 26 07:17:11 2026 Received: from fhigh-a4-smtp.messagingengine.com (fhigh-a4-smtp.messagingengine.com [103.168.172.155]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C958C4B1B33; Thu, 3 Sep 2026 13:59:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.155 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788443993; cv=none; b=ERbhQhJPNNMXEMNSpts+ER4RJYRC27US1vZd+LxlqXC0reiAu5KzBbXsVOthmJ1WYzl1+kGd3BOq9KHjDp9jMG1nVB5j6hOQjucjXvr7H5tueQhLiD6BKEgbEEDIYpnr7dvESUWEjKYyTZe0oHHtaLVP5bIOmzYdTbTFyyBeOkc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788443993; c=relaxed/simple; bh=SQINWDUj6JgqHfaw6SAgmrPkNaAA7STObGtyHJjbY9I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BKBtQ+6mpLAThOHhpwoBGfiXaeogPJLcVjoX83YfM8VgkjqessNCBkZ3iIDYVO5HIdh0yV4Q+jU1ic+E/Nw9k5l4s1WbowLWh8gdHhOt4qDP22fOxbv1ChGowjhz8grMkbLXazUt6+uJ2IklCQOEsCi/FldZz1zsDtL3dC2dXIE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=jannau.net; spf=pass smtp.mailfrom=jannau.net; dkim=pass (2048-bit key) header.d=jannau.net header.i=@jannau.net header.b=YRERS4gp; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=AMpWVWj1; arc=none smtp.client-ip=103.168.172.155 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=jannau.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=jannau.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=jannau.net header.i=@jannau.net header.b="YRERS4gp"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="AMpWVWj1" Received: from phl-compute-03.internal (phl-compute-03.internal [10.202.2.43]) by mailfhigh.phl.internal (Postfix) with ESMTP id DE53D14000F5; Thu, 3 Sep 2026 09:59:36 -0400 (EDT) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-03.internal (MEProxy); Thu, 03 Sep 2026 09:59:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jannau.net; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1788443976; x=1788530376; bh=sBine+VGUispbbJYZQl5o9VIXDJ1/236RlFhB9q5Dow=; b= YRERS4gp1KBcvCaGkUKZBp7zjpVA+cG+9OUxMgTbOfm/WoDiTstBqw56c3289NeZ M92RLGyomtGVpwTL4YxXuIqT6+L0OLerXIeW9FHupdV0c3z6ywr2MrwIKdB4WHil By5es/KEY5M1apYLY3WP++hvzBTVWFZObiGvnHIFsPnfN+MSurj4j3uTvUOH52Et oXCa1oYlwBdvTy3CYZA+pzvEv6dEh2CxjXvPOHDqCDBMFi05CNMPUympf45LuaKb XCj0HJFuq3pbK0uwGbz2ZeM4HJXbrk0umOPOj9ZpkdBEHzohJnPCGFJo3qmkec6S +pQv2gv0ZqowjIPRWzbZog== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1788443976; x= 1788530376; bh=sBine+VGUispbbJYZQl5o9VIXDJ1/236RlFhB9q5Dow=; b=A MpWVWj1hRvqDXXew8MzRZZVYD8SFyQEOnS9lt/MJds7Psb3maGib26VoO5Jy0oF5 eJ4fpom9MmD+2r+HqECtymslUDdDjnRv5+8fQ0OHA48fZKyTUWue7WxKqVH9+pw4 hS92PL56HJ6HWuiqIB4n/mEX0uNMluaLbVom4OzD7iW+dws2DEZt5KehFvDAwYJP N9XLEadmD1y2en6ZijtMhAePktHNxraHVgSHbewEwvbzHkHOsq0H+Su9j682466+ Uw5T+bn7PcOQglkC2Yv0H6V8jac+8VDGNZrA4n+E4beWhurJbI5YB2LQLBd+Z0vm nPnhLvcY3sx0kfPWcCRKA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTEIYzIeAqti25ZE1E1v/teuEWoWHdBGF9H6h1LlXnmo2R4EOE7VsCk1odudTIRvm6 eFOD5Mzpiu++QVbazB15zOz7x78D6TrVj+MRoE6GWdsrgwhGvsWp//oRGZgcNrTQHmsZsD 6EMECrQXWGNUBjE6Lz2aC6Mm6PlUUg6prWJ1te6HWPd/TwVQfquQNgxNGqHmAtfmOH+Mib 5jimAPqGOjLutrFHdJgt6a4HXl0HbB79QwoEalQxPR6LIK/aiy80/UOn42xgHOI6oc8jpF BjB4vrjIQnYLCBx2i6bYEv1/2tiG2Nk0dSzRkL7vamhK7Swptm44Mzpwg9NHc32FMWNSgg JNGMm0QIFdpV3zmtRwiL5r8q4JFGlJYZ2NHFazmJ9QzzHHo0fp3rl1q0kCUtF4kascevAr 8E5p5n6bgOe1J9acd6dGPXMfxbDWZ/DrS7cS/2DcYPpQ6i3MEu8rP3tDU36tz3lb4YbQpL goPy5iJ/zuOt1m/tO+u7nZCJchZTaDBfgYQfXh20FUGzhKJyNRPrIqAWlpW7QGt/sb1uLY 9rc7uwbipixJBeLPcQrOnRi0x2xwywP7SB9/Rz26yOFjuvX59Ob6w8If0e+JR92L/VyCxO ednM4qBvBV4NONU5+I6H7O2OMhSkAo9YnOp7jg98p3I59nybH9KLYRilEimA X-ME-Proxy: Feedback-ID: i47b949f6:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 3 Sep 2026 09:59:36 -0400 (EDT) From: Janne Grunau Date: Thu, 03 Sep 2026 15:59:32 +0200 Subject: [PATCH 1/3] arm64: dts: apple: Fix style issues for t600x multi die .dtsi Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260903-apple-soc-multi-die-style-v1-1-eeb05ea0c187@jannau.net> References: <20260903-apple-soc-multi-die-style-v1-0-eeb05ea0c187@jannau.net> In-Reply-To: <20260903-apple-soc-multi-die-style-v1-0-eeb05ea0c187@jannau.net> To: Sven Peter , Neal Gompa , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Janne Grunau , Krzysztof Kozlowski X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4174; i=j@jannau.net; s=yk2025; h=from:subject:message-id; bh=SQINWDUj6JgqHfaw6SAgmrPkNaAA7STObGtyHJjbY9I=; b=owGbwMvMwCW2UNrmdq9+ahrjabUkhqyZtS5L5FZOv3ch8X2f/IpDfwv7LFPEJSTWznbbJpka3 6xltVyzo5SFQYyLQVZMkSVJ+2UHw+oaxZjaB2Ewc1iZQIYwcHEKwES8HjIyLGqcf9axWKHSZCdb hIuh397CnEciZ/+aH1MLuK+5WEGUneF/6ivB7e8C5tXujblzbN+pn4V5Mi22ji8jtVOviFSHP9j ACgA= X-Developer-Key: i=j@jannau.net; a=openpgp; fpr=8B336A6BE4E5695E89B8532B81E806F586338419 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@ke= rnel.org/ Suggested-by: Krzysztof Kozlowski Signed-off-by: Janne Grunau Reviewed-by: Krzysztof Kozlowski --- 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/app= le/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 { =20 #define DIE #define DIE_NO 0 +#define SOC_NODE {/soc} =20 -&{/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" =20 #undef DIE #undef DIE_NO +#undef SOC_NODE =20 =20 &aic { diff --git a/arch/arm64/boot/dts/apple/t6002.dtsi b/arch/arm64/boot/dts/app= le/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 { =20 #define DIE #define DIE_NO 0 +#define SOC_NODE die0 =20 -&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" =20 #undef DIE #undef DIE_NO +#undef SOC_NODE =20 #define DIE _die1 #define DIE_NO 1 +#define SOC_NODE die1 =20 -&die1 { - #include "t600x-dieX.dtsi" - #include "t600x-nvme.dtsi" -}; - +#include "t600x-dieX.dtsi" +#include "t600x-nvme.dtsi" #include "t600x-pmgr.dtsi" =20 #undef DIE #undef DIE_NO +#undef SOC_NODE =20 &aic { affinities { diff --git a/arch/arm64/boot/dts/apple/t600x-die0.dtsi b/arch/arm64/boot/dt= s/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 */ =20 - +&SOC_NODE { nco: clock-controller@28e03c000 { compatible =3D "apple,t6000-nco", "apple,nco"; reg =3D <0x2 0x8e03c000 0x0 0x14000>; @@ -537,3 +537,4 @@ port03: pci@3,0 { status =3D "disabled"; }; }; +}; diff --git a/arch/arm64/boot/dts/apple/t600x-dieX.dtsi b/arch/arm64/boot/dt= s/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 */ =20 +&SOC_NODE { DIE_NODE(cpufreq_e): cpufreq@210e20000 { compatible =3D "apple,t6000-cluster-cpufreq", "apple,t8103-cluster-cpufr= eq", "apple,cluster-cpufreq"; reg =3D <0x2 0x10e20000 0 0x1000>; @@ -331,3 +332,4 @@ DIE_NODE(atcphy3): phy@1303000000 { mode-switch; power-domains =3D <&DIE_NODE(ps_atc3_usb)>; }; +}; diff --git a/arch/arm64/boot/dts/apple/t600x-nvme.dtsi b/arch/arm64/boot/dt= s/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 */ =20 +&SOC_NODE { DIE_NODE(ans_mbox): mbox@38f408000 { compatible =3D "apple,t6000-asc-mailbox", "apple,asc-mailbox-v4"; reg =3D <0x3 0x8f408000 0x0 0x4000>; @@ -40,3 +41,4 @@ DIE_NODE(nvme): nvme@393cc0000 { power-domain-names =3D "ans", "apcie0", "apcie1"; resets =3D <&DIE_NODE(ps_ans2)>; }; +}; --=20 2.55.0 From nobody Sat Sep 26 07:17:11 2026 Received: from fout-a1-smtp.messagingengine.com (fout-a1-smtp.messagingengine.com [103.168.172.144]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3425F4B2023; Thu, 3 Sep 2026 13:59:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.144 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788443999; cv=none; b=LVG9RQJl2TFzOCbzSIxNzpp3f3DXzOP0TV2bHazU8Yj8eqiseuCONr3tbKkPgrDiwVyGEzBCNTnLIZLLyx/n2pjp85P6r6+7O8FaDNYvav1/A3MdPzCZTBr6iEG9siXWlYdPUocR6F+fH5T8DMwVDdxDqgRr/daqnfvM7Uq+dcA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788443999; c=relaxed/simple; bh=gV+6atf6ncS6fsyXv7xAArWLeduGgxbT0Q5oOMKjwo4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GpJNPpX+KNX/2qKTWAj//AlJQtU0zsWGLQ6OzJWvJa2vdIIbLU9nam/r9kmJOaeiJDD9bkeqS3d0cqSVGJa3gW5eW79FApdXQPhOk3ZrNv0BuzN1CM4sO2jFdYktw9K3MObmJ9uAWCBUgP8nilhmSt8I7pVLUn86rQ7bTpeKHr8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=jannau.net; spf=pass smtp.mailfrom=jannau.net; dkim=pass (2048-bit key) header.d=jannau.net header.i=@jannau.net header.b=Iz68H69E; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=Niv5AA8a; arc=none smtp.client-ip=103.168.172.144 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=jannau.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=jannau.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=jannau.net header.i=@jannau.net header.b="Iz68H69E"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="Niv5AA8a" Received: from phl-compute-06.internal (phl-compute-06.internal [10.202.2.46]) by mailfout.phl.internal (Postfix) with ESMTP id E9F9DEC02A0; Thu, 3 Sep 2026 09:59:38 -0400 (EDT) Received: from phl-frontend-04 ([10.202.2.163]) by phl-compute-06.internal (MEProxy); Thu, 03 Sep 2026 09:59:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jannau.net; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1788443978; x=1788530378; bh=A28Wf9L2n/V5TpFU7VZJAIMyJkq07hXUIHCEXp8fTXU=; b= Iz68H69EnfhOQ5deFEYWWoXcHd50Xg6xueW2CVicAbp+9G+UCJgqkwA1gO3zDSVf k0HJ3Zv0iwA7RkR3rdepnUgKjKgdrps+Hwv/0+LYt8HmICTw+OZW9pAAvJhvbxDh tShoGCOWt/uTZPYCJK4W6CVAd2aRHgxCIgAgq85o9SdGG/N2v7PZ3LCBV8+BMdyx xXXGyn38gyx5qoqhLi3AhvTR+hntUGScsbShPDyN/zKLs3J1xQXr5m8mWzG8xgMU /dSIQniynK2L6GF4sNczCEtLAzQC+oYolFApoJAHXP2SbeUf06twoXzJS8CeT9jZ 4GlmUfCBz7fZYwrUY2+ZkA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1788443978; x= 1788530378; bh=A28Wf9L2n/V5TpFU7VZJAIMyJkq07hXUIHCEXp8fTXU=; b=N iv5AA8a8AMYYr3hOhmnQ06dsz/TmblGH3Z8AuPtNyWGRc50cPach08bI2FJI8bN2 eabmbVKt27jcJoR+Zdb2O7XaQXsdZ3oGVTizE9F9VutTUxp5Zh56yvbME21mT1Hs FeOQUExAMH5dHuLuduS5xh1zEyONg1zKd/R4eWGTE7WshNDr/ahFOYcRdPF0cLJq 8+mPQC3esmRSeRFv5mul+P2BE1c91wKGC8pMlbDWBsyEV/NtuadtpvNEJqKzfJK8 Kc/1lOQ+oxz6IW9akVFISL0eAWDbCPd6mUWMzgUs1vrQdIqTbKbkTwcNWDIfKjVI rmuVG3YGhr2KckzRnKTJA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTEIYzIeAqti25ZE1E1v/teuEWoWHdBGF9H6h1LlXnmo2R4EOE7VsCk1odudTIRvm6 eFOD5Mzpiu++QVbazB15zOz7x78D6TrVj+MRoE6GWdsrgwhGvsWp//oRGZgcNrTQHmsZsD 6EMECrQXWGNUBjE6Lz2aC6Mm6PlUUg6prWJ1te6HWPd/TwVQfquQNgxNGqHmAtfmOH+Mib 5jimAPqGOjLutrFHdJgt6a4HXl0HbB79QwoEalQxPR6LIK/aiy80/UOn42xgHOI6oc8jpF BjB4vrjIQnYLCBx2i6bYEv1/2tiG2Nk0dSzRkL7vamhK7Swptm44Mzpwg9NHc32FMWNSp4 g7uwTX4KIDW7PUSFkW4dMflX1iseksjWuY9f/peQBNfrARFlUDFxwh/EythR3SxK3EAWVj iqUgUMs286yISj2hOSVMQRCX5xuMxutt69qKsV4RvKPyUh3ud+tgbPkIQis4M5UWUQCFW4 nNyQevgOj/XA0w+WQ+ai3Dm+K0gP8Y3hTkrFwvR6mI21rXG71AWVcSpLXLnWJQx9AKqcyw eIuJxzP8koP5D0LS1PxFkV08vn4UU+d7s2dUkDImTa58GYYj3MSkgIzf9mvL9kyIj0kz79 KPT8cdnf/5ZbQL88li6mt1vaSTEVRMqVt1SiqubscMIgbaO0IbZaQPdWvQaQ X-ME-Proxy: Feedback-ID: i47b949f6:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 3 Sep 2026 09:59:38 -0400 (EDT) From: Janne Grunau Date: Thu, 03 Sep 2026 15:59:33 +0200 Subject: [PATCH 2/3] arm64: dts: apple: Fix style issues for t602x multi die .dtsi Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260903-apple-soc-multi-die-style-v1-2-eeb05ea0c187@jannau.net> References: <20260903-apple-soc-multi-die-style-v1-0-eeb05ea0c187@jannau.net> In-Reply-To: <20260903-apple-soc-multi-die-style-v1-0-eeb05ea0c187@jannau.net> To: Sven Peter , Neal Gompa , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Janne Grunau , Krzysztof Kozlowski X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4167; i=j@jannau.net; s=yk2025; h=from:subject:message-id; bh=gV+6atf6ncS6fsyXv7xAArWLeduGgxbT0Q5oOMKjwo4=; b=owGbwMvMwCW2UNrmdq9+ahrjabUkhqyZtS4/Oi7pe4R4PL/c/vZUSkfo8nvb167cWqy1Z+VO+ 8rK7e9bO0pZGMS4GGTFFFmStF92MKyuUYypfRAGM4eVCWQIAxenAExEv47hNwsP15mtybpebx+5 h9Vs/fcgL/ji56bPTVeaHMTSOQ/axjAyLJ3l6fz7VUltz4obW8+6MER3/Tn7oILx/BXdpWYKNgm 32AA= X-Developer-Key: i=j@jannau.net; a=openpgp; fpr=8B336A6BE4E5695E89B8532B81E806F586338419 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@ke= rnel.org/ Suggested-by: Krzysztof Kozlowski Signed-off-by: Janne Grunau Reviewed-by: Krzysztof Kozlowski --- 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/app= le/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 { =20 #define DIE #define DIE_NO 0 +#define SOC_NODE {/soc} =20 -&{/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" =20 diff --git a/arch/arm64/boot/dts/apple/t6022.dtsi b/arch/arm64/boot/dts/app= le/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 { =20 #define DIE #define DIE_NO 0 +#define SOC_NODE die0 =20 -&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" =20 #undef DIE #undef DIE_NO +#undef SOC_NODE =20 #define DIE _die1 #define DIE_NO 1 +#define SOC_NODE die1 =20 -&die1 { - #include "t602x-dieX.dtsi" - #include "t602x-nvme.dtsi" -}; - +#include "t602x-dieX.dtsi" +#include "t602x-nvme.dtsi" #include "t602x-pmgr.dtsi" =20 /delete-node/ &ps_pmp_die1; =20 #undef DIE #undef DIE_NO +#undef SOC_NODE =20 &aic { affinities { diff --git a/arch/arm64/boot/dts/apple/t602x-die0.dtsi b/arch/arm64/boot/dt= s/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 */ =20 +&SOC_NODE { nco: clock-controller@28e03c000 { compatible =3D "apple,t6020-nco", "apple,t8103-nco"; reg =3D <0x2 0x8e03c000 0x0 0x14000>; @@ -590,3 +591,4 @@ pcie0_dart_3: iommu@597000000 { power-domains =3D <&ps_apcie_gp_sys>; status =3D "disabled"; }; +}; diff --git a/arch/arm64/boot/dts/apple/t602x-dieX.dtsi b/arch/arm64/boot/dt= s/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 */ =20 +&SOC_NODE { DIE_NODE(cpufreq_e): cpufreq@210e20000 { compatible =3D "apple,t6020-cluster-cpufreq", "apple,t8112-cluster-cpufr= eq"; reg =3D <0x2 0x10e20000 0 0x1000>; @@ -338,3 +339,4 @@ DIE_NODE(atcphy3): phy@1303000000 { mode-switch; power-domains =3D <&DIE_NODE(ps_atc3_usb)>; }; +}; diff --git a/arch/arm64/boot/dts/apple/t602x-nvme.dtsi b/arch/arm64/boot/dt= s/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 */ =20 +&SOC_NODE { DIE_NODE(ans_mbox): mbox@347408000 { compatible =3D "apple,t6020-asc-mailbox", "apple,asc-mailbox-v4"; reg =3D <0x3 0x47408000 0x0 0x4000>; @@ -40,3 +41,4 @@ DIE_NODE(nvme): nvme@34bcc0000 { power-domain-names =3D "ans", "apcie0", "apcie1"; resets =3D <&DIE_NODE(ps_ans2)>; }; +}; --=20 2.55.0 From nobody Sat Sep 26 07:17:11 2026 Received: from fout-a1-smtp.messagingengine.com (fout-a1-smtp.messagingengine.com [103.168.172.144]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A7034B1B5D; Thu, 3 Sep 2026 13:59:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.144 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788444000; cv=none; b=QZKnNLucn1EZCpdZM99yAZzL5rJuj0tyWSjkIVrozn+4+F3ZilctRCjJkI13YgYsiMmOGLqITlQ0yoiof8+JFvkY5cVmd1ifEkuq61k/QojUB8NjOXJjnZ0ro45LuzsxzkjP5PfB1lGelKFU3hU3Y7qsyPFc3mEPS5R3Q10lrlk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788444000; c=relaxed/simple; bh=Jmv8TOkTNNbuZrKlY6isB4PxsULVGUqZEwDiBEXAa0Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=M3EjtBcyVfZdhJKlN9nuIpd2igFIk56P9uumaDo2ywm72Kfk9YN6EKgJrdhR8EHPmDjDzSdGloSdJrtEdLxjfdozJxNXR6glwS005Ki7LPiSasbX4NAlWtbu496KdYggPMYgW73K719yBFvGMmdnRiy4t5dfyen/DoSKI1JliFY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=jannau.net; spf=pass smtp.mailfrom=jannau.net; dkim=pass (2048-bit key) header.d=jannau.net header.i=@jannau.net header.b=JRt7SxMu; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=lgiPQG2g; arc=none smtp.client-ip=103.168.172.144 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=jannau.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=jannau.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=jannau.net header.i=@jannau.net header.b="JRt7SxMu"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="lgiPQG2g" Received: from phl-compute-03.internal (phl-compute-03.internal [10.202.2.43]) by mailfout.phl.internal (Postfix) with ESMTP id 9C4D1EC0326; Thu, 3 Sep 2026 09:59:40 -0400 (EDT) Received: from phl-frontend-04 ([10.202.2.163]) by phl-compute-03.internal (MEProxy); Thu, 03 Sep 2026 09:59:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jannau.net; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1788443980; x=1788530380; bh=ZIy2jDUjDSAzq3rl2IQj+FVKtP8cUbBzF4JE8HwUg7I=; b= JRt7SxMuq9IczuoFLeKnV+xmCBKqTyM4Eah5p+CAQI+7ebBIyALZU3f9OzRbgxmW TgIqLCT/JAbageB9wCj1rN+vXLzi2EmKT1DZCQ2DcvmvVHo9K/FV+gxU/NSFFIEK glOGM96fXaMlR6vPfmmX+dyBA1l2KOSWKNZ8+DOneWXq1azlJvQIEME+UgbucONd U4//7F1MPbROzKqsEjm2cQUS/lTYJxCoQvVf+1H0SCimZEnfAzp1ddNIWjwreYUB jPcpIYXCSBgtihEM5Hvd7EGmH2JuDrn7D2ms8/qG3HZhAjmUNNJ4gh7OwBUTZXr9 mD8sxpqTuCppZWXNLiMpxg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1788443980; x= 1788530380; bh=ZIy2jDUjDSAzq3rl2IQj+FVKtP8cUbBzF4JE8HwUg7I=; b=l giPQG2gYSRNfnkzfUE55GdNC7fCRhfAUNU8krzdp11eIPWNhoXqYII26c0NhLIHd S9g0KX8Y9v29PKkoUEwTQh6HC7yqQarphzkUxl4uX/4ETYzkiGOM0HcqwM+yI2z2 6lepwIW960h1LSWAZG2W+445y6mgC6WeHT90UAulqGfP5rrE/bqk9mY8a8Nx9bHK +Pgvnod2rIM+ilBWwu0aCfm3LO0OnbeAlpAd/GOYKC9gGQ43AOAb045ZlWcQja83 2G9kP43Nn+yoMrAKLvgJm8pzYme18TeysgeAne/edgj3k/SnyXm1HTRtY8oyAJHn 6aHqs3ECCWiNmoZyXhjMw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTFcpYBTRCFgODwx4IUPoR4bJaChIXKsH3afFh2Xpvizaclb5S80INlpKeKv9BXFDq yMiKsUELK0YRBY2/3hc4KHy6MZ7+ukA8Bsji12NtSMlKDu7omlMWGJILS+nkqBsvx4lAvX QyL6tx71DnbrVejTwb9SC1ubmR5U6JByW6CfEDlo5jadjY6i6Asq9X+Pj0CgCbJDQuypY+ dE2XudzWCIm/XbuPUNuGXbDz+EMs3E4DYPNedwhjdwXk78b9ptrdC+i1jlA8pr/NGncTN1 Fmj24k3fFvYxIY4xYrFU6RuwbZ1Q1Kr2Zwb7/7NQQ6F8bGvEw5bv2yW+tAOyzVRvKJw7MQ JgliSoBGNOj8OaDuwrWKLIWgn9PU6KGMwRfyAyyUPEpyqobqqna3OofwsXCx7PyjHEMlvU K/KCPviyFDP1VEqU/NEB796y39PwPQBjsJU834XVlQ3YnDiEpjy/CJAjd55seZ7+obO8HI QgCBZsVJFNvLHhsF5rKmkWy3y8HHO03qaHeJW+CKARmskBlW6rtp9fup8i9dM47oIe5IXq K4KTMGSrEMsUBWiSWgZoR17uL/rPNOwVtM2WrqWSLHsIZN84mibSNl+/PXlJ9U9be7l7Ps hCMoNvSMD/hZg2DO+9JDMm4CRtKgPzMRUn62Zu0NH1kEiiGdK+v0Pwqn/yDA X-ME-Proxy: Feedback-ID: i47b949f6:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 3 Sep 2026 09:59:40 -0400 (EDT) From: Janne Grunau Date: Thu, 03 Sep 2026 15:59:34 +0200 Subject: [PATCH 3/3] arm64: dts: apple: Fix style issues for t6031 multi die .dtsi Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260903-apple-soc-multi-die-style-v1-3-eeb05ea0c187@jannau.net> References: <20260903-apple-soc-multi-die-style-v1-0-eeb05ea0c187@jannau.net> In-Reply-To: <20260903-apple-soc-multi-die-style-v1-0-eeb05ea0c187@jannau.net> To: Sven Peter , Neal Gompa , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Janne Grunau , Krzysztof Kozlowski X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3433; i=j@jannau.net; s=yk2025; h=from:subject:message-id; bh=Jmv8TOkTNNbuZrKlY6isB4PxsULVGUqZEwDiBEXAa0Y=; b=owGbwMvMwCW2UNrmdq9+ahrjabUkhqyZtS6Ts/3eXwiuW+f5VPSabnLUmeyCHTVuMzd6qYUe4 deauqi3o5SFQYyLQVZMkSVJ+2UHw+oaxZjaB2Ewc1iZQIYwcHEKwEROv2Fk2PbGYkf9mrcyhwy3 sH1y2F8rfF7q+6bFkhv67jKY/KyKVGP473pK5JcEv5/phNS9DDUZZdH7RXVFd4aJRcmtja7yt1n OBQA= X-Developer-Key: i=j@jannau.net; a=openpgp; fpr=8B336A6BE4E5695E89B8532B81E806F586338419 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@ke= rnel.org/ Suggested-by: Krzysztof Kozlowski Signed-off-by: Janne Grunau Reviewed-by: Krzysztof Kozlowski --- 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/dt= s/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 */ =20 +&SOC_NODE { aic: interrupt-controller@292400000 { compatible =3D "apple,t6031-aic3", "apple,t8122-aic3"; #interrupt-cells =3D <4>; @@ -195,3 +196,4 @@ serial0: serial@391200000 { power-domains =3D <&ps_uart0>; status =3D "disabled"; }; +}; diff --git a/arch/arm64/boot/dts/apple/t6031-dieX.dtsi b/arch/arm64/boot/dt= s/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 */ =20 +&SOC_NODE { DIE_NODE(pmgr): power-management@292280000 { compatible =3D "apple,t6031-pmgr", "apple,t8103-pmgr", "syscon", "simple= -mfd"; #address-cells =3D <1>; @@ -105,3 +106,4 @@ DIE_NODE(pmgr_gfx): power-management@408e80000 { =20 reg =3D <0x4 0x8e80000 0 0x4000>; }; +}; diff --git a/arch/arm64/boot/dts/apple/t6031.dtsi b/arch/arm64/boot/dts/app= le/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 { =20 #define DIE #define DIE_NO 0 +#define SOC_NODE soc =20 -&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" =20 #undef DIE #undef DIE_NO +#undef SOC_NODE diff --git a/arch/arm64/boot/dts/apple/t6032.dtsi b/arch/arm64/boot/dts/app= le/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 { =20 #define DIE #define DIE_NO 0 +#define SOC_NODE die0 =20 -&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" =20 #undef DIE #undef DIE_NO +#undef SOC_NODE =20 #define DIE _die1 #define DIE_NO 1 +#define SOC_NODE die1 =20 -&die1 { - #include "t6031-dieX.dtsi" -}; - +#include "t6031-dieX.dtsi" #include "t6031-pmgr.dtsi" =20 /delete-node/ &ps_pmp_die1; =20 #undef DIE #undef DIE_NO +#undef SOC_NODE =20 /* delete non-present DISP power-states */ /delete-node/ &ps_disp_cpu; --=20 2.55.0