@@ -43,7 +43,7 @@
mcu_r5fss0: r5fss@41000000 {
compatible = "ti,am654-r5fss";
- lockstep-mode = <0>;
+ ti,cluster-mode = <0>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x41000000 0x00 0x41000000 0x20000>,
@@ -59,9 +59,9 @@
ti,sci-dev-id = <159>;
ti,sci-proc-ids = <0x01 0xFF>;
resets = <&k3_reset 159 1>;
- atcm-enable = <1>;
- btcm-enable = <1>;
- loczrama = <1>;
+ ti,atcm-enable = <1>;
+ ti,btcm-enable = <1>;
+ ti,loczrama = <1>;
};
mcu_r5fss0_core1: r5f@41400000 {
@@ -73,9 +73,9 @@
ti,sci-dev-id = <245>;
ti,sci-proc-ids = <0x02 0xFF>;
resets = <&k3_reset 245 1>;
- atcm-enable = <1>;
- btcm-enable = <1>;
- loczrama = <1>;
+ ti,atcm-enable = <1>;
+ ti,btcm-enable = <1>;
+ ti,loczrama = <1>;
};
};
@@ -343,7 +343,7 @@
main_r5fss0: r5fss@5c00000 {
compatible = "ti,j7200-r5fss";
- lockstep-mode = <0>;
+ ti,cluster-mode = <0>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x5c00000 0x00 0x5c00000 0x20000>,
@@ -360,9 +360,9 @@
ti,sci-proc-ids = <0x06 0xFF>;
resets = <&k3_reset 245 1>;
firmware-name = "j7200-main-r5f0_0-fw";
- atcm-enable = <1>;
- btcm-enable = <1>;
- loczrama = <1>;
+ ti,atcm-enable = <1>;
+ ti,btcm-enable = <1>;
+ ti,loczrama = <1>;
};
main_r5fss0_core1: r5f@5d00000 {
@@ -375,9 +375,9 @@
ti,sci-proc-ids = <0x07 0xFF>;
resets = <&k3_reset 246 1>;
firmware-name = "j7200-main-r5f0_1-fw";
- atcm-enable = <1>;
- btcm-enable = <1>;
- loczrama = <1>;
+ ti,atcm-enable = <1>;
+ ti,btcm-enable = <1>;
+ ti,loczrama = <1>;
};
};
};
@@ -272,7 +272,7 @@
mcu_r5fss0: r5fss@41000000 {
compatible = "ti,j7200-r5fss";
- lockstep-mode = <1>;
+ ti,cluster-mode = <1>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x41000000 0x00 0x41000000 0x20000>,
@@ -289,9 +289,9 @@
ti,sci-proc-ids = <0x01 0xff>;
resets = <&k3_reset 250 1>;
firmware-name = "j7200-mcu-r5f0_0-fw";
- atcm-enable = <1>;
- btcm-enable = <1>;
- loczrama = <1>;
+ ti,atcm-enable = <1>;
+ ti,btcm-enable = <1>;
+ ti,loczrama = <1>;
};
mcu_r5fss0_core1: r5f@41400000 {
@@ -304,9 +304,9 @@
ti,sci-proc-ids = <0x02 0xff>;
resets = <&k3_reset 251 1>;
firmware-name = "j7200-mcu-r5f0_1-fw";
- atcm-enable = <1>;
- btcm-enable = <1>;
- loczrama = <1>;
+ ti,atcm-enable = <1>;
+ ti,btcm-enable = <1>;
+ ti,loczrama = <1>;
};
};
};
@@ -264,7 +264,7 @@
main_r5fss0: r5fss@5c00000 {
compatible = "ti,j721e-r5fss";
- lockstep-mode = <0>;
+ ti,cluster-mode = <0>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x5c00000 0x00 0x5c00000 0x20000>,
@@ -280,9 +280,9 @@
ti,sci-dev-id = <245>;
ti,sci-proc-ids = <0x06 0xFF>;
resets = <&k3_reset 245 1>;
- atcm-enable = <1>;
- btcm-enable = <1>;
- loczrama = <1>;
+ ti,atcm-enable = <1>;
+ ti,btcm-enable = <1>;
+ ti,loczrama = <1>;
};
main_r5fss0_core1: r5f@5d00000 {
@@ -294,15 +294,15 @@
ti,sci-dev-id = <246>;
ti,sci-proc-ids = <0x07 0xFF>;
resets = <&k3_reset 246 1>;
- atcm-enable = <1>;
- btcm-enable = <1>;
- loczrama = <1>;
+ ti,atcm-enable = <1>;
+ ti,btcm-enable = <1>;
+ ti,loczrama = <1>;
};
};
main_r5fss1: r5fss@5e00000 {
compatible = "ti,j721e-r5fss";
- lockstep-mode = <0>;
+ ti,cluster-mode = <0>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x5e00000 0x00 0x5e00000 0x20000>,
@@ -318,9 +318,9 @@
ti,sci-dev-id = <247>;
ti,sci-proc-ids = <0x08 0xFF>;
resets = <&k3_reset 247 1>;
- atcm-enable = <1>;
- btcm-enable = <1>;
- loczrama = <1>;
+ ti,atcm-enable = <1>;
+ ti,btcm-enable = <1>;
+ ti,loczrama = <1>;
};
main_r5fss1_core1: r5f@5f00000 {
@@ -332,9 +332,9 @@
ti,sci-dev-id = <248>;
ti,sci-proc-ids = <0x09 0xFF>;
resets = <&k3_reset 248 1>;
- atcm-enable = <1>;
- btcm-enable = <1>;
- loczrama = <1>;
+ ti,atcm-enable = <1>;
+ ti,btcm-enable = <1>;
+ ti,loczrama = <1>;
};
};
@@ -97,7 +97,7 @@
mcu_r5fss0: r5fss@41000000 {
compatible = "ti,j721e-r5fss";
- lockstep-mode = <1>;
+ ti,cluster-mode = <1>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x41000000 0x00 0x41000000 0x20000>,
@@ -113,9 +113,9 @@
ti,sci-dev-id = <250>;
ti,sci-proc-ids = <0x01 0xFF>;
resets = <&k3_reset 250 1>;
- atcm-enable = <1>;
- btcm-enable = <1>;
- loczrama = <1>;
+ ti,atcm-enable = <1>;
+ ti,btcm-enable = <1>;
+ ti,loczrama = <1>;
};
mcu_r5fss0_core1: r5f@41400000 {
@@ -127,9 +127,9 @@
ti,sci-dev-id = <251>;
ti,sci-proc-ids = <0x02 0xFF>;
resets = <&k3_reset 251 1>;
- atcm-enable = <1>;
- btcm-enable = <1>;
- loczrama = <1>;
+ ti,atcm-enable = <1>;
+ ti,btcm-enable = <1>;
+ ti,loczrama = <1>;
};
};
@@ -38,7 +38,7 @@ The following are the mandatory properties:
Optional properties:
--------------------
-- lockstep-mode: Configuration Mode for the Dual R5F cores within the R5F
+- ti,cluster-mode: Configuration Mode for the Dual R5F cores within the R5F
cluster. Should be either a value of 1 (LockStep mode) or
0 (Split mode), default is LockStep mode if omitted.
@@ -88,15 +88,15 @@ Optional properties:
--------------------
The following properties are optional properties for each of the R5F cores:
-- atcm-enable: R5F core configuration mode dictating if ATCM should be
+- ti,atcm-enable: R5F core configuration mode dictating if ATCM should be
enabled. Should be either a value of 1 (enabled) or
0 (disabled), default is disabled if omitted. R5F view
- of ATCM dictated by loczrama property.
-- btcm-enable: R5F core configuration mode dictating if BTCM should be
+ of ATCM dictated by ti,loczrama property.
+- ti,btcm-enable: R5F core configuration mode dictating if BTCM should be
enabled. Should be either a value of 1 (enabled) or
0 (disabled), default is enabled if omitted. R5F view
- of BTCM dictated by loczrama property.
-- loczrama: R5F core configuration mode dictating which TCM should
+ of BTCM dictated by ti,loczrama property.
+- ti,loczrama: R5F core configuration mode dictating which TCM should
appear at address 0 (from core's view). Should be either
a value of 1 (ATCM at 0x0) or 0 (BTCM at 0x0), default
value is 1 if omitted.
@@ -129,7 +129,7 @@ Example:
mcu_r5fss0: r5fss@41000000 {
compatible = "ti,am654-r5fss";
power-domains = <&k3_pds 129>;
- lockstep-mode = <1>;
+ ti,cluster-mode = <1>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x41000000 0x00 0x41000000 0x20000>,
@@ -144,9 +144,9 @@ Example:
ti,sci-dev-id = <159>;
ti,sci-proc-ids = <0x01 0xFF>;
resets = <&k3_reset 159 1>;
- atcm-enable = <1>;
- btcm-enable = <1>;
- loczrama = <1>;
+ ti,atcm-enable = <1>;
+ ti,btcm-enable = <1>;
+ ti,loczrama = <1>;
};
mcu_r5f1: r5f@41400000 {
@@ -158,9 +158,9 @@ Example:
ti,sci-dev-id = <245>;
ti,sci-proc-ids = <0x02 0xFF>;
resets = <&k3_reset 245 1>;
- atcm-enable = <1>;
- btcm-enable = <1>;
- loczrama = <1>;
+ ti,atcm-enable = <1>;
+ ti,btcm-enable = <1>;
+ ti,loczrama = <1>;
};
};
};
@@ -678,9 +678,9 @@ static int k3_r5f_of_to_priv(struct k3_r5f_core *core)
dev_dbg(core->dev, "%s\n", __func__);
- core->atcm_enable = dev_read_u32_default(core->dev, "atcm-enable", 0);
- core->btcm_enable = dev_read_u32_default(core->dev, "btcm-enable", 1);
- core->loczrama = dev_read_u32_default(core->dev, "loczrama", 1);
+ core->atcm_enable = dev_read_u32_default(core->dev, "ti,atcm-enable", 0);
+ core->btcm_enable = dev_read_u32_default(core->dev, "ti,btcm-enable", 1);
+ core->loczrama = dev_read_u32_default(core->dev, "ti,loczrama", 1);
ret = ti_sci_proc_of_to_priv(core->dev, &core->tsp);
if (ret)
@@ -875,7 +875,7 @@ static int k3_r5f_cluster_probe(struct udevice *dev)
dev_dbg(dev, "%s\n", __func__);
- cluster->mode = dev_read_u32_default(dev, "lockstep-mode",
+ cluster->mode = dev_read_u32_default(dev, "ti,cluster-mode",
CLUSTER_MODE_LOCKSTEP);
if (device_get_child_count(dev) != 2) {
The K3 R5F remoteproc driver in U-Boot was upstreamed prior to the equivalent remoteproc driver in the Linux kernel. Some of the DT properties used in U-Boot got upstreamed using different names in Linux kernel. The modified property names include the R5F cluster mode configuration property "lockstep-mode"; and three different individual R5F core config properties - "atcm-enable", "btcm-enable" and "loczrama". The property names were updated as follows: lockstep-mode => ti,cluster-mode atcm-enable => ti,atcm-enable btcm-enable => ti,btcm-enable loczrama => ti,loczrama Update the K3 R5F remoteproc driver, the corresponding binding, and all the existing usage in AM65x, J721E and J7200 dts files all at once to use the new properties and to not break any bisectability. Signed-off-by: Suman Anna <s-anna@ti.com> --- Hi Lokesh, As agreed offline, this patch syncs the U-Boot K3 R5F driver and all the related pieces in a single patch to the equivalent property names in the latest upstream Linux kernel. Note that the kernel bindings in general define a few more properties which have no presence so far in U-Boot. So, only the common properties are synched. No changes are required to the K3 DSP remoteproc driver. Tested on AM65x, J721E and J7200 using appropriate SYSFW. Patch is on top of latest U-Boot master commit e262b2973e22. regards Suman arch/arm/dts/k3-am65-mcu.dtsi | 14 +++++----- arch/arm/dts/k3-j7200-main.dtsi | 14 +++++----- arch/arm/dts/k3-j7200-mcu-wakeup.dtsi | 14 +++++----- arch/arm/dts/k3-j721e-main.dtsi | 28 +++++++++---------- arch/arm/dts/k3-j721e-mcu-wakeup.dtsi | 14 +++++----- .../remoteproc/ti,k3-r5f-rproc.txt | 26 ++++++++--------- drivers/remoteproc/ti_k3_r5f_rproc.c | 8 +++--- 7 files changed, 59 insertions(+), 59 deletions(-)