Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5A7FFC3ABB2 for ; Wed, 28 May 2025 06:37:07 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BD128838CC; Wed, 28 May 2025 08:37:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=foss.st.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=foss.st.com header.i=@foss.st.com header.b="GZ9FanXL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9C9BF838EC; Wed, 28 May 2025 08:37:04 +0200 (CEST) Received: from mx07-00178001.pphosted.com (mx08-00178001.pphosted.com [91.207.212.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3EFED8319A for ; Wed, 28 May 2025 08:37:02 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=foss.st.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=prvs=8243e56e33=patrice.chotard@foss.st.com Received: from pps.filterd (m0046660.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54S55URo019636; Wed, 28 May 2025 08:36:52 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=selector1; bh= nHxx4KnYbcMuGGv+S3VlMrQIqbGnZzpsKhs1yfXlPm0=; b=GZ9FanXLZctTPkqs pd2utr3b1+wIrovzdhmhnSC26+6i6PeHAECTBKm6ZbtBfZV760OH3CMJO4kTM6ca 3EeBZz1MjVSphU/u0wlgm9AsFE4rABmqNRiZmVQkPSbquDSJLzEg7W+ewqHA9Cz/ Czch/DAxX12v4mHWj0yN7nzmFqL3u6x+Z/Qxnp8Mw6vzHxQHD+jumM4brW8hAG7H pb0rNCmAlYrpUd7V8FOvAitZG6I05UqEZ3wDqzdygFSy8wD/cdeq0LVZSO2qUgL1 gPOUvquqcPYLIMuP+EFIvHavlnwHNo4QCZdvEd2gtyA2BBZkvi11RjtY9sqPEv0a nVUVPQ== Received: from beta.dmz-ap.st.com (beta.dmz-ap.st.com [138.198.100.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 46u388y79c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 28 May 2025 08:36:52 +0200 (MEST) Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 037D44006A; Wed, 28 May 2025 08:35:43 +0200 (CEST) Received: from Webmail-eu.st.com (shfdag1node1.st.com [10.75.129.69]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id CABCDB38B58; Wed, 28 May 2025 08:34:26 +0200 (CEST) Received: from [10.48.87.62] (10.48.87.62) by SHFDAG1NODE1.st.com (10.75.129.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 28 May 2025 08:34:26 +0200 Message-ID: Date: Wed, 28 May 2025 08:34:25 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 06/10] ARM: dts: stm32: Add stm32mp13-ddr.dtsi template To: Marek Vasut , CC: Cheick Traore , Fabrice Gasnier , Gatien Chevallier , Lionel Debieve , Pascal Zimmermann , Patrick Delaunay , Simon Glass , Sughosh Ganu , Tom Rini , , References: <20250512172149.150214-1-marek.vasut@mailbox.org> <20250512172149.150214-7-marek.vasut@mailbox.org> Content-Language: en-US From: Patrice CHOTARD In-Reply-To: <20250512172149.150214-7-marek.vasut@mailbox.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.48.87.62] X-ClientProxiedBy: SHFCAS1NODE2.st.com (10.75.129.73) To SHFDAG1NODE1.st.com (10.75.129.69) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-28_03,2025-05-27_01,2025-03-28_01 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean On 5/12/25 19:21, Marek Vasut wrote: > Factor out common parts of STM32MP15xx DRAM controller configuration DT > description into stm32mp1-ddr.dtsi and introduce stm32mp13-ddr.dtsi which > describes STM32MP13xx DRAM controller configuration in DT. > > Signed-off-by: Marek Vasut > --- > Cc: Cheick Traore > Cc: Fabrice Gasnier > Cc: Gatien Chevallier > Cc: Lionel Debieve > Cc: Pascal Zimmermann > Cc: Patrice Chotard > Cc: Patrick Delaunay > Cc: Simon Glass > Cc: Sughosh Ganu > Cc: Tom Rini > Cc: u-boot@dh-electronics.com > Cc: u-boot@lists.denx.de > Cc: uboot-stm32@st-md-mailman.stormreply.com > --- > arch/arm/dts/stm32mp1-ddr.dtsi | 187 ++++++++++++++++++++++++++++++++ > arch/arm/dts/stm32mp13-ddr.dtsi | 49 +++++++++ > arch/arm/dts/stm32mp15-ddr.dtsi | 170 +---------------------------- > 3 files changed, 237 insertions(+), 169 deletions(-) > create mode 100644 arch/arm/dts/stm32mp1-ddr.dtsi > create mode 100644 arch/arm/dts/stm32mp13-ddr.dtsi > > diff --git a/arch/arm/dts/stm32mp1-ddr.dtsi b/arch/arm/dts/stm32mp1-ddr.dtsi > new file mode 100644 > index 00000000000..da9f9fac4b8 > --- /dev/null > +++ b/arch/arm/dts/stm32mp1-ddr.dtsi > @@ -0,0 +1,187 @@ > +// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause > +/* > + * Copyright : STMicroelectronics 2018 > + */ > +#include > + > +#ifdef CONFIG_SPL > +&ddr { > + config-DDR_MEM_COMPATIBLE { > + bootph-all; > + > + compatible = __stringify(st,DDR_MEM_COMPATIBLE); > + > + st,mem-name = DDR_MEM_NAME; > + st,mem-speed = ; > + st,mem-size = ; > + > + st,ctl-reg = < > + DDR_MSTR > + DDR_MRCTRL0 > + DDR_MRCTRL1 > + DDR_DERATEEN > + DDR_DERATEINT > + DDR_PWRCTL > + DDR_PWRTMG > + DDR_HWLPCTL > + DDR_RFSHCTL0 > + DDR_RFSHCTL3 > + DDR_CRCPARCTL0 > + DDR_ZQCTL0 > + DDR_DFITMG0 > + DDR_DFITMG1 > + DDR_DFILPCFG0 > + DDR_DFIUPD0 > + DDR_DFIUPD1 > + DDR_DFIUPD2 > + DDR_DFIPHYMSTR > + DDR_ODTMAP > + DDR_DBG0 > + DDR_DBG1 > + DDR_DBGCMD > + DDR_POISONCFG > + DDR_PCCFG > + >; > + > + st,ctl-timing = < > + DDR_RFSHTMG > + DDR_DRAMTMG0 > + DDR_DRAMTMG1 > + DDR_DRAMTMG2 > + DDR_DRAMTMG3 > + DDR_DRAMTMG4 > + DDR_DRAMTMG5 > + DDR_DRAMTMG6 > + DDR_DRAMTMG7 > + DDR_DRAMTMG8 > + DDR_DRAMTMG14 > + DDR_ODTCFG > + >; > + > + st,ctl-map = < > + DDR_ADDRMAP1 > + DDR_ADDRMAP2 > + DDR_ADDRMAP3 > + DDR_ADDRMAP4 > + DDR_ADDRMAP5 > + DDR_ADDRMAP6 > + DDR_ADDRMAP9 > + DDR_ADDRMAP10 > + DDR_ADDRMAP11 > + >; > + > + > + /* > + * Both st,ctl-perf and st,phy-reg differ > + * between STM32MP13xx and STM32MP15xx due > + * to 16bit and 32bit DRAM bus respectively > + * on these SoCs. > + */ > + > + st,phy-timing = < > + DDR_PTR0 > + DDR_PTR1 > + DDR_PTR2 > + DDR_DTPR0 > + DDR_DTPR1 > + DDR_DTPR2 > + DDR_MR0 > + DDR_MR1 > + DDR_MR2 > + DDR_MR3 > + >; > + > + status = "okay"; > + }; > +}; > +#endif > + > +#undef DDR_MEM_COMPATIBLE > +#undef DDR_MEM_NAME > +#undef DDR_MEM_SPEED > +#undef DDR_MEM_SIZE > + > +#undef DDR_MSTR > +#undef DDR_MRCTRL0 > +#undef DDR_MRCTRL1 > +#undef DDR_DERATEEN > +#undef DDR_DERATEINT > +#undef DDR_PWRCTL > +#undef DDR_PWRTMG > +#undef DDR_HWLPCTL > +#undef DDR_RFSHCTL0 > +#undef DDR_RFSHCTL3 > +#undef DDR_RFSHTMG > +#undef DDR_CRCPARCTL0 > +#undef DDR_DRAMTMG0 > +#undef DDR_DRAMTMG1 > +#undef DDR_DRAMTMG2 > +#undef DDR_DRAMTMG3 > +#undef DDR_DRAMTMG4 > +#undef DDR_DRAMTMG5 > +#undef DDR_DRAMTMG6 > +#undef DDR_DRAMTMG7 > +#undef DDR_DRAMTMG8 > +#undef DDR_DRAMTMG14 > +#undef DDR_ZQCTL0 > +#undef DDR_DFITMG0 > +#undef DDR_DFITMG1 > +#undef DDR_DFILPCFG0 > +#undef DDR_DFIUPD0 > +#undef DDR_DFIUPD1 > +#undef DDR_DFIUPD2 > +#undef DDR_DFIPHYMSTR > +#undef DDR_ADDRMAP1 > +#undef DDR_ADDRMAP2 > +#undef DDR_ADDRMAP3 > +#undef DDR_ADDRMAP4 > +#undef DDR_ADDRMAP5 > +#undef DDR_ADDRMAP6 > +#undef DDR_ADDRMAP9 > +#undef DDR_ADDRMAP10 > +#undef DDR_ADDRMAP11 > +#undef DDR_ODTCFG > +#undef DDR_ODTMAP > +#undef DDR_SCHED > +#undef DDR_SCHED1 > +#undef DDR_PERFHPR1 > +#undef DDR_PERFLPR1 > +#undef DDR_PERFWR1 > +#undef DDR_DBG0 > +#undef DDR_DBG1 > +#undef DDR_DBGCMD > +#undef DDR_POISONCFG > +#undef DDR_PCCFG > +#undef DDR_PCFGR_0 > +#undef DDR_PCFGW_0 > +#undef DDR_PCFGQOS0_0 > +#undef DDR_PCFGQOS1_0 > +#undef DDR_PCFGWQOS0_0 > +#undef DDR_PCFGWQOS1_0 > +#undef DDR_PCFGR_1 > +#undef DDR_PCFGW_1 > +#undef DDR_PCFGQOS0_1 > +#undef DDR_PCFGQOS1_1 > +#undef DDR_PCFGWQOS0_1 > +#undef DDR_PCFGWQOS1_1 > +#undef DDR_PGCR > +#undef DDR_PTR0 > +#undef DDR_PTR1 > +#undef DDR_PTR2 > +#undef DDR_ACIOCR > +#undef DDR_DXCCR > +#undef DDR_DSGCR > +#undef DDR_DCR > +#undef DDR_DTPR0 > +#undef DDR_DTPR1 > +#undef DDR_DTPR2 > +#undef DDR_MR0 > +#undef DDR_MR1 > +#undef DDR_MR2 > +#undef DDR_MR3 > +#undef DDR_ODTCR > +#undef DDR_ZQ0CR1 > +#undef DDR_DX0GCR > +#undef DDR_DX1GCR > +#undef DDR_DX2GCR > +#undef DDR_DX3GCR > diff --git a/arch/arm/dts/stm32mp13-ddr.dtsi b/arch/arm/dts/stm32mp13-ddr.dtsi > new file mode 100644 > index 00000000000..30d8c5014e0 > --- /dev/null > +++ b/arch/arm/dts/stm32mp13-ddr.dtsi > @@ -0,0 +1,49 @@ > +// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause > +/* > + * Copyright : STMicroelectronics 2018 > + */ > +#ifdef CONFIG_SPL > +&ddr { > + clocks = <&rcc AXIDCG>, > + <&rcc DDRC1>, > + <&rcc DDRPHYC>, > + <&rcc DDRCAPB>, > + <&rcc DDRPHYCAPB>; > + > + clock-names = "axidcg", > + "ddrc1", > + "ddrphyc", > + "ddrcapb", > + "ddrphycapb"; > + > + config-DDR_MEM_COMPATIBLE { > + st,ctl-perf = < > + DDR_SCHED > + DDR_SCHED1 > + DDR_PERFHPR1 > + DDR_PERFLPR1 > + DDR_PERFWR1 > + DDR_PCFGR_0 > + DDR_PCFGW_0 > + DDR_PCFGQOS0_0 > + DDR_PCFGQOS1_0 > + DDR_PCFGWQOS0_0 > + DDR_PCFGWQOS1_0 > + >; > + > + st,phy-reg = < > + DDR_PGCR > + DDR_ACIOCR > + DDR_DXCCR > + DDR_DSGCR > + DDR_DCR > + DDR_ODTCR > + DDR_ZQ0CR1 > + DDR_DX0GCR > + DDR_DX1GCR > + >; > + }; > +}; > +#endif > + > +#include "stm32mp1-ddr.dtsi" > diff --git a/arch/arm/dts/stm32mp15-ddr.dtsi b/arch/arm/dts/stm32mp15-ddr.dtsi > index 48b0828828f..f18fdaeab68 100644 > --- a/arch/arm/dts/stm32mp15-ddr.dtsi > +++ b/arch/arm/dts/stm32mp15-ddr.dtsi > @@ -2,8 +2,6 @@ > /* > * Copyright : STMicroelectronics 2018 > */ > -#include > - > #ifdef CONFIG_SPL > &ddr { > clocks = <&rcc AXIDCG>, > @@ -21,69 +19,6 @@ > "ddrphycapb"; > > config-DDR_MEM_COMPATIBLE { > - bootph-all; > - > - compatible = __stringify(st,DDR_MEM_COMPATIBLE); > - > - st,mem-name = DDR_MEM_NAME; > - st,mem-speed = ; > - st,mem-size = ; > - > - st,ctl-reg = < > - DDR_MSTR > - DDR_MRCTRL0 > - DDR_MRCTRL1 > - DDR_DERATEEN > - DDR_DERATEINT > - DDR_PWRCTL > - DDR_PWRTMG > - DDR_HWLPCTL > - DDR_RFSHCTL0 > - DDR_RFSHCTL3 > - DDR_CRCPARCTL0 > - DDR_ZQCTL0 > - DDR_DFITMG0 > - DDR_DFITMG1 > - DDR_DFILPCFG0 > - DDR_DFIUPD0 > - DDR_DFIUPD1 > - DDR_DFIUPD2 > - DDR_DFIPHYMSTR > - DDR_ODTMAP > - DDR_DBG0 > - DDR_DBG1 > - DDR_DBGCMD > - DDR_POISONCFG > - DDR_PCCFG > - >; > - > - st,ctl-timing = < > - DDR_RFSHTMG > - DDR_DRAMTMG0 > - DDR_DRAMTMG1 > - DDR_DRAMTMG2 > - DDR_DRAMTMG3 > - DDR_DRAMTMG4 > - DDR_DRAMTMG5 > - DDR_DRAMTMG6 > - DDR_DRAMTMG7 > - DDR_DRAMTMG8 > - DDR_DRAMTMG14 > - DDR_ODTCFG > - >; > - > - st,ctl-map = < > - DDR_ADDRMAP1 > - DDR_ADDRMAP2 > - DDR_ADDRMAP3 > - DDR_ADDRMAP4 > - DDR_ADDRMAP5 > - DDR_ADDRMAP6 > - DDR_ADDRMAP9 > - DDR_ADDRMAP10 > - DDR_ADDRMAP11 > - >; > - > st,ctl-perf = < > DDR_SCHED > DDR_SCHED1 > @@ -117,111 +52,8 @@ > DDR_DX2GCR > DDR_DX3GCR > >; > - > - st,phy-timing = < > - DDR_PTR0 > - DDR_PTR1 > - DDR_PTR2 > - DDR_DTPR0 > - DDR_DTPR1 > - DDR_DTPR2 > - DDR_MR0 > - DDR_MR1 > - DDR_MR2 > - DDR_MR3 > - >; > - > - status = "okay"; > }; > }; > #endif > > -#undef DDR_MEM_COMPATIBLE > -#undef DDR_MEM_NAME > -#undef DDR_MEM_SPEED > -#undef DDR_MEM_SIZE > - > -#undef DDR_MSTR > -#undef DDR_MRCTRL0 > -#undef DDR_MRCTRL1 > -#undef DDR_DERATEEN > -#undef DDR_DERATEINT > -#undef DDR_PWRCTL > -#undef DDR_PWRTMG > -#undef DDR_HWLPCTL > -#undef DDR_RFSHCTL0 > -#undef DDR_RFSHCTL3 > -#undef DDR_RFSHTMG > -#undef DDR_CRCPARCTL0 > -#undef DDR_DRAMTMG0 > -#undef DDR_DRAMTMG1 > -#undef DDR_DRAMTMG2 > -#undef DDR_DRAMTMG3 > -#undef DDR_DRAMTMG4 > -#undef DDR_DRAMTMG5 > -#undef DDR_DRAMTMG6 > -#undef DDR_DRAMTMG7 > -#undef DDR_DRAMTMG8 > -#undef DDR_DRAMTMG14 > -#undef DDR_ZQCTL0 > -#undef DDR_DFITMG0 > -#undef DDR_DFITMG1 > -#undef DDR_DFILPCFG0 > -#undef DDR_DFIUPD0 > -#undef DDR_DFIUPD1 > -#undef DDR_DFIUPD2 > -#undef DDR_DFIPHYMSTR > -#undef DDR_ADDRMAP1 > -#undef DDR_ADDRMAP2 > -#undef DDR_ADDRMAP3 > -#undef DDR_ADDRMAP4 > -#undef DDR_ADDRMAP5 > -#undef DDR_ADDRMAP6 > -#undef DDR_ADDRMAP9 > -#undef DDR_ADDRMAP10 > -#undef DDR_ADDRMAP11 > -#undef DDR_ODTCFG > -#undef DDR_ODTMAP > -#undef DDR_SCHED > -#undef DDR_SCHED1 > -#undef DDR_PERFHPR1 > -#undef DDR_PERFLPR1 > -#undef DDR_PERFWR1 > -#undef DDR_DBG0 > -#undef DDR_DBG1 > -#undef DDR_DBGCMD > -#undef DDR_POISONCFG > -#undef DDR_PCCFG > -#undef DDR_PCFGR_0 > -#undef DDR_PCFGW_0 > -#undef DDR_PCFGQOS0_0 > -#undef DDR_PCFGQOS1_0 > -#undef DDR_PCFGWQOS0_0 > -#undef DDR_PCFGWQOS1_0 > -#undef DDR_PCFGR_1 > -#undef DDR_PCFGW_1 > -#undef DDR_PCFGQOS0_1 > -#undef DDR_PCFGQOS1_1 > -#undef DDR_PCFGWQOS0_1 > -#undef DDR_PCFGWQOS1_1 > -#undef DDR_PGCR > -#undef DDR_PTR0 > -#undef DDR_PTR1 > -#undef DDR_PTR2 > -#undef DDR_ACIOCR > -#undef DDR_DXCCR > -#undef DDR_DSGCR > -#undef DDR_DCR > -#undef DDR_DTPR0 > -#undef DDR_DTPR1 > -#undef DDR_DTPR2 > -#undef DDR_MR0 > -#undef DDR_MR1 > -#undef DDR_MR2 > -#undef DDR_MR3 > -#undef DDR_ODTCR > -#undef DDR_ZQ0CR1 > -#undef DDR_DX0GCR > -#undef DDR_DX1GCR > -#undef DDR_DX2GCR > -#undef DDR_DX3GCR > +#include "stm32mp1-ddr.dtsi" Reviewed-by: Patrice Chotard Thanks Patrice