Skip to contentSkip to conversation

remoteproc: k3: update compatible for am654 syscon

PATCH In review Anshul Dalal 2 participants 5 messages Aug 14, 2025 – Aug 25, 2025

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 remoteproc: k3: update compatible for am654 syscon

The existing compatible name for U-Boot's k3 system controller driver i.e "ti,am625-system-controller" has been added to linux[1] device-tree. This compatible in kernel is meant for configuring the Control Module registers (CTRL_MMR0).

However in U-Boot, the matching driver was being used to load the system firmware on the secure M-cores by the R5 SPL and therefore must be updated to a different compatible to avoid conflicts.

Therefore, this patch renames all references of the compatible to "ti,am654-tisci-rproc-r5". The "-r5" is appended so as to avoid any future conflicts since r5 specific compatibles should only be useful for U-Boot.

[1]: 5959618631fe ("dt-bindings: mfd: ti,j721e-system-controller: Add compatible string for AM654")

     https://lore.kernel.org/r/[email protected]
---
 arch/arm/dts/k3-am62-r5-lp-sk.dts                            | 2 +-
 arch/arm/dts/k3-am625-r5-beagleplay.dts                      | 2 +-
 arch/arm/dts/k3-am625-r5-phycore-som-2gb.dts                 | 2 +-
 arch/arm/dts/k3-am625-r5-sk.dts                              | 2 +-
 arch/arm/dts/k3-am625-verdin-r5.dts                          | 2 +-
 arch/arm/dts/k3-am62a7-r5-phycore-som-2gb.dts                | 2 +-
 arch/arm/dts/k3-am62a7-r5-sk.dts                             | 2 +-
 arch/arm/dts/k3-am62p5-r5-sk.dts                             | 2 +-
 arch/arm/dts/k3-am62p5-verdin-r5.dts                         | 2 +-
 arch/arm/dts/k3-am642-r5-evm.dts                             | 2 +-
 arch/arm/dts/k3-am642-r5-phycore-som-2gb.dts                 | 2 +-
 arch/arm/dts/k3-am642-r5-sk.dts                              | 2 +-
 arch/arm/dts/k3-am654-r5-base-board.dts                      | 2 +-
 arch/arm/dts/k3-am67a-r5-beagley-ai.dts                      | 2 +-
 arch/arm/dts/k3-j7200-r5-common-proc-board.dts               | 2 +-
 arch/arm/dts/k3-j721e-r5.dtsi                                | 2 +-
 arch/arm/dts/k3-j721s2-r5.dtsi                               | 2 +-
 arch/arm/dts/k3-j722s-r5-evm.dts                             | 2 +-
 arch/arm/dts/k3-j784s4-r5.dtsi                               | 2 +-
 doc/device-tree-bindings/power/ti,sci-pm-domain.txt          | 2 +-
 doc/device-tree-bindings/remoteproc/k3-system-controller.txt | 4 ++--
 doc/device-tree-bindings/reset/ti,sci-reset.txt              | 2 +-
 drivers/remoteproc/k3_system_controller.c                    | 2 +-
 23 files changed, 24 insertions(+), 24 deletions(-)
