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 135e8d49b9159262cc2fe270e6381d58067a065a..95cd9b707c7bcf560e38a140e25beb602bab20ef 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 f4b2cd8904e0fc14c133023bba20166f456eea6c..bba69871fd227a097919cee1900b50dcb4433205 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 7132fae36faa40266d573ece7d031b67ee0a507b..03dc81a4afadb66f043528866197ad912c010c22 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 34c501dd51bb458bd0972fbf332f26c975dfb5db..67589f941ba30e1b7c16b1b1f7ab58304c543582 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 39e8ab8158e3564e404b327d6edfccacedc1b307..fb431c9633754e77bf9657e1fe3d325b838bf709 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 63b7864a46969f83571269e3db7bf7670228362b..96860e80e9a2f9ccb9e9f4387a85834810d9db31 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 49e62533a951ba1509bfe24cf3b68fd9005d9a61..64923c2c7109bfa17b49c6591005b559331241c7 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 b18b4ce12725c0a5e7e702f592c0e57b9e9bec6c..e45d2bf6a0b43261f5e133b74435d4094b945068 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 983a3bfe670733036a9ae85851d77fee5cbd2366..177390869351a97fbe405d47917c812df1f50439 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 933f75095b1175d38e5660b37edcf801a19e663e..67b8587d3b296a6ab94f1250ebe99d7ad286abb2 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 40c25d5dbb68a1b4f321f0de708f9237ffb79022..32a10b24327c2d19deb64f6bf548b94dcb2bff11 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 6e31dfd97c5e8bb2f665522189de8d22f40f4761..cfc548a1cea594abc020ccf1630ae478c4185fb8 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 ab5195eb15c58fe060c5593101dc836923a14172..99eb8a2d442cc22c0d837ab46ebcf3ed4f03a480 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 664be358a97ccd767cf3f6e599dcfac0cf4ada85..45d104e8e3f4a5cb90fe1ad4c4d11b11cf99640b 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 9ac29110324d073447e84748d989530552670bc1..e35b767a7e3ac82251a46282fb284030411008ce 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 786a41c5e90ba161825c2615c2813952f05bcd85..7398f9b05ecb02db1b9f2a49403515ecfc58d8f8 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 a820f516015d7cca2f4405f50cc067291abaaefd..c1c12e217d26b545af261fa6cd4cc688182dbd2e 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 286ab50d3dafa2991f4e96bfeade381e271676fd..02a3494a877d5e19b193ffb9affc1ac7ad05bf55 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 a1394115b8bebcad8194a504f5f018dafff26364..78444dc4e1495c699ea498db7573223ad0bb6714 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 72d9fbc833c4df76f12dea2a74a0658651d2440e..81f6314230f7187fc306e86da5e565df86807ff5 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 33dc46812ed4e292076d694d812014a2d5b987fe..7de57ad4f0088df7301eb3b86a09222a51cba467 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 e7e2d13f9fb4883ebb935a537190dd187e5557a5..740b2dfea646e6e47b9839f8890f03a009e53c53 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 71238a6058a4c711764817b53de9e6ff7b6ea061..e59c010de7e5ae6470ec08f20952d7d8bcdcad4e 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,
        },
        {}