]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
arch: arm: dts: k3: refactor common nodes to k3-*-r5.dtsi
authorAnshul Dalal <anshuld@ti.com>
Thu, 22 Jan 2026 14:08:38 +0000 (19:38 +0530)
committerTom Rini <trini@konsulko.com>
Fri, 6 Feb 2026 15:26:13 +0000 (09:26 -0600)
This patch refactors the nodes in each board's R5 device-tree to common
SoC level dtsi. No functional change is intended from this patch.

Signed-off-by: Anshul Dalal <anshuld@ti.com>
Tested-by: Wadim Egorov <w.egorov@phytec.de>
Reviewed-by: Wadim Egorov <w.egorov@phytec.de>
Reviewed-by: Bryan Brattlof <bb@ti.com>
27 files changed:
arch/arm/dts/k3-am62-r5-lp-sk.dts
arch/arm/dts/k3-am625-r5-beagleplay.dts
arch/arm/dts/k3-am625-r5-phycore-som-2gb.dts
arch/arm/dts/k3-am625-r5-sk.dts
arch/arm/dts/k3-am625-r5.dtsi [new file with mode: 0644]
arch/arm/dts/k3-am625-verdin-r5.dts
arch/arm/dts/k3-am6254atl-r5-sk.dts
arch/arm/dts/k3-am62a7-r5-phycore-som-2gb.dts
arch/arm/dts/k3-am62a7-r5-sk.dts
arch/arm/dts/k3-am62a7-r5.dtsi [new file with mode: 0644]
arch/arm/dts/k3-am62d2-r5-evm.dts
arch/arm/dts/k3-am62d2-r5.dtsi [new file with mode: 0644]
arch/arm/dts/k3-am62p5-r5-sk.dts
arch/arm/dts/k3-am62p5-r5.dtsi [new file with mode: 0644]
arch/arm/dts/k3-am62p5-verdin-r5.dts
arch/arm/dts/k3-am642-r5-evm.dts
arch/arm/dts/k3-am642-r5-phycore-som-2gb.dts
arch/arm/dts/k3-am642-r5-sk.dts
arch/arm/dts/k3-am642-r5.dtsi [new file with mode: 0644]
arch/arm/dts/k3-am654-r5-base-board.dts
arch/arm/dts/k3-am654-r5.dtsi [new file with mode: 0644]
arch/arm/dts/k3-am67a-r5-beagley-ai.dts
arch/arm/dts/k3-am67a-r5.dtsi [new file with mode: 0644]
arch/arm/dts/k3-j7200-r5-common-proc-board.dts
arch/arm/dts/k3-j7200-r5.dtsi [new file with mode: 0644]
arch/arm/dts/k3-j722s-r5-evm.dts
arch/arm/dts/k3-j722s-r5.dtsi [new file with mode: 0644]

index 95cd9b707c7bcf560e38a140e25beb602bab20ef..2d89c20498184246a42e77c705ca6d81d052f969 100644 (file)
@@ -9,84 +9,4 @@
 #include "k3-am62-ddr.dtsi"
 
 #include "k3-am62-lp-sk-u-boot.dtsi"
-
-/ {
-       aliases {
-               tick-timer = &main_timer0;
-               remoteproc0 = &sysctrler;
-               remoteproc1 = &a53_0;
-               serial0 = &wkup_uart0;
-               serial3 = &main_uart1;
-       };
-
-       a53_0: a53@0 {
-               compatible = "ti,am654-rproc";
-               reg = <0x00 0x00a90000 0x00 0x10>;
-               power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>,
-                               <&k3_pds 135 TI_SCI_PD_EXCLUSIVE>,
-                               <&k3_pds 166 TI_SCI_PD_EXCLUSIVE>;
-               resets = <&k3_reset 135 0>;
-               clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
-               clock-names = "gtc", "core";
-               assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
-               assigned-clock-parents = <&k3_clks 61 2>;
-               assigned-clock-rates = <200000000>, <1200000000>;
-               ti,sci = <&dmsc>;
-               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 = <36>;
-               ti,secure-host;
-               mbox-names = "rx", "tx";
-               mboxes= <&secure_proxy_main 22>,
-                       <&secure_proxy_main 23>;
-               bootph-pre-ram;
-       };
-};
-
-&dmsc {
-       mboxes= <&secure_proxy_main 0>,
-               <&secure_proxy_main 1>,
-               <&secure_proxy_main 0>;
-       mbox-names = "rx", "tx", "notify";
-       ti,host-id = <35>;
-       ti,secure-host;
-};
-
-&secure_proxy_sa3 {
-       /* We require this for boot handshake */
-       status = "okay";
-};
-
-&cbass_main {
-       sysctrler: sysctrler {
-               compatible = "ti,am654-tisci-rproc-r5";
-               mboxes= <&secure_proxy_main 1>,
-                       <&secure_proxy_main 0>,
-                       <&secure_proxy_sa3 0>;
-               mbox-names = "tx", "rx", "boot_notify";
-               bootph-pre-ram;
-       };
-};
-
-&main_timer0 {
-       /delete-property/ clocks;
-       /delete-property/ clocks-names;
-       /delete-property/ assigned-clocks;
-       /delete-property/ assigned-clock-parents;
-       clock-frequency = <25000000>;
-};
-
-/* WKUP UART0 is used for DM firmware logs */
-&wkup_uart0 {
-       status = "okay";
-};
-
-/* Main UART1 is used for TIFS firmware logs */
-&main_uart1 {
-       status = "okay";
-};
+#include "k3-am625-r5.dtsi"
index bba69871fd227a097919cee1900b50dcb4433205..fb0b83b83f1bcc6447ea34f6b109359f2ddc813a 100644 (file)
 #include "k3-am62-ddr.dtsi"
 
 #include "k3-am625-beagleplay-u-boot.dtsi"
