On 22/01/24 18:28, Roger Quadros wrote:
On 19/01/2024 19:50, Apurva Nandan wrote:
From: Dasnavis Sabiya sabiya.d@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 sabiya.d@ti.com Signed-off-by: Apurva Nandan a-nandan@ti.com
arch/arm/dts/Makefile | 1 + arch/arm/dts/k3-am69-r5-sk.dts | 105 ++++++++++++++++++++++++++++ arch/arm/dts/k3-am69-sk-u-boot.dtsi | 48 +++++++++++++ board/ti/j784s4/MAINTAINERS | 2 + 4 files changed, 156 insertions(+) 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 876802b88e..1c5a6662f6 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -1412,6 +1412,7 @@ dtb-$(CONFIG_SOC_K3_J721S2) += k3-am68-sk-base-board.dtb\ k3-j721s2-r5-common-proc-board.dtb
dtb-$(CONFIG_SOC_K3_J784S4) += k3-am69-sk.dtb \
k3-am69-r5-sk.dtb \ k3-j784s4-evm.dtb \ k3-j784s4-r5-evm.dtbdiff --git a/arch/arm/dts/k3-am69-r5-sk.dts b/arch/arm/dts/k3-am69-r5-sk.dts new file mode 100644 index 0000000000..d2e73bd1bf --- /dev/null +++ b/arch/arm/dts/k3-am69-r5-sk.dts @@ -0,0 +1,105 @@ +// 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 {
- bootph-pre-ram;
- status = "okay";
In k3-am69-sk.dts this is marked as reserved. Why do you need to enable it here? Maybe a comment would help readers.
Ohkay will fix.
+};
+&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 0000000000..4f8c99a1e6 --- /dev/null +++ b/arch/arm/dts/k3-am69-sk-u-boot.dtsi @@ -0,0 +1,48 @@ +// SPDX-License-Identifier: GPL-2.0-only +/*
- Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/
- */
+#include "k3-j784s4-binman.dtsi"
+&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/k3-am69-sk.dtb" +#define AM69_SK_DTB "arch/arm/dts/k3-am69-sk.dtb"
+&spl_j784s4_evm_dtb {
- filename = SPL_AM69_SK_DTB;
+};
+&j784s4_evm_dtb {
- filename = AM69_SK_DTB;
+};
+&spl_j784s4_evm_dtb_unsigned {
- filename = SPL_AM69_SK_DTB;
+};
+&j784s4_evm_dtb_unsigned {
- filename = AM69_SK_DTB;
+};
+#endif diff --git a/board/ti/j784s4/MAINTAINERS b/board/ti/j784s4/MAINTAINERS index ac6db23da5..53bc4bab03 100644 --- a/board/ti/j784s4/MAINTAINERS +++ b/board/ti/j784s4/MAINTAINERS @@ -16,3 +16,5 @@ F: arch/arm/dts/k3-j784s4-ddr-evm-lp4-4266.dtsi
AM69 SK BOARD F: arch/arm/dts/k3-am69-sk.dts +F: arch/arm/dts/k3-am69-sk-u-boot.dtsi +F: arch/arm/dts/k3-am69-r5-sk.dts