arch/arm/dts/k3-am62-r5-lp-sk.dts +1 -1
index 135e8d49b91..95cd9b707c7 100644
@@ -64,7 +64,7 @@
 
 &cbass_main {
 	sysctrler: sysctrler {
-		compatible = "ti,am654-system-controller";
+		compatible = "ti,am654-tisci-rproc-r5";
 		mboxes= <&secure_proxy_main 1>,
 			<&secure_proxy_main 0>,
 			<&secure_proxy_sa3 0>;
arch/arm/dts/k3-am625-r5-beagleplay.dts +1 -1
index f4b2cd8904e..bba69871fd2 100644
@@ -70,7 +70,7 @@
 
 &cbass_main {
 	sysctrler: sysctrler {
-		compatible = "ti,am654-system-controller";
+		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;
arch/arm/dts/k3-am625-r5-phycore-som-2gb.dts +1 -1
index 7132fae36fa..03dc81a4afa 100644
@@ -69,7 +69,7 @@
 
 &cbass_main {
 	sysctrler: sysctrler {
-		compatible = "ti,am654-system-controller";
+		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;
arch/arm/dts/k3-am625-r5-sk.dts +1 -1
index 34c501dd51b..67589f941ba 100644
@@ -64,7 +64,7 @@
 
 &cbass_main {
 	sysctrler: sysctrler {
-		compatible = "ti,am654-system-controller";
+		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;
arch/arm/dts/k3-am625-verdin-r5.dts +1 -1
index 39e8ab8158e..fb431c96337 100644
@@ -53,7 +53,7 @@
 
 &cbass_main {
 	sysctrler: sysctrler {
-		compatible = "ti,am654-system-controller";
+		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;
arch/arm/dts/k3-am62a7-r5-phycore-som-2gb.dts +1 -1
index 63b7864a469..96860e80e9a 100644
@@ -70,7 +70,7 @@
 	};
 
 	sysctrler: sysctrler {
-		compatible = "ti,am654-system-controller";
+		compatible = "ti,am654-tisci-rproc-r5";
 		mboxes= <&secure_proxy_main 1>,
 			<&secure_proxy_main 0>,
 			<&sa3_secproxy 0>;
arch/arm/dts/k3-am62a7-r5-sk.dts +1 -1
index 49e62533a95..64923c2c710 100644
@@ -63,7 +63,7 @@
 
 &cbass_main {
 	sysctrler: sysctrler {
-		compatible = "ti,am654-system-controller";
+		compatible = "ti,am654-tisci-rproc-r5";
 		mboxes= <&secure_proxy_main 1>,
 			<&secure_proxy_main 0>,
 			<&secure_proxy_sa3 0>;
arch/arm/dts/k3-am62p5-r5-sk.dts +1 -1
index b18b4ce1272..e45d2bf6a0b 100644
@@ -69,7 +69,7 @@
 	};
 
 	sysctrler: sysctrler {
-		compatible = "ti,am654-system-controller";
+		compatible = "ti,am654-tisci-rproc-r5";
 		mboxes= <&secure_proxy_main 1>,
 			<&secure_proxy_main 0>,
 			<&sa3_secproxy 0>;
arch/arm/dts/k3-am62p5-verdin-r5.dts +1 -1
index 983a3bfe670..17739086935 100644
@@ -57,7 +57,7 @@
 	};
 
 	sysctrler: sysctrler {
-		compatible = "ti,am654-system-controller";
+		compatible = "ti,am654-tisci-rproc-r5";
 		mboxes= <&secure_proxy_main 1>,
 			<&secure_proxy_main 0>,
 			<&sa3_secproxy 0>;
arch/arm/dts/k3-am642-r5-evm.dts +1 -1
index 933f75095b1..67b8587d3b2 100644
@@ -43,7 +43,7 @@
 
 &cbass_main {
 	sysctrler: sysctrler {
-		compatible = "ti,am654-system-controller";
+		compatible = "ti,am654-tisci-rproc-r5";
 		mboxes= <&secure_proxy_main 1>, <&secure_proxy_main 0>;
 		mbox-names = "tx", "rx";
 		bootph-pre-ram;
arch/arm/dts/k3-am642-r5-phycore-som-2gb.dts +1 -1
index 40c25d5dbb6..32a10b24327 100644
@@ -63,7 +63,7 @@
 
 &cbass_main {
 	sysctrler: sysctrler {
-		compatible = "ti,am654-system-controller";
+		compatible = "ti,am654-tisci-rproc-r5";
 		mboxes= <&secure_proxy_main 1>, <&secure_proxy_main 0>;
 		mbox-names = "tx", "rx";
 		bootph-pre-ram;
arch/arm/dts/k3-am642-r5-sk.dts +1 -1
index 6e31dfd97c5..cfc548a1cea 100644
@@ -43,7 +43,7 @@
 
 &cbass_main {
 	sysctrler: sysctrler {
-		compatible = "ti,am654-system-controller";
+		compatible = "ti,am654-tisci-rproc-r5";
 		mboxes= <&secure_proxy_main 1>, <&secure_proxy_main 0>;
 		mbox-names = "tx", "rx";
 		bootph-pre-ram;
arch/arm/dts/k3-am654-r5-base-board.dts +1 -1
index ab5195eb15c..99eb8a2d442 100644
@@ -47,7 +47,7 @@
 
 &cbass_wakeup {
 	sysctrler: sysctrler {
-		compatible = "ti,am654-system-controller";
+		compatible = "ti,am654-tisci-rproc-r5";
 		mboxes= <&secure_proxy_mcu 4>, <&secure_proxy_mcu 5>;
 		mbox-names = "tx", "rx";
 		bootph-pre-ram;
arch/arm/dts/k3-am67a-r5-beagley-ai.dts +1 -1
index 664be358a97..45d104e8e3f 100644
@@ -69,7 +69,7 @@
 	};
 
 	sysctrler: sysctrler {
-		compatible = "ti,am654-system-controller";
+		compatible = "ti,am654-tisci-rproc-r5";
 		mboxes= <&secure_proxy_main 1>,
 			<&secure_proxy_main 0>,
 			<&sa3_secproxy 0>;
arch/arm/dts/k3-j7200-r5-common-proc-board.dts +1 -1
index 9ac29110324..e35b767a7e3 100644
@@ -69,7 +69,7 @@
 
 &cbass_mcu_wakeup {
 	sysctrler: sysctrler {
-		compatible = "ti,am654-system-controller";
+		compatible = "ti,am654-tisci-rproc-r5";
 		mboxes= <&secure_proxy_mcu 4>,
 			<&secure_proxy_mcu 5>;
 		mbox-names = "tx", "rx";
arch/arm/dts/k3-j721e-r5.dtsi +1 -1
index 786a41c5e90..7398f9b05ec 100644
@@ -66,7 +66,7 @@
 &cbass_mcu_wakeup {
 	sysctrler: sysctrler {
 		bootph-pre-ram;
-		compatible = "ti,am654-system-controller";
+		compatible = "ti,am654-tisci-rproc-r5";
 		mboxes= <&secure_proxy_mcu 4>, <&secure_proxy_mcu 5>;
 		mbox-names = "tx", "rx";
 	};
arch/arm/dts/k3-j721s2-r5.dtsi +1 -1
index a820f516015..c1c12e217d2 100644
@@ -63,7 +63,7 @@
 
 &cbass_mcu_wakeup {
 	sysctrler: sysctrler {
-		compatible = "ti,am654-system-controller";
+		compatible = "ti,am654-tisci-rproc-r5";
 		mboxes= <&secure_proxy_mcu 4>, <&secure_proxy_mcu 5>, <&secure_proxy_sa3 5>;
 		mbox-names = "tx", "rx", "boot_notify";
 		bootph-pre-ram;
arch/arm/dts/k3-j722s-r5-evm.dts +1 -1
index 286ab50d3da..02a3494a877 100644
@@ -68,7 +68,7 @@
 	};
 
 	sysctrler: sysctrler {
-		compatible = "ti,am654-system-controller";
+		compatible = "ti,am654-tisci-rproc-r5";
 		mboxes= <&secure_proxy_main 1>,
 			<&secure_proxy_main 0>,
 			<&sa3_secproxy 0>;
arch/arm/dts/k3-j784s4-r5.dtsi +1 -1
index a1394115b8b..78444dc4e14 100644
@@ -61,7 +61,7 @@
 
 &cbass_mcu_wakeup {
 	sysctrler: sysctrler {
-		compatible = "ti,am654-system-controller";
+		compatible = "ti,am654-tisci-rproc-r5";
 		mboxes= <&secure_proxy_mcu 4>,
 			<&secure_proxy_mcu 5>,
 			<&secure_proxy_sa3 5>;
doc/device-tree-bindings/power/ti,sci-pm-domain.txt +1 -1
index 72d9fbc833c..81f6314230f 100644
@@ -30,7 +30,7 @@ Required Properties:
 Example (AM65x):
 ----------------
 	sysfw: sysfw {
-		compatible = "ti,am654-system-controller";
+		compatible = "ti,am654-tisci-rproc-r5";
 		...
 		k3_pds: power-controller {
 			compatible = "ti,sci-pm-domain";
doc/device-tree-bindings/remoteproc/k3-system-controller.txt +2 -2
index 33dc46812ed..7de57ad4f00 100644
@@ -8,7 +8,7 @@ This driver communicates with ROM for loading this firmware.
 
 Required properties:
 --------------------
-- compatible:		Shall be: "ti,am654-system-controller"
+- compatible:		Shall be: "ti,am654-tisci-rproc-r5-r5"
 - mbox-names:		"tx" for Transfer channel
 			"rx" for Receive channel
 - mboxes:		Corresponding phandles to mailbox channels.
@@ -21,7 +21,7 @@ Example:
 --------
 
 system-controller: system-controller {
-	compatible = "ti,am654-system-controller";
+	compatible = "ti,am654-tisci-rproc-r5-r5";
 	mboxes= <&secproxy 4>, <&secproxy 5>;
 	mbox-names = "tx", "rx";
 };
doc/device-tree-bindings/reset/ti,sci-reset.txt +1 -1
index e7e2d13f9fb..740b2dfea64 100644
@@ -23,7 +23,7 @@ Required Properties:
 Example (AM65x):
 ----------------
 	sysfw: sysfw {
-		compatible = "ti,am654-system-controller";
+		compatible = "ti,am654-tisci-rproc-r5";
 		...
 		k3_reset: reset-controller {
 			compatible = "ti,sci-reset";
drivers/remoteproc/k3_system_controller.c +1 -1
index 71238a6058a..e59c010de7e 100644
@@ -327,7 +327,7 @@ static const struct k3_sysctrler_desc k3_sysctrler_am654_desc = {
 
 static const struct udevice_id k3_sysctrler_ids[] = {
 	{
-		.compatible = "ti,am654-system-controller",
+		.compatible = "ti,am654-tisci-rproc-r5",
 		.data = (ulong)&k3_sysctrler_am654_desc,
 	},
 	{}
Signature · 1 line
2.50.1
#1 lore raw
Quoted 32 lines · Anshul Dalal

The existing compatible name for U-Boot's k3 system controller driver i.e "ti,am625-system-controller" has been added to linux[1] device-tree. This compatible in kernel is meant for configuring the Control Module registers (CTRL_MMR0).

However in U-Boot, the matching driver was being used to load the system firmware on the secure M-cores by the R5 SPL and therefore must be updated to a different compatible to avoid conflicts.

Therefore, this patch renames all references of the compatible to "ti,am654-tisci-rproc-r5". The "-r5" is appended so as to avoid any future conflicts since r5 specific compatibles should only be useful for U-Boot.

[1]: 5959618631fe ("dt-bindings: mfd: ti,j721e-system-controller: Add compatible string for AM654")

     https://lore.kernel.org/r/[email protected]
---
 arch/arm/dts/k3-am62-r5-lp-sk.dts                            | 2 +-
 arch/arm/dts/k3-am625-r5-beagleplay.dts                      | 2 +-
 arch/arm/dts/k3-am625-r5-phycore-som-2gb.dts                 | 2 +-
 arch/arm/dts/k3-am625-r5-sk.dts                              | 2 +-
 arch/arm/dts/k3-am625-verdin-r5.dts                          | 2 +-
 arch/arm/dts/k3-am62a7-r5-phycore-som-2gb.dts                | 2 +-
 arch/arm/dts/k3-am62a7-r5-sk.dts                             | 2 +-
 arch/arm/dts/k3-am62p5-r5-sk.dts                             | 2 +-
 arch/arm/dts/k3-am62p5-verdin-r5.dts                         | 2 +-
 arch/arm/dts/k3-am642-r5-evm.dts                             | 2 +-
 arch/arm/dts/k3-am642-r5-phycore-som-2gb.dts                 | 2 +-
 arch/arm/dts/k3-am642-r5-sk.dts                              | 2 +-
 arch/arm/dts/k3-am654-r5-base-board.dts                      | 2 +-
 arch/arm/dts/k3-am67a-r5-beagley-ai.dts                      | 2 +-
Quoted 8 lines
 arch/arm/dts/k3-j7200-r5-common-proc-board.dts               | 2 +-
 arch/arm/dts/k3-j721e-r5.dtsi                                | 2 +-
 arch/arm/dts/k3-j721s2-r5.dtsi                               | 2 +-
 arch/arm/dts/k3-j722s-r5-evm.dts                             | 2 +-
 arch/arm/dts/k3-j784s4-r5.dtsi                               | 2 +-
 doc/device-tree-bindings/power/ti,sci-pm-domain.txt          | 2 +-
 doc/device-tree-bindings/remoteproc/k3-system-controller.txt | 4 ++--
 doc/device-tree-bindings/reset/ti,sci-reset.txt              | 2 +-

Lets get the r5 bindings upstream too, to avoid future problems. Yes, we'll need to take something like this patch prior to v6.17-dts I assume as well, but lets start fixing both problems please, thanks.

Signature · 1 line
Tom
#2 lore raw
In reply to Anshul Dalal
Quoted 10 lines · Anshul Dalal

The existing compatible name for U-Boot's k3 system controller driver i.e "ti,am625-system-controller" has been added to linux[1] device-tree. This compatible in kernel is meant for configuring the Control Module registers (CTRL_MMR0).

However in U-Boot, the matching driver was being used to load the system firmware on the secure M-cores by the R5 SPL and therefore must be updated to a different compatible to avoid conflicts.

[...]

Applied to u-boot/next, thanks!

[1/1] remoteproc: k3: update compatible for am654 syscon

      commit: 2792cbf5d281b519692c546849638b2141046a4e
Signature · 1 line
Tom
#3 lore raw

Hi Tom,

CC+: Nishanth

Quoted 11 lines · Tom Rini
Quoted 9 lines · Anshul Dalal

The existing compatible name for U-Boot's k3 system controller driver i.e "ti,am625-system-controller" has been added to linux[1] device-tree. This compatible in kernel is meant for configuring the Control Module registers (CTRL_MMR0).

However in U-Boot, the matching driver was being used to load the system firmware on the secure M-cores by the R5 SPL and therefore must be updated to a different compatible to avoid conflicts.

Quoted 6 lines
Quoted 1 line

[...]

Applied to u-boot/next, thanks!

[1/1] remoteproc: k3: update compatible for am654 syscon

      commit: 2792cbf5d281b519692c546849638b2141046a4e

Actually the patch was meant for master since upstream u-boot's broken for AM65 right now. Could you merge it to master as well?

As for upstreaming the new compatible, it might not get accepted since it represents the same hardware block as the existing "ti,k2g-sci" but before tifs has been loaded to it.

Down the line I'll see if we can merge the two nodes or the drivers so we won't need this new compatible to begin with.

Regards,
Anshul

#4 lore raw
In reply to Anshul Dalal
Quoted 10 lines · Anshul Dalal

The existing compatible name for U-Boot's k3 system controller driver i.e "ti,am625-system-controller" has been added to linux[1] device-tree. This compatible in kernel is meant for configuring the Control Module registers (CTRL_MMR0).

However in U-Boot, the matching driver was being used to load the system firmware on the secure M-cores by the R5 SPL and therefore must be updated to a different compatible to avoid conflicts.

[...]

Applied to u-boot/master, thanks!

[1/1] remoteproc: k3: update compatible for am654 syscon

      commit: bd5036ddf2f3d9198f4054fc1a807c8f8960b281
Signature · 1 line
Tom