On Tue, 27 Feb 2024 at 21:49, Marcel Ziswiler <marcel.ziswi...@toradex.com> wrote: > > Hi Apurva > > On Sat, 2024-02-24 at 01:51 +0530, Apurva Nandan wrote: > > From: Dasnavis Sabiya <sabiy...@ti.com> > > > > Introduce the base dts files needed for u-boot or to augment the linux > > dtbs for use in the u-boot-spl and u-boot binaries. > > > > Signed-off-by: Dasnavis Sabiya <sabiy...@ti.com> > > Signed-off-by: Apurva Nandan <a-nan...@ti.com> > > --- > > arch/arm/dts/Makefile | 3 +- > > arch/arm/dts/k3-am69-r5-sk.dts | 106 ++++++++++++++++++++++++++++ > > arch/arm/dts/k3-am69-sk-u-boot.dtsi | 54 ++++++++++++++ > > board/ti/j784s4/MAINTAINERS | 6 ++ > > 4 files changed, 168 insertions(+), 1 deletion(-) > > create mode 100644 arch/arm/dts/k3-am69-r5-sk.dts > > create mode 100644 arch/arm/dts/k3-am69-sk-u-boot.dtsi > > > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > > index e484112dd7c..e3a47d055b0 100644 > > --- a/arch/arm/dts/Makefile > > +++ b/arch/arm/dts/Makefile > > @@ -1413,7 +1413,8 @@ dtb-$(CONFIG_SOC_K3_J721S2) += > > k3-am68-sk-base-board.dtb\ > > k3-j721s2-common-proc-board.dtb\ > > k3-j721s2-r5-common-proc-board.dtb > > > > -dtb-$(CONFIG_SOC_K3_J784S4) += k3-j784s4-r5-evm.dtb > > +dtb-$(CONFIG_SOC_K3_J784S4) += k3-am69-r5-sk.dtb \ > > + k3-j784s4-r5-evm.dtb > > > > dtb-$(CONFIG_SOC_K3_AM642) += k3-am642-evm.dtb \ > > k3-am642-r5-evm.dtb \ > > diff --git a/arch/arm/dts/k3-am69-r5-sk.dts b/arch/arm/dts/k3-am69-r5-sk.dts > > new file mode 100644 > > index 00000000000..f177f563527 > > --- /dev/null > > +++ b/arch/arm/dts/k3-am69-r5-sk.dts > > @@ -0,0 +1,106 @@ > > +// SPDX-License-Identifier: GPL-2.0-only > > +/* > > + * Copyright (C) 2022-2023 Texas Instruments Incorporated - > > https://www.ti.com/ > > + */ > > + > > +/dts-v1/; > > + > > +#include "k3-am69-sk.dts" > > +#include "k3-j784s4-ddr-evm-lp4-4266.dtsi" > > +#include "k3-j784s4-ddr.dtsi" > > +#include "k3-am69-sk-u-boot.dtsi" > > + > > +/ { > > + chosen { > > + tick-timer = &mcu_timer0; > > + }; > > + > > + aliases { > > + remoteproc0 = &sysctrler; > > + remoteproc1 = &a72_0; > > + }; > > + > > + a72_0: a72@0 { > > + compatible = "ti,am654-rproc"; > > + reg = <0x0 0x00a90000 0x0 0x10>; > > + power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>, > > + <&k3_pds 202 TI_SCI_PD_EXCLUSIVE>; > > + resets = <&k3_reset 202 0>; > > + clocks = <&k3_clks 61 0>; > > + assigned-clocks = <&k3_clks 61 0>, <&k3_clks 202 0>; > > + assigned-clock-parents = <&k3_clks 61 2>; > > + assigned-clock-rates = <200000000>, <2000000000>; > > + ti,sci = <&sms>; > > + ti,sci-proc-id = <32>; > > + ti,sci-host-id = <10>; > > + bootph-pre-ram; > > + }; > > + > > + dm_tifs: dm-tifs { > > + compatible = "ti,j721e-dm-sci"; > > + ti,host-id = <3>; > > + ti,secure-host; > > + mbox-names = "rx", "tx"; > > + mboxes= <&secure_proxy_mcu 21>, <&secure_proxy_mcu 23>; > > + bootph-pre-ram; > > + }; > > +}; > > + > > +&mcu_timer0 { > > + status = "okay"; > > + clock-frequency = <250000000>; > > + bootph-pre-ram; > > +}; > > + > > +&secure_proxy_sa3 { > > + status = "okay"; > > + bootph-pre-ram; > > +}; > > + > > +&secure_proxy_mcu { > > + status = "okay"; > > + bootph-pre-ram; > > +}; > > + > > +&cbass_mcu_wakeup { > > + sysctrler: sysctrler { > > + compatible = "ti,am654-system-controller"; > > + mboxes= <&secure_proxy_mcu 4>, > > + <&secure_proxy_mcu 5>, > > + <&secure_proxy_sa3 5>; > > + mbox-names = "tx", "rx", "boot_notify"; > > + bootph-pre-ram; > > + }; > > +}; > > + > > +&sms { > > + mboxes= <&secure_proxy_mcu 8>, <&secure_proxy_mcu 6>, > > <&secure_proxy_mcu 5>; > > + mbox-names = "tx", "rx", "notify"; > > + ti,host-id = <4>; > > + ti,secure-host; > > + bootph-pre-ram; > > +}; > > + > > +/* WKUP UART0 is used for DM firmware logs */ > > +&wkup_uart0 { > > + bootph-pre-ram; > > + status = "okay"; > > +}; > > + > > +&ospi0 { > > + reg = <0x0 0x47040000 0x0 0x100>, > > + <0x0 0x50000000 0x0 0x8000000>; > > +}; > > + > > +&ospi1 { > > + reg = <0x0 0x47050000 0x0 0x100>, > > + <0x0 0x58000000 0x0 0x8000000>; > > +}; > > + > > +&mcu_ringacc { > > + ti,sci = <&dm_tifs>; > > +}; > > + > > +&mcu_udmap { > > + ti,sci = <&dm_tifs>; > > +}; > > diff --git a/arch/arm/dts/k3-am69-sk-u-boot.dtsi > > b/arch/arm/dts/k3-am69-sk-u-boot.dtsi > > new file mode 100644 > > index 00000000000..bed330e6d4e > > --- /dev/null > > +++ b/arch/arm/dts/k3-am69-sk-u-boot.dtsi > > @@ -0,0 +1,54 @@ > > +// SPDX-License-Identifier: GPL-2.0-only > > +/* > > + * Copyright (C) 2022-2023 Texas Instruments Incorporated - > > https://www.ti.com/ > > + */ > > + > > +#include "k3-j784s4-binman.dtsi" > > + > > +/ { > > + memory@80000000 { > > + bootph-all; > > + }; > > +}; > > + > > +&mcu_udmap { > > + reg = <0x0 0x285c0000 0x0 0x100>, > > + <0x0 0x284c0000 0x0 0x4000>, > > + <0x0 0x2a800000 0x0 0x40000>, > > + <0x0 0x284a0000 0x0 0x4000>, > > + <0x0 0x2aa00000 0x0 0x40000>, > > + <0x0 0x28400000 0x0 0x2000>; > > + reg-names = "gcfg", "rchan", "rchanrt", "tchan", > > + "tchanrt", "rflow"; > > + bootph-pre-ram; > > +}; > > + > > +&sms { > > + k3_sysreset: sysreset-controller { > > + compatible = "ti,sci-sysreset"; > > + bootph-pre-ram; > > + }; > > +}; > > + > > +#ifdef CONFIG_TARGET_J784S4_A72_EVM > > + > > +#define SPL_AM69_SK_DTB "spl/dts/ti/k3-am69-sk.dtb" > > Did I miss anything and the device trees are now really also in a vendor > folder in U-Boot as well? >
Yes, with this patch-set [1] we are moving away from manual devicetree copy/sync from Linux kernel but rather towards automatic sync with better alignment. [1] https://lore.kernel.org/all/20240222093607.3085545-1-sumit.g...@linaro.org/ -Sumit