Browse Source

Merge branch 'topic/4.19/am65x' of git://git.ti.com/rpmsg/remoteproc into rpmsg-ti-linux-4.19.y

Pull in the dedicated AM65x remoteproc topic branch that updates the
the DDR carveout regions used by the MCU domain R5F cores on AM65x
platforms in preparation for also supporting the PDK IPC LLD firmwares.

* 'topic/4.19/am65x' of git://git.ti.com/rpmsg/remoteproc:
  arm64: dts: ti: k3-am654-base-board: Reserve memory for IPC between R5F cores
  arm64: dts: ti: k3-am654-base-board: Update R5F DDR carveout memory nodes

Signed-off-by: Suman Anna <s-anna@ti.com>
Suman Anna 6 years ago
parent
commit
eba2c1927b
1 changed files with 16 additions and 10 deletions
  1. 16 10
      arch/arm64/boot/dts/ti/k3-am654-base-board.dts

+ 16 - 10
arch/arm64/boot/dts/ti/k3-am654-base-board.dts

@@ -29,32 +29,38 @@
 		#size-cells = <2>;
 		ranges;
 
-		mcu_r5fss0_core1_dma_memory_region: r5f-dma-memory@9b000000 {
+		secure_ddr: secure_ddr@9e800000 {
+			reg = <0 0x9e800000 0 0x01800000>; /* for OP-TEE */
+			alignment = <0x1000>;
+			no-map;
+		};
+
+		mcu_r5fss0_core0_dma_memory_region: r5f-dma-memory@a0000000 {
 			compatible = "shared-dma-pool";
-			reg = <0 0x9b000000 0 0x100000>;
+			reg = <0 0xa0000000 0 0x100000>;
 			no-map;
 		};
 
-		mcu_r5fss0_core1_memory_region: r5f-memory@9b100000 {
+		mcu_r5fss0_core0_memory_region: r5f-memory@a0100000 {
 			compatible = "shared-dma-pool";
-			reg = <0 0x9b100000 0 0xf00000>;
+			reg = <0 0xa0100000 0 0xf00000>;
 			no-map;
 		};
 
-		mcu_r5fss0_core0_dma_memory_region: r5f-dma-memory@9c000000 {
+		mcu_r5fss0_core1_dma_memory_region: r5f-dma-memory@a1000000 {
 			compatible = "shared-dma-pool";
-			reg = <0 0x9c000000 0 0x100000>;
+			reg = <0 0xa1000000 0 0x100000>;
 			no-map;
 		};
 
-		mcu_r5fss0_core0_memory_region: r5f-memory@9c100000 {
+		mcu_r5fss0_core1_memory_region: r5f-memory@a1100000 {
 			compatible = "shared-dma-pool";
-			reg = <0 0x9c100000 0 0x700000>;
+			reg = <0 0xa1100000 0 0xf00000>;
 			no-map;
 		};
 
-		secure_ddr: secure_ddr@9e800000 {
-			reg = <0 0x9e800000 0 0x01800000>; /* for OP-TEE */
+		rtos_ipc_memory_region: ipc-memories@a2000000 {
+			reg = <0x00 0xa2000000 0x00 0x00100000>;
 			alignment = <0x1000>;
 			no-map;
 		};