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/20250421214620.3770172-2-afd@ti.com

Signed-off-by: Anshul Dalal <anshuld@ti.com>

diff --git a/arch/arm/dts/k3-am62-r5-lp-sk.dts b/arch/arm/dts/k3-am62-r5-lp-sk.dts
index 135e8d4..95cd9b7 100644 (file)
--- a/arch/arm/dts/k3-am62-r5-lp-sk.dts
+++ b/arch/arm/dts/k3-am62-r5-lp-sk.dts
@@ -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>;

diff --git a/arch/arm/dts/k3-am625-r5-beagleplay.dts b/arch/arm/dts/k3-am625-r5-beagleplay.dts
index f4b2cd8..bba6987 100644 (file)
--- a/arch/arm/dts/k3-am625-r5-beagleplay.dts
+++ b/arch/arm/dts/k3-am625-r5-beagleplay.dts
@@ -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;

diff --git a/arch/arm/dts/k3-am625-r5-phycore-som-2gb.dts b/arch/arm/dts/k3-am625-r5-phycore-som-2gb.dts
index 7132fae..03dc81a 100644 (file)
--- a/arch/arm/dts/k3-am625-r5-phycore-som-2gb.dts
+++ b/arch/arm/dts/k3-am625-r5-phycore-som-2gb.dts
@@ -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;

diff --git a/arch/arm/dts/k3-am625-r5-sk.dts b/arch/arm/dts/k3-am625-r5-sk.dts
index 34c501d..67589f9 100644 (file)
--- a/arch/arm/dts/k3-am625-r5-sk.dts
+++ b/arch/arm/dts/k3-am625-r5-sk.dts
@@ -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;

diff --git a/arch/arm/dts/k3-am625-verdin-r5.dts b/arch/arm/dts/k3-am625-verdin-r5.dts
index 39e8ab8..fb431c9 100644 (file)
--- a/arch/arm/dts/k3-am625-verdin-r5.dts
+++ b/arch/arm/dts/k3-am625-verdin-r5.dts
@@ -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;

diff --git a/arch/arm/dts/k3-am62a7-r5-phycore-som-2gb.dts b/arch/arm/dts/k3-am62a7-r5-phycore-som-2gb.dts
index 63b7864..96860e8 100644 (file)
--- a/arch/arm/dts/k3-am62a7-r5-phycore-som-2gb.dts
+++ b/arch/arm/dts/k3-am62a7-r5-phycore-som-2gb.dts
@@ -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>;

diff --git a/arch/arm/dts/k3-am62a7-r5-sk.dts b/arch/arm/dts/k3-am62a7-r5-sk.dts
index 49e6253..64923c2 100644 (file)
--- a/arch/arm/dts/k3-am62a7-r5-sk.dts
+++ b/arch/arm/dts/k3-am62a7-r5-sk.dts
@@ -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>;

diff --git a/arch/arm/dts/k3-am62p5-r5-sk.dts b/arch/arm/dts/k3-am62p5-r5-sk.dts
index b18b4ce..e45d2bf 100644 (file)
--- a/arch/arm/dts/k3-am62p5-r5-sk.dts
+++ b/arch/arm/dts/k3-am62p5-r5-sk.dts
@@ -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>;

diff --git a/arch/arm/dts/k3-am62p5-verdin-r5.dts b/arch/arm/dts/k3-am62p5-verdin-r5.dts
index 983a3bf..1773908 100644 (file)
--- a/arch/arm/dts/k3-am62p5-verdin-r5.dts
+++ b/arch/arm/dts/k3-am62p5-verdin-r5.dts
@@ -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>;

diff --git a/arch/arm/dts/k3-am642-r5-evm.dts b/arch/arm/dts/k3-am642-r5-evm.dts
index 933f750..67b8587 100644 (file)
--- a/arch/arm/dts/k3-am642-r5-evm.dts
+++ b/arch/arm/dts/k3-am642-r5-evm.dts
@@ -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;

diff --git a/arch/arm/dts/k3-am642-r5-phycore-som-2gb.dts b/arch/arm/dts/k3-am642-r5-phycore-som-2gb.dts
index 40c25d5..32a10b2 100644 (file)
--- a/arch/arm/dts/k3-am642-r5-phycore-som-2gb.dts
+++ b/arch/arm/dts/k3-am642-r5-phycore-som-2gb.dts
@@ -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;

