Create an SoC R5 dtsi file that could be used at board level R5 files. This would help in keeping the SoC level changes in sync across board files.

Signed-off-by: Manorit Chawdhry m-chawdhry@ti.com --- Test logs: https://gist.github.com/manorit2001/108a42ab67e936707f47f71e1d18e90a --- arch/arm/dts/k3-am69-r5-sk.dts | 125 ++------------------- arch/arm/dts/k3-j784s4-r5-evm.dts | 125 ++------------------- .../{k3-j784s4-r5-evm.dts => k3-j784s4-r5.dtsi} | 9 +- board/ti/j784s4/MAINTAINERS | 1 + 4 files changed, 26 insertions(+), 234 deletions(-)

diff --git a/arch/arm/dts/k3-am69-r5-sk.dts b/arch/arm/dts/k3-am69-r5-sk.dts dissimilarity index 87% index 13809f82d99a6fc7da1fc2401b33bf0d0bb75548..9c6e324ba299c72f87f5f792fbfe98ef62ebde3d 100644 --- a/arch/arm/dts/k3-am69-r5-sk.dts +++ b/arch/arm/dts/k3-am69-r5-sk.dts @@ -1,113 +1,12 @@ -// 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>, <&k3_clks 202 0>; - clock-names = "gtc", "core"; - 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>; -}; - -&fss { - /* enable ranges missing from the FSS node */ - ranges = <0x0 0x47000000 0x0 0x47000000 0x0 0x00068400>, - <0x0 0x50000000 0x0 0x50000000 0x0 0x08000000>; -}; - -&mcu_ringacc { - ti,sci = <&dm_tifs>; -}; - -&mcu_udmap { - ti,sci = <&dm_tifs>; -}; +// 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" +#include "k3-j784s4-r5.dtsi" diff --git a/arch/arm/dts/k3-j784s4-r5-evm.dts b/arch/arm/dts/k3-j784s4-r5-evm.dts dissimilarity index 87% index 8b8b0e70047e6c7538eee6e39f4fca182796f751..0eeffa7874035697d28f37507b3c3feb03a10acd 100644 --- a/arch/arm/dts/k3-j784s4-r5-evm.dts +++ b/arch/arm/dts/k3-j784s4-r5-evm.dts @@ -1,113 +1,12 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright (C) 2023 Texas Instruments Incorporated - https://www.ti.com/ - */ - -/dts-v1/; - -#include "k3-j784s4-evm.dts" -#include "k3-j784s4-ddr-evm-lp4-4266.dtsi" -#include "k3-j784s4-ddr.dtsi" -#include "k3-j784s4-evm-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>, <&k3_clks 202 0>; - clock-names = "gtc", "core"; - 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>; -}; - -&fss { - /* enable ranges missing from the FSS node */ - ranges = <0x0 0x47000000 0x0 0x47000000 0x0 0x00068400>, - <0x0 0x50000000 0x0 0x50000000 0x0 0x08000000>; -}; - -&mcu_ringacc { - ti,sci = <&dm_tifs>; -}; - -&mcu_udmap { - ti,sci = <&dm_tifs>; -}; +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2023 Texas Instruments Incorporated - https://www.ti.com/ + */ + +/dts-v1/; + +#include "k3-j784s4-evm.dts" +#include "k3-j784s4-ddr-evm-lp4-4266.dtsi" +#include "k3-j784s4-ddr.dtsi" +#include "k3-j784s4-evm-u-boot.dtsi" +#include "k3-j784s4-r5.dtsi" diff --git a/arch/arm/dts/k3-j784s4-r5-evm.dts b/arch/arm/dts/k3-j784s4-r5.dtsi similarity index 90% copy from arch/arm/dts/k3-j784s4-r5-evm.dts copy to arch/arm/dts/k3-j784s4-r5.dtsi index 8b8b0e70047e6c7538eee6e39f4fca182796f751..0cd0ccc2dea0379971595faa1076b20aa3606492 100644 --- a/arch/arm/dts/k3-j784s4-r5-evm.dts +++ b/arch/arm/dts/k3-j784s4-r5.dtsi @@ -3,13 +3,6 @@ * Copyright (C) 2023 Texas Instruments Incorporated - https://www.ti.com/ */

-/dts-v1/; - -#include "k3-j784s4-evm.dts" -#include "k3-j784s4-ddr-evm-lp4-4266.dtsi" -#include "k3-j784s4-ddr.dtsi" -#include "k3-j784s4-evm-u-boot.dtsi" - / { chosen { tick-timer = &mcu_timer0; @@ -101,7 +94,7 @@ &fss { /* enable ranges missing from the FSS node */ ranges = <0x0 0x47000000 0x0 0x47000000 0x0 0x00068400>, - <0x0 0x50000000 0x0 0x50000000 0x0 0x08000000>; + <0x0 0x50000000 0x0 0x50000000 0x0 0x08000000>; };

&mcu_ringacc { diff --git a/board/ti/j784s4/MAINTAINERS b/board/ti/j784s4/MAINTAINERS index b7605ff335b9085b30a9874e95e8f303c84a0444..e92e8d03cb3eba26298390b1a79f08145cf8ff9d 100644 --- a/board/ti/j784s4/MAINTAINERS +++ b/board/ti/j784s4/MAINTAINERS @@ -8,6 +8,7 @@ F: configs/j784s4_evm_r5_defconfig F: configs/j784s4_evm_a72_defconfig F: arch/arm/dts/k3-j784s4-evm-u-boot.dtsi F: arch/arm/dts/k3-j784s4-r5-evm.dts +F: arch/arm/dts/k3-j784s4-r5.dtsi F: arch/arm/dts/k3-j784s4-ddr.dtsi F: arch/arm/dts/k3-j784s4-ddr-evm-lp4-4266.dtsi F: doc/board/ti/j784s4_evm.rst

--- base-commit: 392ff1449f7d30cc48fd4d17320d05882cd68f2e change-id: 20241023-b4-upstream-j784s4-split-a2b424131ce4

Best regards,