From nobody Tue Apr 7 20:07:41 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9BBD12C08CF; Wed, 11 Mar 2026 17:40:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773250822; cv=none; b=Jo+JMLuVYNLbofV1w3dVZ7puqsuZZqOm8EJptYdhVgo3V7WFHKyP2RV4XIfEp/MF6b+GJ0O7dU/R7ei/qp3EuZHqUEaFVZcJNJu4CajFFJ0h4OA2FZoGfX8DtdygDgyVcCImEzPSBPFS75q6hKBaj9TQq2/WBkvP6Fub+gAZ55o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773250822; c=relaxed/simple; bh=QO+iGABe+uv+M9n3+PZTO+e29elNJdHgVsCS1GlVwUc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=LAx5kmhNEAWebsfq3nn8Xi8/FqP4Qfhkt95f/3l/c+cfOo1608K4EpkxgC/Ccv74+GZugjfpXf90a6TD0wFxZ70o/ag23AS89gTQ+z1G+vXUkg0ZmxwUTWC4rXEgFjeGEqiJhPYapxMN1rOZnnsZuSb7bAjM62b1bMKMphl6MdY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 747741682; Wed, 11 Mar 2026 10:40:12 -0700 (PDT) Received: from e137876.manchester.arm.com (e137876.arm.com [10.33.10.100]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D28E13F73B; Wed, 11 Mar 2026 10:40:16 -0700 (PDT) From: Debbie Horsfall To: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, liviu.dudau@arm.com, sudeep.holla@kernel.org, lpieralisi@kernel.org, linusw@kernel.org Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, debbie.horsfall@arm.com, andre.przywara@arm.com Subject: [PATCH] arm64: dts: zena: Refactor Devicetree nodes Date: Wed, 11 Mar 2026 17:39:48 +0000 Message-ID: <20260311173948.3478931-1-debbie.horsfall@arm.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move the SRAM node into the SoC node. Move the memory node out of the include to make it customizable for each platform variant. Signed-off-by: Debbie Horsfall Reviewed-by: Andre Przywara --- This targets for-next/juno/updates in response to https://lore.kernel.org/linux-arm-kernel/20260309-manipulative-inescapable-= labradoodle-7a76e4@sudeepholla/ arch/arm64/boot/dts/arm/zena-css-fvp.dts | 8 +++++ arch/arm64/boot/dts/arm/zena-css.dtsi | 44 ++++++++++-------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/arch/arm64/boot/dts/arm/zena-css-fvp.dts b/arch/arm64/boot/dts= /arm/zena-css-fvp.dts index b75204a91882..53c5412d92b2 100644 --- a/arch/arm64/boot/dts/arm/zena-css-fvp.dts +++ b/arch/arm64/boot/dts/arm/zena-css-fvp.dts @@ -14,6 +14,14 @@ / { chosen { stdout-path =3D &soc_serial0; }; + + memory@80000000 { + device_type =3D "memory"; + + /* ~2GB mapped at 2GB, another 2GB at 2TB */ + reg =3D <0x00000000 0x80000000 0x00000000 0x7f000000>, + <0x00000200 0x00000000 0x00000000 0x80000000>; + }; }; =20 &soc { diff --git a/arch/arm64/boot/dts/arm/zena-css.dtsi b/arch/arm64/boot/dts/ar= m/zena-css.dtsi index 9899d2883337..0b41ee4bf4c6 100644 --- a/arch/arm64/boot/dts/arm/zena-css.dtsi +++ b/arch/arm64/boot/dts/arm/zena-css.dtsi @@ -634,6 +634,24 @@ soc: soc { #size-cells =3D <2>; ranges; =20 + sram: sram@104000 { + compatible =3D "mmio-sram"; + reg =3D <0x0 0x00104000 0x0 0x00001000>; + #address-cells =3D <1>; + #size-cells =3D <1>; + ranges =3D <0 0x0 0x00104000 0x00001000>; + + scmi_shmem_tx: scpshmem-sram-section@0 { + compatible =3D "arm,scmi-shmem"; + reg =3D <0x0 0x100>; + }; + + scmi_shmem_rx: scpshmem-sram-section@100 { + compatible =3D "arm,scmi-shmem"; + reg =3D <0x100 0x100>; + }; + }; + timer@1a810000 { compatible =3D "arm,armv7-timer-mem"; reg =3D <0x0 0x1a810000 0x0 0x10000>; @@ -748,30 +766,4 @@ timer { , ; }; - - sram: sram@104000 { - compatible =3D "mmio-sram"; - reg =3D <0x0 0x00104000 0x0 0x00001000>; - #address-cells =3D <1>; - #size-cells =3D <1>; - ranges =3D <0 0x0 0x00104000 0x00001000>; - - scmi_shmem_tx: scpshmem-sram-section@0 { - compatible =3D "arm,scmi-shmem"; - reg =3D <0x0 0x100>; - }; - - scmi_shmem_rx: scpshmem-sram-section@100 { - compatible =3D "arm,scmi-shmem"; - reg =3D <0x100 0x100>; - }; - }; - - memory@80000000 { - device_type =3D "memory"; - - /* ~2GB mapped at 2GB, another 2GB at 2TB */ - reg =3D <0x00000000 0x80000000 0x00000000 0x7f000000>, - <0x00000200 0x00000000 0x00000000 0x80000000>; - }; }; --=20 2.43.0