diff --git a/arch/arm/dts/k3-am642-r5-sk.dts b/arch/arm/dts/k3-am642-r5-sk.dts
index 6e31dfd..cfc548a 100644 (file)
--- a/arch/arm/dts/k3-am642-r5-sk.dts
+++ b/arch/arm/dts/k3-am642-r5-sk.dts
@@ -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;

diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index ab5195e..99eb8a2 100644 (file)
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -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;

diff --git a/arch/arm/dts/k3-am67a-r5-beagley-ai.dts b/arch/arm/dts/k3-am67a-r5-beagley-ai.dts
index 664be35..45d104e 100644 (file)
--- a/arch/arm/dts/k3-am67a-r5-beagley-ai.dts
+++ b/arch/arm/dts/k3-am67a-r5-beagley-ai.dts
@@ -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>;

diff --git a/arch/arm/dts/k3-j7200-r5-common-proc-board.dts b/arch/arm/dts/k3-j7200-r5-common-proc-board.dts
index 9ac2911..e35b767 100644 (file)
--- a/arch/arm/dts/k3-j7200-r5-common-proc-board.dts
+++ b/arch/arm/dts/k3-j7200-r5-common-proc-board.dts
@@ -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";

diff --git a/arch/arm/dts/k3-j721e-r5.dtsi b/arch/arm/dts/k3-j721e-r5.dtsi
index 786a41c..7398f9b 100644 (file)
--- a/arch/arm/dts/k3-j721e-r5.dtsi
+++ b/arch/arm/dts/k3-j721e-r5.dtsi
@@ -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";
        };

diff --git a/arch/arm/dts/k3-j721s2-r5.dtsi b/arch/arm/dts/k3-j721s2-r5.dtsi
index a820f51..c1c12e2 100644 (file)
--- a/arch/arm/dts/k3-j721s2-r5.dtsi
+++ b/arch/arm/dts/k3-j721s2-r5.dtsi
@@ -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;

diff --git a/arch/arm/dts/k3-j722s-r5-evm.dts b/arch/arm/dts/k3-j722s-r5-evm.dts
index 286ab50..02a3494 100644 (file)
--- a/arch/arm/dts/k3-j722s-r5-evm.dts
+++ b/arch/arm/dts/k3-j722s-r5-evm.dts
@@ -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>;

diff --git a/arch/arm/dts/k3-j784s4-r5.dtsi b/arch/arm/dts/k3-j784s4-r5.dtsi
index a139411..78444dc 100644 (file)
--- a/arch/arm/dts/k3-j784s4-r5.dtsi
+++ b/arch/arm/dts/k3-j784s4-r5.dtsi
@@ -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>;

diff --git a/doc/device-tree-bindings/power/ti,sci-pm-domain.txt b/doc/device-tree-bindings/power/ti,sci-pm-domain.txt
index 72d9fbc..81f6314 100644 (file)
--- a/doc/device-tree-bindings/power/ti,sci-pm-domain.txt
+++ b/doc/device-tree-bindings/power/ti,sci-pm-domain.txt
@@ -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";

diff --git a/doc/device-tree-bindings/remoteproc/k3-system-controller.txt b/doc/device-tree-bindings/remoteproc/k3-system-controller.txt
index 33dc468..7de57ad 100644 (file)
--- a/doc/device-tree-bindings/remoteproc/k3-system-controller.txt
+++ b/doc/device-tree-bindings/remoteproc/k3-system-controller.txt
@@ -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";
 };

diff --git a/doc/device-tree-bindings/reset/ti,sci-reset.txt b/doc/device-tree-bindings/reset/ti,sci-reset.txt
index e7e2d13..740b2df 100644 (file)
--- a/doc/device-tree-bindings/reset/ti,sci-reset.txt
+++ b/doc/device-tree-bindings/reset/ti,sci-reset.txt
@@ -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";

diff --git a/drivers/remoteproc/k3_system_controller.c b/drivers/remoteproc/k3_system_controller.c
index 71238a6..e59c010 100644 (file)
--- a/drivers/remoteproc/k3_system_controller.c
+++ b/drivers/remoteproc/k3_system_controller.c
@@ -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,
        },
        {}