-
-/ {
-       aliases {
-               remoteproc0 = &sysctrler;
-               remoteproc1 = &a53_0;
-       };
-
-       a53_0: a53@0 {
-               compatible = "ti,am654-rproc";
-               reg = <0x00 0x00a90000 0x00 0x10>;
-               power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>,
-                               <&k3_pds 135 TI_SCI_PD_EXCLUSIVE>;
-               resets = <&k3_reset 135 0>;
-               clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
-               clock-names = "gtc", "core";
-               assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
-               assigned-clock-parents = <&k3_clks 61 2>;
-               assigned-clock-rates = <200000000>, <1250000000>;
-               ti,sci = <&dmsc>;
-               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 = <36>;
-               ti,secure-host;
-               mbox-names = "rx", "tx";
-               mboxes= <&secure_proxy_main 22>,
-                       <&secure_proxy_main 23>;
-               bootph-pre-ram;
-       };
-};
-
-&main_timer0 {
-       /delete-property/ clocks;
-       /delete-property/ clocks-names;
-       /delete-property/ assigned-clocks;
-       /delete-property/ assigned-clock-parents;
-       clock-frequency = <25000000>;
-};
-
-&dmsc {
-       mboxes= <&secure_proxy_main 0>,
-               <&secure_proxy_main 1>,
-               <&secure_proxy_main 0>;
-       mbox-names = "rx", "tx", "notify";
-       ti,host-id = <35>;
-       ti,secure-host;
-};
-
-&secure_proxy_sa3 {
-       /* We require this for boot handshake */
-       status = "okay";
-};
-
-&cbass_main {
-       sysctrler: sysctrler {
-               compatible = "ti,am654-tisci-rproc-r5";
-               mboxes= <&secure_proxy_main 1>, <&secure_proxy_main 0>, <&secure_proxy_sa3 0>;
-               mbox-names = "tx", "rx", "boot_notify";
-               bootph-pre-ram;
-       };
+#include "k3-am625-r5.dtsi"
+
+&a53_0 {
+       power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>,
+                       <&k3_pds 135 TI_SCI_PD_EXCLUSIVE>;
+       assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
+       assigned-clock-parents = <&k3_clks 61 2>;
+       assigned-clock-rates = <200000000>, <1250000000>;
 };
 
 &main_pktdma {
index 0f2c592593e6a51de0ce7bfe99ac69771c51c185..46b621242b55e2ad2865764aef90aa806777c0c7 100644 (file)
 #include "k3-am62-ddr.dtsi"
 
 #include "k3-am625-phyboard-lyra-rdk-u-boot.dtsi"
+#include "k3-am625-r5.dtsi"
 
 / {
-       aliases {
-               remoteproc0 = &sysctrler;
-               remoteproc1 = &a53_0;
-               serial0 = &wkup_uart0;
-               serial3 = &main_uart1;
-       };
-
-       a53_0: a53@0 {
-               compatible = "ti,am654-rproc";
-               reg = <0x00 0x00a90000 0x00 0x10>;
-               power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>,
-                               <&k3_pds 135 TI_SCI_PD_EXCLUSIVE>,
-                               <&k3_pds 166 TI_SCI_PD_EXCLUSIVE>;
-               resets = <&k3_reset 135 0>;
-               clocks = <&k3_clks 61 0>;
-               assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
-               assigned-clock-parents = <&k3_clks 61 2>;
-               assigned-clock-rates = <200000000>, <1200000000>;
-               ti,sci = <&dmsc>;
-               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 = <36>;
-               ti,secure-host;
-               mbox-names = "rx", "tx";
-               mboxes= <&secure_proxy_main 22>,
-                       <&secure_proxy_main 23>;
-               bootph-pre-ram;
-       };
-
        memory@80000000 {
                device_type = "memory";
                /* 2G RAM */
        };
 };
 
-&main_timer0 {
-       /delete-property/ clocks;
-       /delete-property/ clocks-names;
-       /delete-property/ assigned-clocks;
-       /delete-property/ assigned-clock-parents;
-       clock-frequency = <25000000>;
-};
-
-&secure_proxy_sa3 {
-       /* We require this for boot handshake */
-       status = "okay";
+&a53_0 {
+       clock-names = "gtc";
+       clocks = <&k3_clks 61 0>;
 };
 
-&cbass_main {
-       sysctrler: sysctrler {
-               compatible = "ti,am654-tisci-rproc-r5";
-               mboxes= <&secure_proxy_main 1>, <&secure_proxy_main 0>, <&secure_proxy_sa3 0>;
-               mbox-names = "tx", "rx", "boot_notify";
-               bootph-pre-ram;
-       };
-};
-
-&dmsc {
-       mboxes= <&secure_proxy_main 0>,
-               <&secure_proxy_main 1>,
-               <&secure_proxy_main 0>;
-       mbox-names = "rx", "tx", "notify";
-       ti,host-id = <35>;
-       ti,secure-host;
-};
-
-&main_bcdma {
+&main_pktdma {
        ti,sci = <&dm_tifs>;
 };
 
-&main_pktdma {
+&main_bcdma {
        ti,sci = <&dm_tifs>;
 };
 
        };
 };
 
-&ospi0 {
-       reg = <0x00 0x0fc40000 0x00 0x100>,
-             <0x00 0x60000000 0x00 0x08000000>;
-};
-
 /* WKUP UART0 is used for DM firmware logs */
 &wkup_uart0 {
        pinctrl-names = "default";
index 67589f941ba30e1b7c16b1b1f7ab58304c543582..9dbcd36e002d3213a0c4f132aaa74bdf75cddb02 100644 (file)
@@ -9,92 +9,8 @@
 #include "k3-am62-ddr.dtsi"
 
 #include "k3-am625-sk-u-boot.dtsi"
-
-/ {
-       aliases {
-               tick-timer = &main_timer0;
-               remoteproc0 = &sysctrler;
-               remoteproc1 = &a53_0;
-               serial0 = &wkup_uart0;
-               serial3 = &main_uart1;
-       };
-
-       a53_0: a53@0 {
-               compatible = "ti,am654-rproc";
-               reg = <0x00 0x00a90000 0x00 0x10>;
-               power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>,
-                               <&k3_pds 135 TI_SCI_PD_EXCLUSIVE>,
-                               <&k3_pds 166 TI_SCI_PD_EXCLUSIVE>;
-               resets = <&k3_reset 135 0>;
-               clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
-               clock-names = "gtc", "core";
-               assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
-               assigned-clock-parents = <&k3_clks 61 2>;
-               assigned-clock-rates = <200000000>, <1200000000>;
-               ti,sci = <&dmsc>;
-               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 = <36>;
-               ti,secure-host;
-               mbox-names = "rx", "tx";
-               mboxes= <&secure_proxy_main 22>,
-                       <&secure_proxy_main 23>;
-               bootph-pre-ram;
-       };
-};
-
-&dmsc {
-       mboxes= <&secure_proxy_main 0>,
-               <&secure_proxy_main 1>,
-               <&secure_proxy_main 0>;
-       mbox-names = "rx", "tx", "notify";
-       ti,host-id = <35>;
-       ti,secure-host;
-};
-
-&secure_proxy_sa3 {
-       /* We require this for boot handshake */
-       status = "okay";
-};
-
-&cbass_main {
-       sysctrler: sysctrler {
-               compatible = "ti,am654-tisci-rproc-r5";
-               mboxes= <&secure_proxy_main 1>, <&secure_proxy_main 0>, <&secure_proxy_sa3 0>;
-               mbox-names = "tx", "rx", "boot_notify";
-               bootph-pre-ram;
-       };
-};
-
-&main_timer0 {
-       /delete-property/ clocks;
-       /delete-property/ clocks-names;
-       /delete-property/ assigned-clocks;
-       /delete-property/ assigned-clock-parents;
-       clock-frequency = <25000000>;
-};
-
-/* WKUP UART0 is used for DM firmware logs */
-&wkup_uart0 {
-       status = "okay";
-};
-
-/* Main UART1 is used for TIFS firmware logs */
-&main_uart1 {
-       status = "okay";
-};
-
-&ospi0 {
-       reg = <0x00 0x0fc40000 0x00 0x100>,
-             <0x00 0x60000000 0x00 0x08000000>;
-};
+#include "k3-am625-r5.dtsi"
 
 &main_pktdma {
        ti,sci = <&dm_tifs>;
-       bootph-all;
 };
diff --git a/arch/arm/dts/k3-am625-r5.dtsi b/arch/arm/dts/k3-am625-r5.dtsi
new file mode 100644 (file)
index 0000000..c509857
--- /dev/null
@@ -0,0 +1,88 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2026 Texas Instruments Incorporated - https://www.ti.com/
+ */
+
+/ {
+       aliases {
+               tick-timer = &main_timer0;
+               remoteproc0 = &sysctrler;
+               remoteproc1 = &a53_0;
+               serial0 = &wkup_uart0;
+               serial3 = &main_uart1;
+       };
+
+       a53_0: a53@0 {
+               compatible = "ti,am654-rproc";
+               reg = <0x00 0x00a90000 0x00 0x10>;
+               power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>,
+                               <&k3_pds 135 TI_SCI_PD_EXCLUSIVE>,
+                               <&k3_pds 166 TI_SCI_PD_EXCLUSIVE>;
+               resets = <&k3_reset 135 0>;
+               clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
+               clock-names = "gtc", "core";
+               assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
+               assigned-clock-parents = <&k3_clks 61 2>;
+               assigned-clock-rates = <200000000>, <1200000000>;
+               ti,sci = <&dmsc>;
+               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 = <36>;
+               ti,secure-host;
+               mbox-names = "rx", "tx";
+               mboxes= <&secure_proxy_main 22>,
+                       <&secure_proxy_main 23>;
+               bootph-pre-ram;
+       };
+};
+
+&dmsc {
+       mboxes= <&secure_proxy_main 0>,
+               <&secure_proxy_main 1>,
+               <&secure_proxy_main 0>;
+       mbox-names = "rx", "tx", "notify";
+       ti,host-id = <35>;
+       ti,secure-host;
+};
+
+&secure_proxy_sa3 {
+       /* We require this for boot handshake */
+       status = "okay";
+};
+
+&cbass_main {
+       sysctrler: sysctrler {
+               compatible = "ti,am654-tisci-rproc-r5";
+               mboxes= <&secure_proxy_main 1>, <&secure_proxy_main 0>, <&secure_proxy_sa3 0>;
+               mbox-names = "tx", "rx", "boot_notify";
+               bootph-pre-ram;
+       };
+};
+
+&main_timer0 {
+       /delete-property/ clocks;
+       /delete-property/ clocks-names;
+       /delete-property/ assigned-clocks;
+       /delete-property/ assigned-clock-parents;
+       clock-frequency = <25000000>;
+};
+
+/* WKUP UART0 is used for DM firmware logs */
+&wkup_uart0 {
+       status = "okay";
+};
+
+/* Main UART1 is used for TIFS firmware logs */
+&main_uart1 {
+       status = "okay";
+};
+
+&ospi0 {
+       reg = <0x00 0x0fc40000 0x00 0x100>,
+             <0x00 0x60000000 0x00 0x08000000>;
+};
index fb431c9633754e77bf9657e1fe3d325b838bf709..dfd960aaf3c8e0d012db1bc5a2389bde8ac90042 100644 (file)
@@ -9,75 +9,30 @@
 #include "k3-am62-ddr.dtsi"
 
 #include "k3-am625-verdin-wifi-dev-u-boot.dtsi"
+#include "k3-am625-r5.dtsi"
 
 / {
-       a53_0: a53@0 {
-               compatible = "ti,am654-rproc";
-               reg = <0x00 0x00a90000 0x00 0x10>;
-               /*
-                * FIXME: Currently only the SPL running on the R5 has a clock
-                * driver. As a workaround therefore move the assigned-clock
-                * stuff required for our ETH_25MHz_CLK from the cpsw3g_mdio
-                * node of the regular device tree to here (last one each in
-                * below three lines, adding a <0> as spacing for parents).
-                */
-               assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>, <&k3_clks 157 20>;
-               assigned-clock-parents = <&k3_clks 61 2>, <0>, <&k3_clks 157 22>;
-               assigned-clock-rates = <200000000>, <800000000>, <25000000>;
-               clocks = <&k3_clks 61 0>;
-               power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>,
-                               <&k3_pds 135 TI_SCI_PD_EXCLUSIVE>,
-                               <&k3_pds 166 TI_SCI_PD_EXCLUSIVE>;
-               resets = <&k3_reset 135 0>;
-               ti,sci = <&dmsc>;
-               ti,sci-host-id = <10>;
-               ti,sci-proc-id = <32>;
-               bootph-pre-ram;
-       };
-
        aliases {
+               serial0 = &main_uart1;
+               serial1 = &wkup_uart0;
+               serial2 = &main_uart0;
+               serial3 = &mcu_uart0;
+               serial4 = &main_uart5;
                remoteproc0 = &sysctrler;
                remoteproc1 = &a53_0;
        };
-
-       dm_tifs: dm-tifs {
-               compatible = "ti,j721e-dm-sci";
-               mbox-names = "rx", "tx";
-               mboxes= <&secure_proxy_main 22>,
-                       <&secure_proxy_main 23>;
-               ti,host-id = <36>;
-               ti,secure-host;
-               bootph-pre-ram;
-       };
-};
-
-&cbass_main {
-       sysctrler: sysctrler {
-               compatible = "ti,am654-tisci-rproc-r5";
-               mboxes= <&secure_proxy_main 1>, <&secure_proxy_main 0>, <&secure_proxy_sa3 0>;
-               mbox-names = "tx", "rx", "boot_notify";
-               bootph-pre-ram;
-       };
-};
-
-&dmsc {
-       mboxes= <&secure_proxy_main 0>,
-               <&secure_proxy_main 1>,
-               <&secure_proxy_main 0>;
-       mbox-names = "rx", "tx", "notify";
-       ti,host-id = <35>;
-       ti,secure-host;
-};
-
-&main_timer0 {
-       /delete-property/ clocks;
-       /delete-property/ clocks-names;
-       /delete-property/ assigned-clocks;
-       /delete-property/ assigned-clock-parents;
-       clock-frequency = <25000000>;
 };
 
-&secure_proxy_sa3 {
-       /* We require this for boot handshake */
-       status = "okay";
+&a53_0 {
+       clocks = <&k3_clks 61 0>;
+       /*
+        * FIXME: Currently only the SPL running on the R5 has a clock
+        * driver. As a workaround therefore move the assigned-clock
+        * stuff required for our ETH_25MHz_CLK from the cpsw3g_mdio
+        * node of the regular device tree to here (last one each in
+        * below three lines, adding a <0> as spacing for parents).
+        */
+       assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>, <&k3_clks 157 20>;
+       assigned-clock-parents = <&k3_clks 61 2>, <0>, <&k3_clks 157 22>;
+       assigned-clock-rates = <200000000>, <800000000>, <25000000>;
 };
index 225ad44e7226335bf1f245d37c64d39db4689897..02a950a9a0768da9ee9e9dcc8fb619c5a2f5b1bb 100644 (file)
 #include "k3-am62-ddr.dtsi"
 
 #include "k3-am6254atl-sk-u-boot.dtsi"
-
-/ {
-       aliases {
-               tick-timer = &main_timer0;
-               remoteproc0 = &sysctrler;
-               remoteproc1 = &a53_0;
-               serial0 = &wkup_uart0;
-               serial3 = &main_uart1;
-       };
-
-       a53_0: a53@0 {
-               compatible = "ti,am654-rproc";
-               reg = <0x00 0x00a90000 0x00 0x10>;
-               power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>,
-                               <&k3_pds 135 TI_SCI_PD_EXCLUSIVE>,
-                               <&k3_pds 166 TI_SCI_PD_EXCLUSIVE>;
-               resets = <&k3_reset 135 0>;
-               clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
-               clock-names = "gtc", "core";
-               assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
-               assigned-clock-parents = <&k3_clks 61 2>;
-               assigned-clock-rates = <200000000>, <1200000000>;
-               ti,sci = <&dmsc>;
-               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 = <36>;
-               ti,secure-host;
-               mbox-names = "rx", "tx";
-               mboxes= <&secure_proxy_main 22>,
-                       <&secure_proxy_main 23>;
-               bootph-pre-ram;
-       };
-};
-
-&dmsc {
-       mboxes= <&secure_proxy_main 0>,
-               <&secure_proxy_main 1>,
-               <&secure_proxy_main 0>;
-       mbox-names = "rx", "tx", "notify";
-       ti,host-id = <35>;
-       ti,secure-host;
-};
-
-&secure_proxy_sa3 {
-       /* We require this for boot handshake */
-       status = "okay";
-};
-
-&cbass_main {
-       sysctrler: sysctrler {
-               compatible = "ti,am654-tisci-rproc-r5";
-               mboxes= <&secure_proxy_main 1>, <&secure_proxy_main 0>, <&secure_proxy_sa3 0>;
-               mbox-names = "tx", "rx", "boot_notify";
-               bootph-pre-ram;
-       };
-};
-
-&main_timer0 {
-       /delete-property/ clocks;
-       /delete-property/ clocks-names;
-       /delete-property/ assigned-clocks;
-       /delete-property/ assigned-clock-parents;
-       clock-frequency = <25000000>;
-};
-
-/* WKUP UART0 is used for DM firmware logs */
-&wkup_uart0 {
-       status = "okay";
-};
-
-/* Main UART1 is used for TIFS firmware logs */
-&main_uart1 {
-       status = "okay";
-};
-
-&ospi0 {
-       reg = <0x00 0x0fc40000 0x00 0x100>,
-             <0x00 0x60000000 0x00 0x08000000>;
-};
+#include "k3-am625-r5.dtsi"
 
 &main_pktdma {
        ti,sci = <&dm_tifs>;
-       bootph-all;
 };
index 96860e80e9a2f9ccb9e9f4387a85834810d9db31..b54cd9d48a4cc73be42db9a867d7189ac9563f0b 100644 (file)
 #include "k3-am62a-ddr.dtsi"
 
 #include "k3-am62a7-phyboard-lyra-rdk-u-boot.dtsi"
+#include "k3-am62a7-r5.dtsi"
 
 / {
        aliases {
-               remoteproc0 = &sysctrler;
-               remoteproc1 = &a53_0;
                serial0 = &wkup_uart0;
                serial3 = &main_uart1;
        };
+};
 
-       a53_0: a53@0 {
-               compatible = "ti,am654-rproc";
-               reg = <0x00 0x00a90000 0x00 0x10>;
-               power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>,
-                               <&k3_pds 135 TI_SCI_PD_EXCLUSIVE>,
-                               <&k3_pds 166 TI_SCI_PD_EXCLUSIVE>;
-               resets = <&k3_reset 135 0>;
-               clocks = <&k3_clks 61 0>;
-               assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
-               assigned-clock-parents = <&k3_clks 61 2>;
-               assigned-clock-rates = <200000000>, <1200000000>;
-               ti,sci = <&dmsc>;
-               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 = <36>;
-               ti,secure-host;
-               mbox-names = "rx", "tx";
-               mboxes= <&secure_proxy_main 22>,
-                       <&secure_proxy_main 23>;
-               bootph-pre-ram;
-       };
-
-       memory@80000000 {
-               device_type = "memory";
-               /* 2G RAM */
-               reg = <0x00000000 0x80000000 0x00000000 0x80000000>;
-               bootph-pre-ram;
-       };
+&a53_0 {
+       clocks = <&k3_clks 61 0>;
+       clock-names = "gtc";
 };
 
 &cbass_main {
        };
 };
 
-&dmsc {
-       mboxes= <&secure_proxy_main 0>,
-               <&secure_proxy_main 1>,
-               <&secure_proxy_main 0>;
-       mbox-names = "rx", "tx", "notify";
-       ti,host-id = <35>;
-       ti,secure-host;
-};
-
-&main_timer0 {
-       /delete-property/ clocks;
-       /delete-property/ clocks-names;
-       /delete-property/ assigned-clocks;
-       /delete-property/ assigned-clock-parents;
-       clock-frequency = <25000000>;
-       bootph-pre-ram;
-};
-
 &main_bcdma {
        ti,sci = <&dm_tifs>;
 };
index 64923c2c7109bfa17b49c6591005b559331241c7..4570ff6edbf7fb2ccd201451e988428200ec98c7 100644 (file)
@@ -9,50 +9,12 @@
 #include "k3-am62a-ddr.dtsi"
 
 #include "k3-am62a7-sk-u-boot.dtsi"
+#include "k3-am62a7-r5.dtsi"
 
 / {
        aliases {
                tick-timer = &main_timer0;
-               remoteproc0 = &sysctrler;
-               remoteproc1 = &a53_0;
        };
-
-       a53_0: a53@0 {
-               compatible = "ti,am654-rproc";
-               reg = <0x00 0x00a90000 0x00 0x10>;
-               power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>,
-                               <&k3_pds 135 TI_SCI_PD_EXCLUSIVE>,
-                               <&k3_pds 166 TI_SCI_PD_EXCLUSIVE>;
-               resets = <&k3_reset 135 0>;
-               clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
-               clock-names = "gtc", "core";
-               assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
-               assigned-clock-parents = <&k3_clks 61 2>;
-               assigned-clock-rates = <200000000>, <1200000000>;
-               ti,sci = <&dmsc>;
-               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 = <36>;
-               ti,secure-host;
-               mbox-names = "rx", "tx";
-               mboxes= <&secure_proxy_main 22>,
-                       <&secure_proxy_main 23>;
-               bootph-pre-ram;
-       };
-};
-
-&dmsc {
-       mboxes= <&secure_proxy_main 0>,
-               <&secure_proxy_main 1>,
-               <&secure_proxy_main 0>;
-       mbox-names = "rx", "tx", "notify";
-       ti,host-id = <35>;
-       ti,secure-host;
 };
 
 &secure_proxy_sa3 {
        bootph-pre-ram;
 };
 
-&cbass_main {
-       sysctrler: sysctrler {
-               compatible = "ti,am654-tisci-rproc-r5";
-               mboxes= <&secure_proxy_main 1>,
-                       <&secure_proxy_main 0>,
-                       <&secure_proxy_sa3 0>;
-               mbox-names = "tx", "rx", "boot_notify";
-               bootph-pre-ram;
-       };
-};
-
-&main_timer0 {
-       /delete-property/ clocks;
-       /delete-property/ clocks-names;
-       /delete-property/ assigned-clocks;
-       /delete-property/ assigned-clock-parents;
-       clock-frequency = <25000000>;
-       bootph-pre-ram;
-};
-
 &wkup_uart0_pins_default {
        bootph-pre-ram;
 };
diff --git a/arch/arm/dts/k3-am62a7-r5.dtsi b/arch/arm/dts/k3-am62a7-r5.dtsi
new file mode 100644 (file)
index 0000000..1cb8bdb
--- /dev/null
@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2026 Texas Instruments Incorporated - https://www.ti.com/
+ */
+
+/ {
+       aliases {
+               remoteproc0 = &sysctrler;
+               remoteproc1 = &a53_0;
+       };
+
+       a53_0: a53@0 {
+               compatible = "ti,am654-rproc";
+               reg = <0x00 0x00a90000 0x00 0x10>;
+               power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>,
+                               <&k3_pds 135 TI_SCI_PD_EXCLUSIVE>,
+                               <&k3_pds 166 TI_SCI_PD_EXCLUSIVE>;
+               resets = <&k3_reset 135 0>;
+               clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
+               clock-names = "gtc", "core";
+               assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
+               assigned-clock-parents = <&k3_clks 61 2>;
+               assigned-clock-rates = <200000000>, <1200000000>;
+               ti,sci = <&dmsc>;
+               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 = <36>;
+               ti,secure-host;
+               mbox-names = "rx", "tx";
+               mboxes= <&secure_proxy_main 22>,
+                       <&secure_proxy_main 23>;
+               bootph-pre-ram;
+       };
+
+};
+
+&dmsc {
+       mboxes= <&secure_proxy_main 0>,
+               <&secure_proxy_main 1>,
+               <&secure_proxy_main 0>;
+       mbox-names = "rx", "tx", "notify";
+       ti,host-id = <35>;
+       ti,secure-host;
+};
+
+&cbass_main {
+       sysctrler: sysctrler {
+               compatible = "ti,am654-tisci-rproc-r5";
+               mboxes= <&secure_proxy_main 1>,
+                       <&secure_proxy_main 0>,
+                       <&secure_proxy_sa3 0>;
+               mbox-names = "tx", "rx", "boot_notify";
+               bootph-pre-ram;
+       };
+};
+
+&main_timer0 {
+       /delete-property/ clocks;
+       /delete-property/ clocks-names;
+       /delete-property/ assigned-clocks;
+       /delete-property/ assigned-clock-parents;
+       clock-frequency = <25000000>;
+       bootph-pre-ram;
+};
index a3213d001455de901843509da2138a50802bba82..62f337e01315b95f7bb24faf0261f6ba5e61cf88 100644 (file)
@@ -9,74 +9,4 @@
 #include "k3-am62a-ddr.dtsi"
 
 #include "k3-am62d2-evm-u-boot.dtsi"
-
-/ {
-       aliases {
-               tick-timer = &main_timer0;
-               remoteproc0 = &sysctrler;
-               remoteproc1 = &a53_0;
-       };
-
-       a53_0: a53@0 {
-               compatible = "ti,am654-rproc";
-               reg = <0x00 0x00a90000 0x00 0x10>;
-               power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>,
-                               <&k3_pds 135 TI_SCI_PD_EXCLUSIVE>,
-                               <&k3_pds 166 TI_SCI_PD_EXCLUSIVE>;
-               resets = <&k3_reset 135 0>;
-               clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
-               clock-names = "gtc", "core";
-               assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
-               assigned-clock-parents = <&k3_clks 61 2>;
-               assigned-clock-rates = <200000000>, <1200000000>;
-               ti,sci = <&dmsc>;
-               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 = <36>;
-               ti,secure-host;
-               mbox-names = "rx", "tx";
-               mboxes= <&secure_proxy_main 22>,
-                       <&secure_proxy_main 23>;
-               bootph-pre-ram;
-       };
-};
-
-&dmsc {
-       mboxes= <&secure_proxy_main 0>,
-               <&secure_proxy_main 1>,
-               <&secure_proxy_main 0>;
-       mbox-names = "rx", "tx", "notify";
-       ti,host-id = <35>;
-       ti,secure-host;
-};
-
-&secure_proxy_sa3 {
-       /* Needed for initial handshake with ROM */
-       status = "okay";
-       bootph-pre-ram;
-};
-
-&cbass_main {
-       sysctrler: sysctrler {
-               compatible = "ti,am654-tisci-rproc-r5";
-               mboxes= <&secure_proxy_main 1>,
-                       <&secure_proxy_main 0>,
-                       <&secure_proxy_sa3 0>;
-               mbox-names = "tx", "rx", "boot_notify";
-               bootph-pre-ram;
-       };
-};
-
-&main_timer0 {
-       /delete-property/ clocks;
-       /delete-property/ clocks-names;
-       /delete-property/ assigned-clocks;
-       /delete-property/ assigned-clock-parents;
-       clock-frequency = <25000000>;
-       bootph-pre-ram;
-};
+#include "k3-am62d2-r5.dtsi"
diff --git a/arch/arm/dts/k3-am62d2-r5.dtsi b/arch/arm/dts/k3-am62d2-r5.dtsi
new file mode 100644 (file)
index 0000000..23dfc49
--- /dev/null
@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2026 Texas Instruments Incorporated - https://www.ti.com/
+ */
+
+/ {
+       aliases {
+               tick-timer = &main_timer0;
+               remoteproc0 = &sysctrler;
+               remoteproc1 = &a53_0;
+       };
+
+       a53_0: a53@0 {
+               compatible = "ti,am654-rproc";
+               reg = <0x00 0x00a90000 0x00 0x10>;
+               power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>,
+                               <&k3_pds 135 TI_SCI_PD_EXCLUSIVE>,
+                               <&k3_pds 166 TI_SCI_PD_EXCLUSIVE>;
+               resets = <&k3_reset 135 0>;
+               clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
+               clock-names = "gtc", "core";
+               assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
+               assigned-clock-parents = <&k3_clks 61 2>;
+               assigned-clock-rates = <200000000>, <1200000000>;
+               ti,sci = <&dmsc>;
+               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 = <36>;
+               ti,secure-host;
+               mbox-names = "rx", "tx";
+               mboxes= <&secure_proxy_main 22>,
+                       <&secure_proxy_main 23>;
+               bootph-pre-ram;
+       };
+};
+
+&dmsc {
+       mboxes= <&secure_proxy_main 0>,
+               <&secure_proxy_main 1>,
+               <&secure_proxy_main 0>;
+       mbox-names = "rx", "tx", "notify";
+       ti,host-id = <35>;
+       ti,secure-host;
+};
+
+&secure_proxy_sa3 {
+       /* Needed for initial handshake with ROM */
+       status = "okay";
+       bootph-pre-ram;
+};
+
+&cbass_main {
+       sysctrler: sysctrler {
+               compatible = "ti,am654-tisci-rproc-r5";
+               mboxes= <&secure_proxy_main 1>,
+                       <&secure_proxy_main 0>,
+                       <&secure_proxy_sa3 0>;
+               mbox-names = "tx", "rx", "boot_notify";
+               bootph-pre-ram;
+       };
+};
+
+&main_timer0 {
+       /delete-property/ clocks;
+       /delete-property/ clocks-names;
+       /delete-property/ assigned-clocks;
+       /delete-property/ assigned-clock-parents;
+       clock-frequency = <25000000>;
+       bootph-pre-ram;
+};
index e45d2bf6a0b43261f5e133b74435d4094b945068..9a09360c242dfffbbef2cc476bc880b3c588446c 100644 (file)
@@ -9,81 +9,14 @@
 
 #include "k3-am62p-ddr-lp4-50-1600.dtsi"
 #include "k3-am62a-ddr.dtsi"
+#include "k3-am62p5-r5.dtsi"
 
 / {
        aliases {
-               remoteproc0 = &sysctrler;
-               remoteproc1 = &a53_0;
                serial0 = &wkup_uart0;
                serial2 = &main_uart0;
                serial3 = &main_uart1;
        };
-
-       a53_0: a53@0 {
-               compatible = "ti,am654-rproc";
-               reg = <0x00 0x00a90000 0x00 0x10>;
-               power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>,
-                       <&k3_pds 135 TI_SCI_PD_EXCLUSIVE>,
-                       <&k3_pds 166 TI_SCI_PD_EXCLUSIVE>;
-               resets = <&k3_reset 135 0>;
-               clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
-               clock-names = "gtc", "core";
-               assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
-               assigned-clock-parents = <&k3_clks 61 2>;
-               assigned-clock-rates = <200000000>, <1200000000>;
-               ti,sci = <&dmsc>;
-               ti,sci-proc-id = <32>;
-               ti,sci-host-id = <10>;
-               bootph-all;
-       };
-
-       dm_tifs: dm-tifs {
-               compatible = "ti,j721e-dm-sci";
-               ti,host-id = <36>;
-               ti,secure-host;
-               mbox-names = "rx", "tx";
-               mboxes= <&secure_proxy_main 20>,
-                       <&secure_proxy_main 21>;
-               bootph-all;
-       };
-};
-
-&dmsc {
-       mboxes= <&secure_proxy_main 0>,
-               <&secure_proxy_main 1>,
-               <&secure_proxy_main 0>;
-       mbox-names = "rx", "tx", "notify";
-       ti,host-id = <35>;
-       ti,secure-host;
-};
-
-&cbass_main {
-       sa3_secproxy: secproxy@44880000 {
-               compatible = "ti,am654-secure-proxy";
-               #mbox-cells = <1>;
-               reg = <0x00 0x44880000 0x00 0x20000>,
-                     <0x00 0x44860000 0x00 0x20000>,
-                     <0x00 0x43600000 0x00 0x10000>;
-               reg-names = "rt", "scfg", "target_data";
-               bootph-all;
-       };
-
-       sysctrler: sysctrler {
-               compatible = "ti,am654-tisci-rproc-r5";
-               mboxes= <&secure_proxy_main 1>,
-                       <&secure_proxy_main 0>,
-                       <&sa3_secproxy 0>;
-               mbox-names = "tx", "rx", "boot_notify";
-               bootph-all;
-       };
-};
-
-&main_timer0 {
-       /delete-property/ clocks;
-       /delete-property/ clocks-names;
-       /delete-property/ assigned-clocks;
-       /delete-property/ assigned-clock-parents;
-       clock-frequency = <25000000>;
 };
 
 /* WKUP UART0 is used for DM firmware logs */
diff --git a/arch/arm/dts/k3-am62p5-r5.dtsi b/arch/arm/dts/k3-am62p5-r5.dtsi
new file mode 100644 (file)
index 0000000..338bd73
--- /dev/null
@@ -0,0 +1,77 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2026 Texas Instruments Incorporated - https://www.ti.com/
+ */
+
+/ {
+       aliases {
+               remoteproc0 = &sysctrler;
+               remoteproc1 = &a53_0;
+       };
+
+       a53_0: a53@0 {
+               compatible = "ti,am654-rproc";
+               reg = <0x00 0x00a90000 0x00 0x10>;
+               power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>,
+                       <&k3_pds 135 TI_SCI_PD_EXCLUSIVE>,
+                       <&k3_pds 166 TI_SCI_PD_EXCLUSIVE>;
+               resets = <&k3_reset 135 0>;
+               clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
+               clock-names = "gtc", "core";
+               assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
+               assigned-clock-parents = <&k3_clks 61 2>;
+               assigned-clock-rates = <200000000>, <1200000000>;
+               ti,sci = <&dmsc>;
+               ti,sci-proc-id = <32>;
+               ti,sci-host-id = <10>;
+               bootph-all;
+       };
+
+       dm_tifs: dm-tifs {
+               compatible = "ti,j721e-dm-sci";
+               ti,host-id = <36>;
+               ti,secure-host;
+               mbox-names = "rx", "tx";
+               mboxes= <&secure_proxy_main 20>,
+                       <&secure_proxy_main 21>;
+               bootph-all;
+       };
+};
+
+&cbass_main {
+       sa3_secproxy: secproxy@44880000 {
+               compatible = "ti,am654-secure-proxy";
+               #mbox-cells = <1>;
+               reg = <0x00 0x44880000 0x00 0x20000>,
+                     <0x00 0x44860000 0x00 0x20000>,
+                     <0x00 0x43600000 0x00 0x10000>;
+               reg-names = "rt", "scfg", "target_data";
+               bootph-all;
+       };
+
+       sysctrler: sysctrler {
+               compatible = "ti,am654-tisci-rproc-r5";
+               mboxes= <&secure_proxy_main 1>,
+                       <&secure_proxy_main 0>,
+                       <&sa3_secproxy 0>;
+               mbox-names = "tx", "rx", "boot_notify";
+               bootph-all;
+       };
+};
+
+&dmsc {
+       mboxes= <&secure_proxy_main 0>,
+               <&secure_proxy_main 1>,
+               <&secure_proxy_main 0>;
+       mbox-names = "rx", "tx", "notify";
+       ti,host-id = <35>;
+       ti,secure-host;
+};
+
+&main_timer0 {
+       /delete-property/ clocks;
+       /delete-property/ clocks-names;
+       /delete-property/ assigned-clocks;
+       /delete-property/ assigned-clock-parents;
+       clock-frequency = <25000000>;
+};
index 177390869351a97fbe405d47917c812df1f50439..b1735b363bae3abb6fde8c589df091c9a0644f92 100644 (file)
@@ -9,76 +9,10 @@
 #include "k3-am62a-ddr.dtsi"
 
 #include "k3-am62p5-verdin-wifi-dev-u-boot.dtsi"
+#include "k3-am62p5-r5.dtsi"
 
-/ {
-       aliases {
-               remoteproc0 = &sysctrler;
-               remoteproc1 = &a53_0;
-       };
-
-       a53_0: a53@0 {
-               compatible = "ti,am654-rproc";
-               reg = <0x00 0x00a90000 0x00 0x10>;
-               power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>,
-                       <&k3_pds 135 TI_SCI_PD_EXCLUSIVE>,
-                       <&k3_pds 166 TI_SCI_PD_EXCLUSIVE>;
-               resets = <&k3_reset 135 0>;
-               clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
-               clock-names = "gtc", "core";
-               assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>, <&k3_clks 157 36>;
-               assigned-clock-parents = <&k3_clks 61 2>, <0>, <&k3_clks 157 38>;
-               assigned-clock-rates = <200000000>, <1200000000>, <25000000>;
-               ti,sci = <&dmsc>;
-               ti,sci-proc-id = <32>;
-               ti,sci-host-id = <10>;
-               bootph-all;
-       };
-
-       dm_tifs: dm-tifs {
-               compatible = "ti,j721e-dm-sci";
-               ti,host-id = <36>;
-               ti,secure-host;
-               mbox-names = "rx", "tx";
-               mboxes= <&secure_proxy_main 20>,
-                       <&secure_proxy_main 21>;
-               bootph-all;
-       };
-};
-
-&cbass_main {
-       sa3_secproxy: secproxy@44880000 {
-               compatible = "ti,am654-secure-proxy";
-               #mbox-cells = <1>;
-               reg = <0x00 0x44880000 0x00 0x20000>,
-                     <0x00 0x44860000 0x00 0x20000>,
-                     <0x00 0x43600000 0x00 0x10000>;
-               reg-names = "rt", "scfg", "target_data";
-               bootph-all;
-       };
-
-       sysctrler: sysctrler {
-               compatible = "ti,am654-tisci-rproc-r5";
-               mboxes= <&secure_proxy_main 1>,
-                       <&secure_proxy_main 0>,
-                       <&sa3_secproxy 0>;
-               mbox-names = "tx", "rx", "boot_notify";
-               bootph-all;
-       };
-};
-
-&dmsc {
-       mboxes= <&secure_proxy_main 0>,
-               <&secure_proxy_main 1>,
-               <&secure_proxy_main 0>;
-       mbox-names = "rx", "tx", "notify";
-       ti,host-id = <35>;
-       ti,secure-host;
-};
-
-&main_timer0 {
-       /delete-property/ clocks;
-       /delete-property/ clocks-names;
-       /delete-property/ assigned-clocks;
-       /delete-property/ assigned-clock-parents;
-       clock-frequency = <25000000>;
+&a53_0 {
+       assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>, <&k3_clks 157 36>;
+       assigned-clock-parents = <&k3_clks 61 2>, <0>, <&k3_clks 157 38>;
+       assigned-clock-rates = <200000000>, <1200000000>, <25000000>;
 };
index 67b8587d3b296a6ab94f1250ebe99d7ad286abb2..e3d363a8e39731ab3e9b867ed0a0682d0e2cb1e0 100644 (file)
@@ -8,56 +8,7 @@
 #include "k3-am64-ddr.dtsi"
 
 #include "k3-am642-evm-u-boot.dtsi"
-
-/ {
-       aliases {
-               remoteproc0 = &sysctrler;
-               remoteproc1 = &a53_0;
-       };
-
-       a53_0: a53@0 {
-               compatible = "ti,am654-rproc";
-               reg = <0x00 0x00a90000 0x00 0x10>;
-               power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>,
-                               <&k3_pds 135 TI_SCI_PD_EXCLUSIVE>,
-                               <&k3_pds 137 TI_SCI_PD_EXCLUSIVE>;
-               resets = <&k3_reset 135 0>;
-               clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
-               clock-names = "gtc", "core";
-               assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
-               assigned-clock-parents = <&k3_clks 61 2>;
-               assigned-clock-rates = <200000000>, <1000000000>;
-               ti,sci = <&dmsc>;
-               ti,sci-proc-id = <32>;
-               ti,sci-host-id = <10>;
-               bootph-pre-ram;
-       };
-
-       clk_200mhz: dummy-clock-200mhz {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <200000000>;
-               bootph-pre-ram;
-       };
-};
-
-&cbass_main {
-       sysctrler: sysctrler {
-               compatible = "ti,am654-tisci-rproc-r5";
-               mboxes= <&secure_proxy_main 1>, <&secure_proxy_main 0>;
-               mbox-names = "tx", "rx";
-               bootph-pre-ram;
-       };
-};
-
-&dmsc {
-       mboxes= <&secure_proxy_main 0>,
-               <&secure_proxy_main 1>,
-               <&secure_proxy_main 0>;
-       mbox-names = "rx", "tx", "notify";
-       ti,host-id = <35>;
-       ti,secure-host;
-};
+#include "k3-am642-r5.dtsi"
 
 &memorycontroller {
        vtt-supply = <&vtt_supply>;
        clocks = <&clk_200mhz>;
        clock-names = "clk_xin";
 };
-
-/* UART is initialized before SYSFW is started
- * so we can't do any power-domain/clock operations.
- * Delete clock/power-domain properties to avoid
- * UART init failure
- */
-&main_uart0 {
-       /delete-property/ power-domains;
-       /delete-property/ clocks;
-       /delete-property/ clock-names;
-};
-
-/* timer init is called as part of rproc_start() while
- * starting System Firmware, so any clock/power-domain
- * operations will fail as SYSFW is not yet up and running.
- * Delete all clock/power-domain properties to avoid
- * timer init failure.
- * This is an always on timer at 20MHz.
- */
-&main_timer0 {
-       /delete-property/ clocks;
-       /delete-property/ assigned-clocks;
-       /delete-property/ assigned-clock-parents;
-       /delete-property/ power-domains;
-};
-
-&ospi0 {
-       reg = <0x00 0x0fc40000 0x00 0x100>,
-             <0x00 0x60000000 0x00 0x8000000>;
-};
index d27fc7fa882df51bec7be1f01ef8bab6fae783cb..4b7a63db4ce7448a4b8d162333716aeae024b10d 100644 (file)
 #include "k3-am64-ddr.dtsi"
 
 #include "k3-am642-phyboard-electra-rdk-u-boot.dtsi"
+#include "k3-am642-r5.dtsi"
 
 / {
        aliases {
                ethernet0 = &cpsw3g;
-               remoteproc0 = &sysctrler;
-               remoteproc1 = &a53_0;
        };
-
-       a53_0: a53@0 {
-               compatible = "ti,am654-rproc";
-               reg = <0x00 0x00a90000 0x00 0x10>;
-               power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>,
-                               <&k3_pds 135 TI_SCI_PD_EXCLUSIVE>,
-                               <&k3_pds 137 TI_SCI_PD_EXCLUSIVE>;
-               resets = <&k3_reset 135 0>;
-               clocks = <&k3_clks 61 0>;
-               assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
-               assigned-clock-parents = <&k3_clks 61 2>;
-               assigned-clock-rates = <200000000>, <1000000000>;
-               ti,sci = <&dmsc>;
-               ti,sci-proc-id = <32>;
-               ti,sci-host-id = <10>;
-               bootph-pre-ram;
-       };
-
-       clk_200mhz: dummy-clock-200mhz {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <200000000>;
-               bootph-pre-ram;
-       };
-};
-
-&cbass_main {
-       sysctrler: sysctrler {
-               compatible = "ti,am654-tisci-rproc-r5";
-               mboxes= <&secure_proxy_main 1>, <&secure_proxy_main 0>;
-               mbox-names = "tx", "rx";
-               bootph-pre-ram;
-       };
-};
-
-&dmsc {
-       mboxes= <&secure_proxy_main 0>,
-               <&secure_proxy_main 1>,
-               <&secure_proxy_main 0>;
-       mbox-names = "rx", "tx", "notify";
-       ti,host-id = <35>;
-       ti,secure-host;
-};
-
-/* timer init is called as part of rproc_start() while
- * starting System Firmware, so any clock/power-domain
- * operations will fail as SYSFW is not yet up and running.
- * Delete all clock/power-domain properties to avoid
- * timer init failure.
- * This is an always on timer at 20MHz.
- */
-&main_timer0 {
-       /delete-property/ clocks;
-       /delete-property/ assigned-clocks;
-       /delete-property/ assigned-clock-parents;
-       /delete-property/ power-domains;
-};
-
-/* UART is initialized before SYSFW is started
- * so we can't do any power-domain/clock operations.
- * Delete clock/power-domain properties to avoid
- * UART init failure
- */
-&main_uart0 {
-       /delete-property/ power-domains;
-       /delete-property/ clocks;
-       /delete-property/ clock-names;
 };
 
-&ospi0 {
-       reg = <0x00 0x0fc40000 0x00 0x100>,
-             <0x00 0x60000000 0x00 0x08000000>;
+&a53_0 {
+       clock-names = "gtc";
+       clocks = <&k3_clks 61 0>;
 };
index cfc548a1cea594abc020ccf1630ae478c4185fb8..27f3e87fb9000cf78fb409d7620ec003813ddec4 100644 (file)
@@ -8,56 +8,7 @@
 #include "k3-am64-ddr.dtsi"
 
 #include "k3-am642-sk-u-boot.dtsi"
-
-/ {
-       aliases {
-               remoteproc0 = &sysctrler;
-               remoteproc1 = &a53_0;
-       };
-
-       a53_0: a53@0 {
-               compatible = "ti,am654-rproc";
-               reg = <0x00 0x00a90000 0x00 0x10>;
-               power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>,
-                               <&k3_pds 135 TI_SCI_PD_EXCLUSIVE>,
-                               <&k3_pds 137 TI_SCI_PD_EXCLUSIVE>;
-               resets = <&k3_reset 135 0>;
-               clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
-               clock-names = "gtc", "core";
-               assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
-               assigned-clock-parents = <&k3_clks 61 2>;
-               assigned-clock-rates = <200000000>, <1000000000>;
-               ti,sci = <&dmsc>;
-               ti,sci-proc-id = <32>;
-               ti,sci-host-id = <10>;
-               bootph-pre-ram;
-       };
-
-       clk_200mhz: dummy-clock-200mhz {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <200000000>;
-               bootph-pre-ram;
-       };
-};
-
-&cbass_main {
-       sysctrler: sysctrler {
-               compatible = "ti,am654-tisci-rproc-r5";
-               mboxes= <&secure_proxy_main 1>, <&secure_proxy_main 0>;
-               mbox-names = "tx", "rx";
-               bootph-pre-ram;
-       };
-};
-
-&dmsc {
-       mboxes= <&secure_proxy_main 0>,
-               <&secure_proxy_main 1>,
-               <&secure_proxy_main 0>;
-       mbox-names = "rx", "tx", "notify";
-       ti,host-id = <35>;
-       ti,secure-host;
-};
+#include "k3-am642-r5.dtsi"
 
 &sdhci1 {
        clocks = <&clk_200mhz>;
 &serdes_wiz0 {
        status = "okay";
 };
-
-/* UART is initialized before SYSFW is started
- * so we can't do any power-domain/clock operations.
- * Delete clock/power-domain properties to avoid
- * UART init failure
- */
-&main_uart0 {
-       /delete-property/ power-domains;
-       /delete-property/ clocks;
-       /delete-property/ clock-names;
-};
-
-/* timer init is called as part of rproc_start() while
- * starting System Firmware, so any clock/power-domain
- * operations will fail as SYSFW is not yet up and running.
- * Delete all clock/power-domain properties to avoid
- * timer init failure.
- * This is an always on timer at 20MHz.
- */
-&main_timer0 {
-       /delete-property/ clocks;
-       /delete-property/ assigned-clocks;
-       /delete-property/ assigned-clock-parents;
-       /delete-property/ power-domains;
-};
-
-&ospi0 {
-       reg = <0x00 0x0fc40000 0x00 0x100>,
-             <0x00 0x60000000 0x00 0x8000000>;
-};
diff --git a/arch/arm/dts/k3-am642-r5.dtsi b/arch/arm/dts/k3-am642-r5.dtsi
new file mode 100644 (file)
index 0000000..71e1f9d
--- /dev/null
@@ -0,0 +1,84 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2026 Texas Instruments Incorporated - https://www.ti.com/
+ */
+
+/ {
+       aliases {
+               remoteproc0 = &sysctrler;
+               remoteproc1 = &a53_0;
+       };
+
+       a53_0: a53@0 {
+               compatible = "ti,am654-rproc";
+               reg = <0x00 0x00a90000 0x00 0x10>;
+               power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>,
+                               <&k3_pds 135 TI_SCI_PD_EXCLUSIVE>,
+                               <&k3_pds 137 TI_SCI_PD_EXCLUSIVE>;
+               resets = <&k3_reset 135 0>;
+               clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
+               clock-names = "gtc", "core";
+               assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
+               assigned-clock-parents = <&k3_clks 61 2>;
+               assigned-clock-rates = <200000000>, <1000000000>;
+               ti,sci = <&dmsc>;
+               ti,sci-proc-id = <32>;
+               ti,sci-host-id = <10>;
+               bootph-pre-ram;
+       };
+
+       clk_200mhz: dummy-clock-200mhz {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <200000000>;
+               bootph-pre-ram;
+       };
+};
+
+&cbass_main {
+       sysctrler: sysctrler {
+               compatible = "ti,am654-tisci-rproc-r5";
+               mboxes= <&secure_proxy_main 1>, <&secure_proxy_main 0>;
+               mbox-names = "tx", "rx";
+               bootph-pre-ram;
+       };
+};
+
+&dmsc {
+       mboxes= <&secure_proxy_main 0>,
+               <&secure_proxy_main 1>,
+               <&secure_proxy_main 0>;
+       mbox-names = "rx", "tx", "notify";
+       ti,host-id = <35>;
+       ti,secure-host;
+};
+
+/* UART is initialized before SYSFW is started
+ * so we can't do any power-domain/clock operations.
+ * Delete clock/power-domain properties to avoid
+ * UART init failure
+ */
+&main_uart0 {
+       /delete-property/ power-domains;
+       /delete-property/ clocks;
+       /delete-property/ clock-names;
+};
+
+/* timer init is called as part of rproc_start() while
+ * starting System Firmware, so any clock/power-domain
+ * operations will fail as SYSFW is not yet up and running.
+ * Delete all clock/power-domain properties to avoid
+ * timer init failure.
+ * This is an always on timer at 20MHz.
+ */
+&main_timer0 {
+       /delete-property/ clocks;
+       /delete-property/ assigned-clocks;
+       /delete-property/ assigned-clock-parents;
+       /delete-property/ power-domains;
+};
+
+&ospi0 {
+       reg = <0x00 0x0fc40000 0x00 0x100>,
+             <0x00 0x60000000 0x00 0x8000000>;
+};
index 99eb8a2d442cc22c0d837ab46ebcf3ed4f03a480..30eb3a9ade9d5add003f21946f5accbd2ec4cc63 100644 (file)
@@ -9,74 +9,7 @@
 #include "k3-am654-base-board-u-boot.dtsi"
 #include "k3-am654-base-board-ddr4-1600MTs.dtsi"
 #include "k3-am654-ddr.dtsi"
-
-/ {
-       aliases {
-               remoteproc0 = &sysctrler;
-               remoteproc1 = &a53_0;
-       };
-
-       a53_0: a53@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 202 0>;
-               assigned-clock-rates = <800000000>;
-               ti,sci = <&dmsc>;
-               ti,sci-proc-id = <32>;
-               ti,sci-host-id = <10>;
-               bootph-pre-ram;
-       };
-
-       clk_200mhz: dummy_clock {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <200000000>;
-               bootph-pre-ram;
-       };
-};
-
-&secure_proxy_mcu {
-       status = "okay";
-       bootph-pre-ram;
-};
-
-&cbass_wakeup {
-       sysctrler: sysctrler {
-               compatible = "ti,am654-tisci-rproc-r5";
-               mboxes= <&secure_proxy_mcu 4>, <&secure_proxy_mcu 5>;
-               mbox-names = "tx", "rx";
-               bootph-pre-ram;
-       };
-};
-
-/*
- * timer init is called as part of rproc_start() while
- * starting System Firmware, so any clock/power-domain
- * operations will fail as SYSFW is not yet up and running.
- * Delete all clock/power-domain properties to avoid
- * timer init failure.
- * This is an always on timer at 20MHz.
- */
-&mcu_timer0 {
-       /delete-property/ clocks;
-       /delete-property/ assigned-clocks;
-       /delete-property/ assigned-clock-parents;
-       /delete-property/ power-domains;
-};
-
-&dmsc {
-       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;
-};
+#include "k3-am654-r5.dtsi"
 
 &wkup_uart0 {
        status = "okay";
        /delete-property/ power-domains;
 };
 
-&ospi0 {
-       reg = <0x0 0x47040000 0x0 0x100>,
-             <0x0 0x50000000 0x0 0x8000000>;
-};
-
 &dwc3_0 {
        status = "okay";
        /delete-property/ clocks;
diff --git a/arch/arm/dts/k3-am654-r5.dtsi b/arch/arm/dts/k3-am654-r5.dtsi
new file mode 100644 (file)
index 0000000..1762c14
--- /dev/null
@@ -0,0 +1,77 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2026 Texas Instruments Incorporated - https://www.ti.com/
+ */
+
+/ {
+       aliases {
+               remoteproc0 = &sysctrler;
+               remoteproc1 = &a53_0;
+       };
+
+       a53_0: a53@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 202 0>;
+               assigned-clock-rates = <800000000>;
+               ti,sci = <&dmsc>;
+               ti,sci-proc-id = <32>;
+               ti,sci-host-id = <10>;
+               bootph-pre-ram;
+       };
+
+       clk_200mhz: dummy_clock {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <200000000>;
+               bootph-pre-ram;
+       };
+};
+
+&secure_proxy_mcu {
+       status = "okay";
+       bootph-pre-ram;
+};
+
+&cbass_wakeup {
+       sysctrler: sysctrler {
+               compatible = "ti,am654-tisci-rproc-r5";
+               mboxes= <&secure_proxy_mcu 4>, <&secure_proxy_mcu 5>;
+               mbox-names = "tx", "rx";
+               bootph-pre-ram;
+       };
+};
+
+&dmsc {
+       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;
+};
+
+&ospi0 {
+       reg = <0x0 0x47040000 0x0 0x100>,
+             <0x0 0x50000000 0x0 0x8000000>;
+};
+
+/*
+ * timer init is called as part of rproc_start() while
+ * starting System Firmware, so any clock/power-domain
+ * operations will fail as SYSFW is not yet up and running.
+ * Delete all clock/power-domain properties to avoid
+ * timer init failure.
+ * This is an always on timer at 20MHz.
+ */
+&mcu_timer0 {
+       /delete-property/ clocks;
+       /delete-property/ assigned-clocks;
+       /delete-property/ assigned-clock-parents;
+       /delete-property/ power-domains;
+};
index 45d104e8e3f4a5cb90fe1ad4c4d11b11cf99640b..61ee75b743236be235cec9ab013fdca0c7edda22 100644 (file)
 
 #include "k3-am67a-beagley-ddr-lp4.dtsi"
 #include "k3-am62a-ddr.dtsi"
-
-/ {
-       aliases {
-               remoteproc0 = &sysctrler;
-               remoteproc1 = &a53_0;
-               serial0 = &wkup_uart0;
-               serial2 = &main_uart0;
-       };
-
-       a53_0: a53@0 {
-               compatible = "ti,am654-rproc";
-               reg = <0x00 0x00a90000 0x00 0x10>;
-               power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>,
-                       <&k3_pds 135 TI_SCI_PD_EXCLUSIVE>,
-                       <&k3_pds 166 TI_SCI_PD_EXCLUSIVE>;
-               resets = <&k3_reset 135 0>;
-               clocks = <&k3_clks 61 0>;
-               assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
-               assigned-clock-parents = <&k3_clks 61 2>;
-               assigned-clock-rates = <200000000>, <1200000000>;
-               ti,sci = <&dmsc>;
-               ti,sci-proc-id = <32>;
-               ti,sci-host-id = <10>;
-               bootph-all;
-       };
-
-       dm_tifs: dm-tifs {
-               compatible = "ti,j721e-dm-sci";
-               ti,host-id = <36>;
-               ti,secure-host;
-               mbox-names = "rx", "tx";
-               mboxes= <&secure_proxy_main 22>,
-                       <&secure_proxy_main 23>;
-               bootph-all;
-       };
-};
-
-&dmsc {
-       mboxes= <&secure_proxy_main 0>,
-               <&secure_proxy_main 1>,
-               <&secure_proxy_main 0>;
-       mbox-names = "rx", "tx", "notify";
-       ti,host-id = <35>;
-       ti,secure-host;
-};
-
-&cbass_main {
-       sa3_secproxy: secproxy@44880000 {
-               compatible = "ti,am654-secure-proxy";
-               #mbox-cells = <1>;
-               reg = <0x00 0x44880000 0x00 0x20000>,
-                     <0x00 0x44860000 0x00 0x20000>,
-                     <0x00 0x43600000 0x00 0x10000>;
-               reg-names = "rt", "scfg", "target_data";
-               bootph-all;
-       };
-
-       sysctrler: sysctrler {
-               compatible = "ti,am654-tisci-rproc-r5";
-               mboxes= <&secure_proxy_main 1>,
-                       <&secure_proxy_main 0>,
-                       <&sa3_secproxy 0>;
-               mbox-names = "tx", "rx", "boot_notify";
-               bootph-all;
-       };
-};
+#include "k3-am67a-r5.dtsi"
 
 /* WKUP UART0 is used for DM firmware logs */
 &wkup_uart0 {
diff --git a/arch/arm/dts/k3-am67a-r5.dtsi b/arch/arm/dts/k3-am67a-r5.dtsi
new file mode 100644 (file)
index 0000000..48bd15f
--- /dev/null
@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2026 Texas Instruments Incorporated - https://www.ti.com/
+ */
+
+/ {
+       aliases {
+               remoteproc0 = &sysctrler;
+               remoteproc1 = &a53_0;
+               serial0 = &wkup_uart0;
+               serial2 = &main_uart0;
+       };
+
+       a53_0: a53@0 {
+               compatible = "ti,am654-rproc";
+               reg = <0x00 0x00a90000 0x00 0x10>;
+               power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>,
+                       <&k3_pds 135 TI_SCI_PD_EXCLUSIVE>,
+                       <&k3_pds 166 TI_SCI_PD_EXCLUSIVE>;
+               resets = <&k3_reset 135 0>;
+               clocks = <&k3_clks 61 0>;
+               assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
+               assigned-clock-parents = <&k3_clks 61 2>;
+               assigned-clock-rates = <200000000>, <1200000000>;
+               ti,sci = <&dmsc>;
+               ti,sci-proc-id = <32>;
+               ti,sci-host-id = <10>;
+               bootph-all;
+       };
+
+       dm_tifs: dm-tifs {
+               compatible = "ti,j721e-dm-sci";
+               ti,host-id = <36>;
+               ti,secure-host;
+               mbox-names = "rx", "tx";
+               mboxes= <&secure_proxy_main 22>,
+                       <&secure_proxy_main 23>;
+               bootph-all;
+       };
+};
+
+&dmsc {
+       mboxes= <&secure_proxy_main 0>,
+               <&secure_proxy_main 1>,
+               <&secure_proxy_main 0>;
+       mbox-names = "rx", "tx", "notify";
+       ti,host-id = <35>;
+       ti,secure-host;
+};
+
+&cbass_main {
+       sa3_secproxy: secproxy@44880000 {
+               compatible = "ti,am654-secure-proxy";
+               #mbox-cells = <1>;
+               reg = <0x00 0x44880000 0x00 0x20000>,
+                     <0x00 0x44860000 0x00 0x20000>,
+                     <0x00 0x43600000 0x00 0x10000>;
+               reg-names = "rt", "scfg", "target_data";
+               bootph-all;
+       };
+
+       sysctrler: sysctrler {
+               compatible = "ti,am654-tisci-rproc-r5";
+               mboxes= <&secure_proxy_main 1>,
+                       <&secure_proxy_main 0>,
+                       <&sa3_secproxy 0>;
+               mbox-names = "tx", "rx", "boot_notify";
+               bootph-all;
+       };
+};
index e35b767a7e3ac82251a46282fb284030411008ce..b0e73fe72c477cf30914a12a4d3398ad25982c50 100644 (file)
@@ -9,92 +9,12 @@
 #include "k3-j7200-ddr-evm-lp4-2666.dtsi"
 #include "k3-j721e-ddr.dtsi"
 #include "k3-j7200-common-proc-board-u-boot.dtsi"
-
-/ {
-       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>,
-                               <&k3_pds 4 TI_SCI_PD_EXCLUSIVE>;
-               resets = <&k3_reset 202 0>;
-               clocks = <&k3_clks 61 1>, <&k3_clks 202 2>, <&k3_clks 4 1> ;
-               clock-names = "gtc", "core", "msmc";
-               assigned-clocks = <&k3_clks 202 2>, <&k3_clks 61 1>, <&k3_clks 4 1>,
-                                                 <&k3_clks 323 0>;
-               assigned-clock-parents= <0>, <0>, <0>, <&k3_clks 323 2>;
-               assigned-clock-rates = <2000000000>, <200000000>, <1000000000>;
-               ti,sci = <&dmsc>;
-               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;
-       };
-};
-
-&memorycontroller {
-       power-domains = <&k3_pds 8 TI_SCI_PD_SHARED>,
-                       <&k3_pds 90 TI_SCI_PD_SHARED>;
-       clocks = <&k3_clks 8 5>, <&k3_clks 30 9>;
-       bootph-pre-ram;
-};
-
-&mcu_timer0 {
-       /delete-property/ clocks;
-       /delete-property/ clocks-names;
-       /delete-property/ assigned-clocks;
-       /delete-property/ assigned-clock-parents;
-       clock-frequency = <250000000>;
-       bootph-pre-ram;
-};
-
-&secure_proxy_mcu {
-       bootph-pre-ram;
-       status = "okay";
-};
-
-&cbass_mcu_wakeup {
-       sysctrler: sysctrler {
-               compatible = "ti,am654-tisci-rproc-r5";
-               mboxes= <&secure_proxy_mcu 4>,
-                       <&secure_proxy_mcu 5>;
-               mbox-names = "tx", "rx";
-               bootph-pre-ram;
-       };
-};
-
-&dmsc {
-       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;
-};
+#include "k3-j7200-r5.dtsi"
 
 &wkup_vtm0 {
        bootph-pre-ram;
 };
 
-&ospi0 {
-    reg = <0x0 0x47040000 0x0 0x100>,
-          <0x0 0x50000000 0x0 0x8000000>;
-};
-
 &fss {
        /* enable ranges missing from the FSS node */
        ranges = <0x0 0x47000000 0x0 0x47000000 0x0 0x00068400>,
diff --git a/arch/arm/dts/k3-j7200-r5.dtsi b/arch/arm/dts/k3-j7200-r5.dtsi
new file mode 100644 (file)
index 0000000..6c61ba5
--- /dev/null
@@ -0,0 +1,86 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2026 Texas Instruments Incorporated - https://www.ti.com/
+ */
+
+/ {
+       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>,
+                               <&k3_pds 4 TI_SCI_PD_EXCLUSIVE>;
+               resets = <&k3_reset 202 0>;
+               clocks = <&k3_clks 61 1>, <&k3_clks 202 2>, <&k3_clks 4 1> ;
+               clock-names = "gtc", "core", "msmc";
+               assigned-clocks = <&k3_clks 202 2>, <&k3_clks 61 1>, <&k3_clks 4 1>,
+                                                 <&k3_clks 323 0>;
+               assigned-clock-parents= <0>, <0>, <0>, <&k3_clks 323 2>;
+               assigned-clock-rates = <2000000000>, <200000000>, <1000000000>;
+               ti,sci = <&dmsc>;
+               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;
+       };
+};
+
+&memorycontroller {
+       power-domains = <&k3_pds 8 TI_SCI_PD_SHARED>,
+                       <&k3_pds 90 TI_SCI_PD_SHARED>;
+       clocks = <&k3_clks 8 5>, <&k3_clks 30 9>;
+       bootph-pre-ram;
+};
+
+&mcu_timer0 {
+       /delete-property/ clocks;
+       /delete-property/ clocks-names;
+       /delete-property/ assigned-clocks;
+       /delete-property/ assigned-clock-parents;
+       clock-frequency = <250000000>;
+       bootph-pre-ram;
+};
+
+&secure_proxy_mcu {
+       bootph-pre-ram;
+       status = "okay";
+};
+
+&cbass_mcu_wakeup {
+       sysctrler: sysctrler {
+               compatible = "ti,am654-tisci-rproc-r5";
+               mboxes= <&secure_proxy_mcu 4>,
+                       <&secure_proxy_mcu 5>;
+               mbox-names = "tx", "rx";
+               bootph-pre-ram;
+       };
+};
+
+&dmsc {
+       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;
+};
+
+&ospi0 {
+       reg = <0x0 0x47040000 0x0 0x100>,
+             <0x0 0x50000000 0x0 0x8000000>;
+};
+
index 02a3494a877d5e19b193ffb9affc1ac7ad05bf55..e1ef5d181ed778025c099170c53d4f10d2fb7b8e 100644 (file)
@@ -9,92 +9,13 @@
 
 #include "k3-j722s-ddr-lp4-50-4000.dtsi"
 #include "k3-am62a-ddr.dtsi"
-
-/ {
-       aliases {
-               remoteproc0 = &sysctrler;
-               remoteproc1 = &a53_0;
-               serial0 = &wkup_uart0;
-               serial2 = &main_uart0;
-       };
-
-       a53_0: a53@0 {
-               compatible = "ti,am654-rproc";
-               reg = <0x00 0x00a90000 0x00 0x10>;
-               power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>,
-                       <&k3_pds 135 TI_SCI_PD_EXCLUSIVE>,
-                       <&k3_pds 166 TI_SCI_PD_EXCLUSIVE>;
-               resets = <&k3_reset 135 0>;
-               clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
-               clock-names = "gtc", "core";
-               assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
-               assigned-clock-parents = <&k3_clks 61 2>;
-               assigned-clock-rates = <200000000>, <1400000000>;
-               ti,sci = <&dmsc>;
-               ti,sci-proc-id = <32>;
-               ti,sci-host-id = <10>;
-               bootph-all;
-       };
-
-       dm_tifs: dm-tifs {
-               compatible = "ti,j721e-dm-sci";
-               ti,host-id = <36>;
-               ti,secure-host;
-               mbox-names = "rx", "tx";
-               mboxes= <&secure_proxy_main 28>,
-                       <&secure_proxy_main 29>;
-               bootph-all;
-       };
-};
-
-&dmsc {
-       mboxes= <&secure_proxy_main 0>,
-               <&secure_proxy_main 1>,
-               <&secure_proxy_main 0>;
-       mbox-names = "rx", "tx", "notify";
-       ti,host-id = <35>;
-       ti,secure-host;
-};
-
-&cbass_main {
-       sa3_secproxy: secproxy@44880000 {
-               compatible = "ti,am654-secure-proxy";
-               #mbox-cells = <1>;
-               reg = <0x00 0x44880000 0x00 0x20000>,
-                     <0x00 0x44860000 0x00 0x20000>,
-                     <0x00 0x43600000 0x00 0x10000>;
-               reg-names = "rt", "scfg", "target_data";
-               bootph-all;
-       };
-
-       sysctrler: sysctrler {
-               compatible = "ti,am654-tisci-rproc-r5";
-               mboxes= <&secure_proxy_main 1>,
-                       <&secure_proxy_main 0>,
-                       <&sa3_secproxy 0>;
-               mbox-names = "tx", "rx", "boot_notify";
-               bootph-all;
-       };
-};
-
-&main_timer0 {
-       /delete-property/ clocks;
-       /delete-property/ clocks-names;
-       /delete-property/ assigned-clocks;
-       /delete-property/ assigned-clock-parents;
-       clock-frequency = <25000000>;
-};
+#include "k3-j722s-r5.dtsi"
 
 /* WKUP UART0 is used for DM firmware logs */
 &wkup_uart0 {
        status = "okay";
 };
 
-&ospi0 {
-       reg = <0x00 0x0fc40000 0x00 0x100>,
-             <0x00 0x60000000 0x00 0x08000000>;
-};
-
 &main_bcdma {
        ti,sci = <&dm_tifs>;
 };
diff --git a/arch/arm/dts/k3-j722s-r5.dtsi b/arch/arm/dts/k3-j722s-r5.dtsi
new file mode 100644 (file)
index 0000000..06a63fb
--- /dev/null
@@ -0,0 +1,84 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2026 Texas Instruments Incorporated - https://www.ti.com/
+ */
+
+/ {
+       aliases {
+               remoteproc0 = &sysctrler;
+               remoteproc1 = &a53_0;
+               serial0 = &wkup_uart0;
+               serial2 = &main_uart0;
+       };
+
+       a53_0: a53@0 {
+               compatible = "ti,am654-rproc";
+               reg = <0x00 0x00a90000 0x00 0x10>;
+               power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>,
+                       <&k3_pds 135 TI_SCI_PD_EXCLUSIVE>,
+                       <&k3_pds 166 TI_SCI_PD_EXCLUSIVE>;
+               resets = <&k3_reset 135 0>;
+               clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
+               clock-names = "gtc", "core";
+               assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>;
+               assigned-clock-parents = <&k3_clks 61 2>;
+               assigned-clock-rates = <200000000>, <1400000000>;
+               ti,sci = <&dmsc>;
+               ti,sci-proc-id = <32>;
+               ti,sci-host-id = <10>;
+               bootph-all;
+       };
+
+       dm_tifs: dm-tifs {
+               compatible = "ti,j721e-dm-sci";
+               ti,host-id = <36>;
+               ti,secure-host;
+               mbox-names = "rx", "tx";
+               mboxes= <&secure_proxy_main 28>,
+                       <&secure_proxy_main 29>;
+               bootph-all;
+       };
+};
+
+&dmsc {
+       mboxes= <&secure_proxy_main 0>,
+               <&secure_proxy_main 1>,
+               <&secure_proxy_main 0>;
+       mbox-names = "rx", "tx", "notify";
+       ti,host-id = <35>;
+       ti,secure-host;
+};
+
+&cbass_main {
+       sa3_secproxy: secproxy@44880000 {
+               compatible = "ti,am654-secure-proxy";
+               #mbox-cells = <1>;
+               reg = <0x00 0x44880000 0x00 0x20000>,
+                     <0x00 0x44860000 0x00 0x20000>,
+                     <0x00 0x43600000 0x00 0x10000>;
+               reg-names = "rt", "scfg", "target_data";
+               bootph-all;
+       };
+
+       sysctrler: sysctrler {
+               compatible = "ti,am654-tisci-rproc-r5";
+               mboxes= <&secure_proxy_main 1>,
+                       <&secure_proxy_main 0>,
+                       <&sa3_secproxy 0>;
+               mbox-names = "tx", "rx", "boot_notify";
+               bootph-all;
+       };
+};
+
+&main_timer0 {
+       /delete-property/ clocks;
+       /delete-property/ clocks-names;
+       /delete-property/ assigned-clocks;
+       /delete-property/ assigned-clock-parents;
+       clock-frequency = <25000000>;
+};
+
+&ospi0 {
+       reg = <0x00 0x0fc40000 0x00 0x100>,
+             <0x00 0x60000000 0x00 0x08000000>;
+};