Merge tag 'ti-v2021.04-rc2' of https://gitlab.denx.de/u-boot/custodians/u-boot-tiWIP/05Feb2021

- Sync DTS from Linux kernel for all K3 platforms
- Add MMC higher speed nodes for AM65x, J721e, J7200
- Convert Nokia RX-51 to use CONFIG_DM_MMC
- Minor fixes for LEGO MINDSTORMS

1 files changed, 13 insertions, 13 deletions

diff --git a/doc/device-tree-bindings/remoteproc/ti,k3-r5f-rproc.txt b/doc/device-tree-bindings/remoteproc/ti,k3-r5f-rproc.txt
index 5708c23017..25ee495fe6 100644
--- a/doc/device-tree-bindings/remoteproc/ti,k3-r5f-rproc.txt
+++ b/doc/device-tree-bindings/remoteproc/ti,k3-r5f-rproc.txt
@@ -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>;
 				};
 			};
 		};