arm64: dts: ti: k3: Rename rproc reserved-mem nodes to 'memory@addr'

Currently, the reserved memory carveouts used by remote processors are
named like 'rproc-name-<dma>-memory-region@addr'. While it is
descriptive, the node label already serves that purpose. Rename reserved
memory nodes to generic 'memory@addr' to align with the device tree
specifications. This is done for all TI K3 based boards.

Signed-off-by: Beleswar Padhi <b-padhi@ti.com>
Reviewed-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Link: https://patch.msgid.link/20250908142826.1828676-14-b-padhi@ti.com
Signed-off-by: Nishanth Menon <nm@ti.com>

diff --git a/arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi b/arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi
index dcd22ff487ecb4c226e3515509c21d5b6ed1b868..75b7e64f665949cd2c7077794ef2ada444696490 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi
@@ -46,31 +46,31 @@
                        pmsg-size = <0x8000>;
                };
 
-               rtos_ipc_memory_region: ipc-memories@9c800000 {
+               rtos_ipc_memory_region: memory@9c800000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9c800000 0x00 0x00300000>;
                        no-map;
                };
 
-               mcu_m4fss_dma_memory_region: m4f-dma-memory@9cb00000 {
+               mcu_m4fss_dma_memory_region: memory@9cb00000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9cb00000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_m4fss_memory_region: m4f-memory@9cc00000 {
+               mcu_m4fss_memory_region: memory@9cc00000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9cc00000 0x00 0xe00000>;
                        no-map;
                };
 
-               wkup_r5fss0_core0_dma_memory_region: r5f-dma-memory@9da00000 {
+               wkup_r5fss0_core0_dma_memory_region: memory@9da00000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9da00000 0x00 0x100000>;
                        no-map;
                };
 
-               wkup_r5fss0_core0_memory_region: r5f-memory@9db00000 {
+               wkup_r5fss0_core0_memory_region: memory@9db00000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9db00000 0x00 0xc00000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-am62-pocketbeagle2.dts b/arch/arm64/boot/dts/ti/k3-am62-pocketbeagle2.dts
index 2eee5f638e0f2d555fd9b81e17644c8a94dd68e3..2d46be298b0b3bda4ead545e5469d504ed89b6af 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am62-pocketbeagle2.dts
+++ b/arch/arm64/boot/dts/ti/k3-am62-pocketbeagle2.dts
@@ -54,13 +54,13 @@
                        linux,cma-default;
                };
 
-               mcu_m4fss_dma_memory_region: m4f-dma-memory@9cb00000 {
+               mcu_m4fss_dma_memory_region: memory@9cb00000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9cb00000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_m4fss_memory_region: m4f-memory@9cc00000 {
+               mcu_m4fss_memory_region: memory@9cc00000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9cc00000 0x00 0xe00000>;
                        no-map;
@@ -78,7 +78,7 @@
                        no-map;
                };
 
-               wkup_r5fss0_core0_dma_memory_region: r5f-dma-memory@9db00000 {
+               wkup_r5fss0_core0_dma_memory_region: memory@9db00000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9db00000 0x00 0xc00000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi b/arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi
index cbbcb96e2e24669b65a0b8805dd25c8e6159259d..9384c9a0232afdf4bd9a247459ff471d3e33e2e0 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi
@@ -206,7 +206,7 @@
                        no-map;
                };
 
-               wkup_r5fss0_core0_dma_memory_region: r5f-dma-memory@9db00000 {
+               wkup_r5fss0_core0_dma_memory_region: memory@9db00000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9db00000 0x00 0xc00000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts b/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
index 72b09f9c69d8c84ffdb22c85d2c65906092e060d..7028d9835c4a89cc3f5ca17543b18d3419751f0a 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
+++ b/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
@@ -83,7 +83,7 @@
                        no-map;
                };
 
-               wkup_r5fss0_core0_dma_memory_region: r5f-dma-memory@9db00000 {
+               wkup_r5fss0_core0_dma_memory_region: memory@9db00000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9db00000 0x00 0xc00000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi b/arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi
index 3108e9b0c804ca3cb086f7bf992a304a3df2b6fe..0406a43ff7045ec499797f7305638ad5b4b2e9ba 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi
@@ -59,37 +59,37 @@
                        linux,cma-default;
                };
 
-               c7x_0_dma_memory_region: c7x-dma-memory@99800000 {
+               c7x_0_dma_memory_region: memory@99800000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x99800000 0x00 0x100000>;
                        no-map;
                };
 
-               c7x_0_memory_region: c7x-memory@99900000 {
+               c7x_0_memory_region: memory@99900000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x99900000 0x00 0xf00000>;
                        no-map;
                };
 
-               mcu_r5fss0_core0_dma_memory_region: r5f-dma-memory@9b800000 {
+               mcu_r5fss0_core0_dma_memory_region: memory@9b800000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9b800000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core0_memory_region: r5f-dma-memory@9b900000 {
+               mcu_r5fss0_core0_memory_region: memory@9b900000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9b900000 0x00 0xf00000>;
                        no-map;
                };
 
-               wkup_r5fss0_core0_dma_memory_region: r5f-dma-memory@9c800000 {
+               wkup_r5fss0_core0_dma_memory_region: memory@9c800000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9c800000 0x00 0x100000>;
                        no-map;
                };
 
-               wkup_r5fss0_core0_memory_region: r5f-dma-memory@9c900000 {
+               wkup_r5fss0_core0_memory_region: memory@9c900000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9c900000 0x00 0xf00000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts b/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts
index 7ebcfe8edfe1fe7bcd738ea190601da9a6fc8cf4..312bdab287846b10577a1b5c5fc11f6e85429fd6 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts
@@ -53,37 +53,37 @@
                        linux,cma-default;
                };
 
-               c7x_0_dma_memory_region: c7x-dma-memory@99800000 {
+               c7x_0_dma_memory_region: memory@99800000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x99800000 0x00 0x100000>;
                        no-map;
                };
 
-               c7x_0_memory_region: c7x-memory@99900000 {
+               c7x_0_memory_region: memory@99900000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x99900000 0x00 0xf00000>;
                        no-map;
                };
 
-               mcu_r5fss0_core0_dma_memory_region: r5f-dma-memory@9b800000 {
+               mcu_r5fss0_core0_dma_memory_region: memory@9b800000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9b800000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core0_memory_region: r5f-dma-memory@9b900000 {
+               mcu_r5fss0_core0_memory_region: memory@9b900000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9b900000 0x00 0xf00000>;
                        no-map;
                };
 
-               wkup_r5fss0_core0_dma_memory_region: r5f-dma-memory@9c800000 {
+               wkup_r5fss0_core0_dma_memory_region: memory@9c800000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9c800000 0x00 0x100000>;
                        no-map;
                };
 
-               wkup_r5fss0_core0_memory_region: r5f-dma-memory@9c900000 {
+               wkup_r5fss0_core0_memory_region: memory@9c900000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9c900000 0x00 0xf00000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-am62d2-evm.dts b/arch/arm64/boot/dts/ti/k3-am62d2-evm.dts
index 41860ac42f3c1c738f74fcb69bb0796c64a14790..289f52b3481faff866a9e60388a53def1f6ea7c9 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am62d2-evm.dts
+++ b/arch/arm64/boot/dts/ti/k3-am62d2-evm.dts
@@ -58,37 +58,37 @@
                        no-map;
                };
 
-               c7x_0_dma_memory_region: c7x-dma-memory@99800000 {
+               c7x_0_dma_memory_region: memory@99800000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x99800000 0x00 0x100000>;
                        no-map;
                };
 
-               c7x_0_memory_region: c7x-memory@99900000 {
+               c7x_0_memory_region: memory@99900000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x99900000 0x00 0xf00000>;
                        no-map;
                };
 
-               mcu_r5fss0_core0_dma_memory_region: r5f-dma-memory@9b800000 {
+               mcu_r5fss0_core0_dma_memory_region: memory@9b800000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9b800000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core0_memory_region: r5f-dma-memory@9b900000 {
+               mcu_r5fss0_core0_memory_region: memory@9b900000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9b900000 0x00 0xf00000>;
                        no-map;
                };
 
-               wkup_r5fss0_core0_dma_memory_region: r5f-dma-memory@9c800000 {
+               wkup_r5fss0_core0_dma_memory_region: memory@9c800000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9c800000 0x00 0x100000>;
                        no-map;
                };
 
-               wkup_r5fss0_core0_memory_region: r5f-dma-memory@9c900000 {
+               wkup_r5fss0_core0_memory_region: memory@9c900000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9c900000 0x00 0xf00000>;
                        no-map;
@@ -100,7 +100,7 @@
                        no-map;
                };
 
-               rtos_ipc_memory_region: ipc-memories@a0000000 {
+               rtos_ipc_memory_region: memory@a0000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0000000 0x00 0x01000000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-am62p-verdin.dtsi b/arch/arm64/boot/dts/ti/k3-am62p-verdin.dtsi
index 6a04b370d149ffa26747bdb6e657f1b890004fad..522d6f029c3602e11f72a3fda8d6e63c562fa922 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am62p-verdin.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62p-verdin.dtsi
@@ -162,7 +162,7 @@
                        no-map;
                };
 
-               wkup_r5fss0_core0_memory_region: r5f-dma-memory@9c900000 {
+               wkup_r5fss0_core0_memory_region: memory@9c900000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9c900000 0x00 0x01e00000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-am62p5-sk.dts b/arch/arm64/boot/dts/ti/k3-am62p5-sk.dts
index c5b5b00c42b9033000c4f55de3b045da79512297..aa363aaf6d59997acfec362f415b568c46bc5bf5 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am62p5-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am62p5-sk.dts
@@ -49,25 +49,25 @@
                #size-cells = <2>;
                ranges;
 
-               mcu_r5fss0_core0_dma_memory_region: mcu-r5fss-dma-memory-region@9b800000 {
+               mcu_r5fss0_core0_dma_memory_region: memory@9b800000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9b800000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core0_memory_region: mcu-r5fss-memory-region@9b900000 {
+               mcu_r5fss0_core0_memory_region: memory@9b900000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9b900000 0x00 0xf00000>;
                        no-map;
                };
 
-               wkup_r5fss0_core0_dma_memory_region: r5f-dma-memory@9c800000 {
+               wkup_r5fss0_core0_dma_memory_region: memory@9c800000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9c800000 0x00 0x100000>;
                        no-map;
                };
 
-               wkup_r5fss0_core0_memory_region: r5f-memory@9c900000 {
+               wkup_r5fss0_core0_memory_region: memory@9c900000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9c900000 0x00 0xf00000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi b/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
index 03b8e246d8c274b73c79f24863ef246089c73b8e..05cba3cfc79ee64349e76413f411cb8fca2bc55b 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
@@ -58,25 +58,25 @@
                        linux,cma-default;
                };
 
-               mcu_m4fss_dma_memory_region: m4f-dma-memory@9cb00000 {
+               mcu_m4fss_dma_memory_region: memory@9cb00000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9cb00000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_m4fss_memory_region: m4f-memory@9cc00000 {
+               mcu_m4fss_memory_region: memory@9cc00000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9cc00000 0x00 0xe00000>;
                        no-map;
                };
 
-               wkup_r5fss0_core0_dma_memory_region: r5f-dma-memory@9da00000 {
+               wkup_r5fss0_core0_dma_memory_region: memory@9da00000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9da00000 0x00 0x100000>;
                        no-map;
                };
 
-               wkup_r5fss0_core0_memory_region: r5f-memory@9db00000 {
+               wkup_r5fss0_core0_memory_region: memory@9db00000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0x9db00000 0x00 0xc00000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi b/arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi
index 03c46d74ebb5ddbb9a0d54a678dfe97b4a47cf93..ba425b125d63b7cff4a42cff21b6037da724f9af 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi
@@ -41,67 +41,67 @@
                        no-map;
                };
 
-               main_r5fss0_core0_dma_memory_region: r5f-dma-memory@a0000000 {
+               main_r5fss0_core0_dma_memory_region: memory@a0000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core0_memory_region: r5f-memory@a0100000 {
+               main_r5fss0_core0_memory_region: memory@a0100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss0_core1_dma_memory_region: r5f-dma-memory@a1000000 {
+               main_r5fss0_core1_dma_memory_region: memory@a1000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core1_memory_region: r5f-memory@a1100000 {
+               main_r5fss0_core1_memory_region: memory@a1100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core0_dma_memory_region: r5f-dma-memory@a2000000 {
+               main_r5fss1_core0_dma_memory_region: memory@a2000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core0_memory_region: r5f-memory@a2100000 {
+               main_r5fss1_core0_memory_region: memory@a2100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core1_dma_memory_region: r5f-dma-memory@a3000000 {
+               main_r5fss1_core1_dma_memory_region: memory@a3000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core1_memory_region: r5f-memory@a3100000 {
+               main_r5fss1_core1_memory_region: memory@a3100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3100000 0x00 0xf00000>;
                        no-map;
                };
 
-               mcu_m4fss_dma_memory_region: m4f-dma-memory@a4000000 {
+               mcu_m4fss_dma_memory_region: memory@a4000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4000000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_m4fss_memory_region: m4f-memory@a4100000 {
+               mcu_m4fss_memory_region: memory@a4100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4100000 0x00 0xf00000>;
                        no-map;
                };
 
-               rtos_ipc_memory_region: ipc-memories@a5000000 {
+               rtos_ipc_memory_region: memory@a5000000 {
                        reg = <0x00 0xa5000000 0x00 0x00800000>;
                        alignment = <0x1000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-am642-evm.dts b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
index 7640c5efe9b8c6d581d38e9be49b4540ac5e02df..ebc9fedc4d7206b8ebdd74ba0834942fe5080890 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am642-evm.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
@@ -53,67 +53,67 @@
                        no-map;
                };
 
-               main_r5fss0_core0_dma_memory_region: r5f-dma-memory@a0000000 {
+               main_r5fss0_core0_dma_memory_region: memory@a0000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core0_memory_region: r5f-memory@a0100000 {
+               main_r5fss0_core0_memory_region: memory@a0100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss0_core1_dma_memory_region: r5f-dma-memory@a1000000 {
+               main_r5fss0_core1_dma_memory_region: memory@a1000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core1_memory_region: r5f-memory@a1100000 {
+               main_r5fss0_core1_memory_region: memory@a1100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core0_dma_memory_region: r5f-dma-memory@a2000000 {
+               main_r5fss1_core0_dma_memory_region: memory@a2000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core0_memory_region: r5f-memory@a2100000 {
+               main_r5fss1_core0_memory_region: memory@a2100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core1_dma_memory_region: r5f-dma-memory@a3000000 {
+               main_r5fss1_core1_dma_memory_region: memory@a3000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core1_memory_region: r5f-memory@a3100000 {
+               main_r5fss1_core1_memory_region: memory@a3100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3100000 0x00 0xf00000>;
                        no-map;
                };
 
-               mcu_m4fss_dma_memory_region: m4f-dma-memory@a4000000 {
+               mcu_m4fss_dma_memory_region: memory@a4000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4000000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_m4fss_memory_region: m4f-memory@a4100000 {
+               mcu_m4fss_memory_region: memory@a4100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4100000 0x00 0xf00000>;
                        no-map;
                };
 
-               rtos_ipc_memory_region: ipc-memories@a5000000 {
+               rtos_ipc_memory_region: memory@a5000000 {
                        reg = <0x00 0xa5000000 0x00 0x00800000>;
                        alignment = <0x1000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-am642-sk.dts b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
index fb8bd66f2f94bfe9ece655957547fb4c4a767dc7..d2b06e508c7f2164aeec2a5a7709e87dce5d15ca 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am642-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
@@ -51,67 +51,67 @@
                        no-map;
                };
 
-               main_r5fss0_core0_dma_memory_region: r5f-dma-memory@a0000000 {
+               main_r5fss0_core0_dma_memory_region: memory@a0000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core0_memory_region: r5f-memory@a0100000 {
+               main_r5fss0_core0_memory_region: memory@a0100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss0_core1_dma_memory_region: r5f-dma-memory@a1000000 {
+               main_r5fss0_core1_dma_memory_region: memory@a1000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core1_memory_region: r5f-memory@a1100000 {
+               main_r5fss0_core1_memory_region: memory@a1100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core0_dma_memory_region: r5f-dma-memory@a2000000 {
+               main_r5fss1_core0_dma_memory_region: memory@a2000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core0_memory_region: r5f-memory@a2100000 {
+               main_r5fss1_core0_memory_region: memory@a2100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core1_dma_memory_region: r5f-dma-memory@a3000000 {
+               main_r5fss1_core1_dma_memory_region: memory@a3000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core1_memory_region: r5f-memory@a3100000 {
+               main_r5fss1_core1_memory_region: memory@a3100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3100000 0x00 0xf00000>;
                        no-map;
                };
 
-               mcu_m4fss_dma_memory_region: m4f-dma-memory@a4000000 {
+               mcu_m4fss_dma_memory_region: memory@a4000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4000000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_m4fss_memory_region: m4f-memory@a4100000 {
+               mcu_m4fss_memory_region: memory@a4100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4100000 0x00 0xf00000>;
                        no-map;
                };
 
-               rtos_ipc_memory_region: ipc-memories@a5000000 {
+               rtos_ipc_memory_region: memory@a5000000 {
                        reg = <0x00 0xa5000000 0x00 0x00800000>;
                        alignment = <0x1000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-am642-sr-som.dtsi b/arch/arm64/boot/dts/ti/k3-am642-sr-som.dtsi
index 81adae0a8e55710b99748b016c99a8cc111b5c1f..35294a5c46d5b09ce02f29a4e7ae9c9e3b1754b4 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am642-sr-som.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am642-sr-som.dtsi
@@ -115,49 +115,49 @@
                        no-map;
                };
 
-               main_r5fss0_core0_dma_memory_region: r5f-dma-memory@a0000000 {
+               main_r5fss0_core0_dma_memory_region: memory@a0000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core0_memory_region: r5f-memory@a0100000 {
+               main_r5fss0_core0_memory_region: memory@a0100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss0_core1_dma_memory_region: r5f-dma-memory@a1000000 {
+               main_r5fss0_core1_dma_memory_region: memory@a1000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core1_memory_region: r5f-memory@a1100000 {
+               main_r5fss0_core1_memory_region: memory@a1100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core0_dma_memory_region: r5f-dma-memory@a2000000 {
+               main_r5fss1_core0_dma_memory_region: memory@a2000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core0_memory_region: r5f-memory@a2100000 {
+               main_r5fss1_core0_memory_region: memory@a2100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core1_dma_memory_region: r5f-dma-memory@a3000000 {
+               main_r5fss1_core1_dma_memory_region: memory@a3000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core1_memory_region: r5f-memory@a3100000 {
+               main_r5fss1_core1_memory_region: memory@a3100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3100000 0x00 0xf00000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-am642-tqma64xxl.dtsi b/arch/arm64/boot/dts/ti/k3-am642-tqma64xxl.dtsi
index 40b619c9a6c99c7a7288149d6a9a5774436f98ff..4068d2c2b10c996b8104e4491167257260a118b9 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am642-tqma64xxl.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am642-tqma64xxl.dtsi
@@ -31,55 +31,55 @@
                        no-map;
                };
 
-               main_r5fss0_core0_dma_memory_region: r5f-dma-memory@a0000000 {
+               main_r5fss0_core0_dma_memory_region: memory@a0000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core0_memory_region: r5f-memory@a0100000 {
+               main_r5fss0_core0_memory_region: memory@a0100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss0_core1_dma_memory_region: r5f-dma-memory@a1000000 {
+               main_r5fss0_core1_dma_memory_region: memory@a1000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core1_memory_region: r5f-memory@a1100000 {
+               main_r5fss0_core1_memory_region: memory@a1100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core0_dma_memory_region: r5f-dma-memory@a2000000 {
+               main_r5fss1_core0_dma_memory_region: memory@a2000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core0_memory_region: r5f-memory@a2100000 {
+               main_r5fss1_core0_memory_region: memory@a2100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core1_dma_memory_region: r5f-dma-memory@a3000000 {
+               main_r5fss1_core1_dma_memory_region: memory@a3000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core1_memory_region: r5f-memory@a3100000 {
+               main_r5fss1_core1_memory_region: memory@a3100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3100000 0x00 0xf00000>;
                        no-map;
                };
 
-               rtos_ipc_memory_region: ipc-memories@a5000000 {
+               rtos_ipc_memory_region: memory@a5000000 {
                        reg = <0x00 0xa5000000 0x00 0x00800000>;
                        alignment = <0x1000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
index 6cd499ea53e7ab844cb9de69b233dd6ea73bb8f4..df2eed0b40486b71b2c4c0844d81ee4294026e4a 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
@@ -47,31 +47,31 @@
                        no-map;
                };
 
-               mcu_r5fss0_core0_dma_memory_region: r5f-dma-memory@a0000000 {
+               mcu_r5fss0_core0_dma_memory_region: memory@a0000000 {
                        compatible = "shared-dma-pool";
                        reg = <0 0xa0000000 0 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core0_memory_region: r5f-memory@a0100000 {
+               mcu_r5fss0_core0_memory_region: memory@a0100000 {
                        compatible = "shared-dma-pool";
                        reg = <0 0xa0100000 0 0xf00000>;
                        no-map;
                };
 
-               mcu_r5fss0_core1_dma_memory_region: r5f-dma-memory@a1000000 {
+               mcu_r5fss0_core1_dma_memory_region: memory@a1000000 {
                        compatible = "shared-dma-pool";
                        reg = <0 0xa1000000 0 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core1_memory_region: r5f-memory@a1100000 {
+               mcu_r5fss0_core1_memory_region: memory@a1100000 {
                        compatible = "shared-dma-pool";
                        reg = <0 0xa1100000 0 0xf00000>;
                        no-map;
                };
 
-               rtos_ipc_memory_region: ipc-memories@a2000000 {
+               rtos_ipc_memory_region: memory@a2000000 {
                        reg = <0x00 0xa2000000 0x00 0x00200000>;
                        alignment = <0x1000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
index e532ea0a22b25b01db76ca803fd43fc9044797b6..3ca771a4f9c77decb3c7b2532751b26398dc4dff 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
@@ -50,31 +50,31 @@
                        no-map;
                };
 
-               mcu_r5fss0_core0_dma_memory_region: r5f-dma-memory@a0000000 {
+               mcu_r5fss0_core0_dma_memory_region: memory@a0000000 {
                        compatible = "shared-dma-pool";
                        reg = <0 0xa0000000 0 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core0_memory_region: r5f-memory@a0100000 {
+               mcu_r5fss0_core0_memory_region: memory@a0100000 {
                        compatible = "shared-dma-pool";
                        reg = <0 0xa0100000 0 0xf00000>;
                        no-map;
                };
 
-               mcu_r5fss0_core1_dma_memory_region: r5f-dma-memory@a1000000 {
+               mcu_r5fss0_core1_dma_memory_region: memory@a1000000 {
                        compatible = "shared-dma-pool";
                        reg = <0 0xa1000000 0 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core1_memory_region: r5f-memory@a1100000 {
+               mcu_r5fss0_core1_memory_region: memory@a1100000 {
                        compatible = "shared-dma-pool";
                        reg = <0 0xa1100000 0 0xf00000>;
                        no-map;
                };
 
-               rtos_ipc_memory_region: ipc-memories@a2000000 {
+               rtos_ipc_memory_region: memory@a2000000 {
                        reg = <0x00 0xa2000000 0x00 0x00100000>;
                        alignment = <0x1000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-am67a-beagley-ai.dts b/arch/arm64/boot/dts/ti/k3-am67a-beagley-ai.dts
index b329e4cb0c37cb4eea8a9b320d946368d6fa78bf..85436ea5b4e7e5f51393c4e50cffc971ebfa6cce 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am67a-beagley-ai.dts
+++ b/arch/arm64/boot/dts/ti/k3-am67a-beagley-ai.dts
@@ -50,67 +50,67 @@
                        no-map;
                };
 
-               wkup_r5fss0_core0_dma_memory_region: r5f-dma-memory@a0000000 {
+               wkup_r5fss0_core0_dma_memory_region: memory@a0000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0000000 0x00 0x100000>;
                        no-map;
                };
 
-               wkup_r5fss0_core0_memory_region: r5f-memory@a0100000 {
+               wkup_r5fss0_core0_memory_region: memory@a0100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0100000 0x00 0xf00000>;
                        no-map;
                };
 
-               mcu_r5fss0_core0_dma_memory_region: mcu-r5fss-dma-memory-region@a1000000 {
+               mcu_r5fss0_core0_dma_memory_region: memory@a1000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1000000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core0_memory_region: mcu-r5fss-memory-region@a1100000 {
+               mcu_r5fss0_core0_memory_region: memory@a1100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss0_core0_dma_memory_region: main-r5fss-dma-memory-region@a2000000 {
+               main_r5fss0_core0_dma_memory_region: memory@a2000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core0_memory_region: main-r5fss-memory-region@a2100000 {
+               main_r5fss0_core0_memory_region: memory@a2100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c7x_0_dma_memory_region: c7x-dma-memory@a3000000 {
+               c7x_0_dma_memory_region: memory@a3000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3000000 0x00 0x100000>;
                        no-map;
                };
 
-               c7x_0_memory_region: c7x-memory@a3100000 {
+               c7x_0_memory_region: memory@a3100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c7x_1_dma_memory_region: c7x-dma-memory@a4000000 {
+               c7x_1_dma_memory_region: memory@a4000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4000000 0x00 0x100000>;
                        no-map;
                };
 
-               c7x_1_memory_region: c7x-memory@a4100000 {
+               c7x_1_memory_region: memory@a4100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4100000 0x00 0xf00000>;
                        no-map;
                };
 
-               rtos_ipc_memory_region: ipc-memories@a5000000 {
+               rtos_ipc_memory_region: memory@a5000000 {
                        reg = <0x00 0xa5000000 0x00 0x1c00000>;
                        alignment = <0x1000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-am68-phycore-som.dtsi b/arch/arm64/boot/dts/ti/k3-am68-phycore-som.dtsi
index 383594732e81ca62d96ebb1f37e1c54358aa6314..b9c60e078d2105c407ceb4214d0008f404001509 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am68-phycore-som.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am68-phycore-som.dtsi
@@ -49,103 +49,103 @@
                        no-map;
                };
 
-               mcu_r5fss0_core0_dma_memory_region: r5f-dma-memory@a0000000 {
+               mcu_r5fss0_core0_dma_memory_region: memory@a0000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0000000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core0_memory_region: r5f-memory@a0100000 {
+               mcu_r5fss0_core0_memory_region: memory@a0100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0100000 0x00 0xf00000>;
                        no-map;
                };
 
-               mcu_r5fss0_core1_dma_memory_region: r5f-dma-memory@a1000000 {
+               mcu_r5fss0_core1_dma_memory_region: memory@a1000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1000000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core1_memory_region: r5f-memory@a1100000 {
+               mcu_r5fss0_core1_memory_region: memory@a1100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss0_core0_dma_memory_region: r5f-dma-memory@a2000000 {
+               main_r5fss0_core0_dma_memory_region: memory@a2000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core0_memory_region: r5f-memory@a2100000 {
+               main_r5fss0_core0_memory_region: memory@a2100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss0_core1_dma_memory_region: r5f-dma-memory@a3000000 {
+               main_r5fss0_core1_dma_memory_region: memory@a3000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core1_memory_region: r5f-memory@a3100000 {
+               main_r5fss0_core1_memory_region: memory@a3100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core0_dma_memory_region: r5f-dma-memory@a4000000 {
+               main_r5fss1_core0_dma_memory_region: memory@a4000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core0_memory_region: r5f-memory@a4100000 {
+               main_r5fss1_core0_memory_region: memory@a4100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core1_dma_memory_region: r5f-dma-memory@a5000000 {
+               main_r5fss1_core1_dma_memory_region: memory@a5000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa5000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core1_memory_region: r5f-memory@a5100000 {
+               main_r5fss1_core1_memory_region: memory@a5100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa5100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c71_0_dma_memory_region: c71-dma-memory@a6000000 {
+               c71_0_dma_memory_region: memory@a6000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa6000000 0x00 0x100000>;
                        no-map;
                };
 
-               c71_0_memory_region: c71-memory@a6100000 {
+               c71_0_memory_region: memory@a6100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa6100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c71_1_dma_memory_region: c71-dma-memory@a7000000 {
+               c71_1_dma_memory_region: memory@a7000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa7000000 0x00 0x100000>;
                        no-map;
                };
 
-               c71_1_memory_region: c71-memory@a7100000 {
+               c71_1_memory_region: memory@a7100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa7100000 0x00 0xf00000>;
                        no-map;
                };
 
-               rtos_ipc_memory_region: ipc-memories@a8000000 {
+               rtos_ipc_memory_region: memory@a8000000 {
                        reg = <0x00 0xa8000000 0x00 0x01c00000>;
                        alignment = <0x1000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi b/arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi
index 2d2edeeb7347eca50bf738f3cbe4b090e738b682..c423b1443e0c2489ac8d9f8506ab56b11d8ce870 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi
@@ -27,103 +27,103 @@
                        no-map;
                };
 
-               mcu_r5fss0_core0_dma_memory_region: r5f-dma-memory@a0000000 {
+               mcu_r5fss0_core0_dma_memory_region: memory@a0000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0000000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core0_memory_region: r5f-memory@a0100000 {
+               mcu_r5fss0_core0_memory_region: memory@a0100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0100000 0x00 0xf00000>;
                        no-map;
                };
 
-               mcu_r5fss0_core1_dma_memory_region: r5f-dma-memory@a1000000 {
+               mcu_r5fss0_core1_dma_memory_region: memory@a1000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1000000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core1_memory_region: r5f-memory@a1100000 {
+               mcu_r5fss0_core1_memory_region: memory@a1100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss0_core0_dma_memory_region: r5f-dma-memory@a2000000 {
+               main_r5fss0_core0_dma_memory_region: memory@a2000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core0_memory_region: r5f-memory@a2100000 {
+               main_r5fss0_core0_memory_region: memory@a2100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss0_core1_dma_memory_region: r5f-dma-memory@a3000000 {
+               main_r5fss0_core1_dma_memory_region: memory@a3000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core1_memory_region: r5f-memory@a3100000 {
+               main_r5fss0_core1_memory_region: memory@a3100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core0_dma_memory_region: r5f-dma-memory@a4000000 {
+               main_r5fss1_core0_dma_memory_region: memory@a4000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core0_memory_region: r5f-memory@a4100000 {
+               main_r5fss1_core0_memory_region: memory@a4100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core1_dma_memory_region: r5f-dma-memory@a5000000 {
+               main_r5fss1_core1_dma_memory_region: memory@a5000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa5000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core1_memory_region: r5f-memory@a5100000 {
+               main_r5fss1_core1_memory_region: memory@a5100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa5100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c71_0_dma_memory_region: c71-dma-memory@a6000000 {
+               c71_0_dma_memory_region: memory@a6000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa6000000 0x00 0x100000>;
                        no-map;
                };
 
-               c71_0_memory_region: c71-memory@a6100000 {
+               c71_0_memory_region: memory@a6100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa6100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c71_1_dma_memory_region: c71-dma-memory@a7000000 {
+               c71_1_dma_memory_region: memory@a7000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa7000000 0x00 0x100000>;
                        no-map;
                };
 
-               c71_1_memory_region: c71-memory@a7100000 {
+               c71_1_memory_region: memory@a7100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa7100000 0x00 0xf00000>;
                        no-map;
                };
 
-               rtos_ipc_memory_region: ipc-memories@a8000000 {
+               rtos_ipc_memory_region: memory@a8000000 {
                        reg = <0x00 0xa8000000 0x00 0x01c00000>;
                        alignment = <0x1000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-am69-sk.dts b/arch/arm64/boot/dts/ti/k3-am69-sk.dts
index af8eafc3f54a8ae71b2eeb050427331b7253cace..60817c1f310423122a8fa9fbf8587fa8aac7bd7c 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am69-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am69-sk.dts
@@ -49,145 +49,145 @@
                        no-map;
                };
 
-               mcu_r5fss0_core0_dma_memory_region: r5f-dma-memory@a0000000 {
+               mcu_r5fss0_core0_dma_memory_region: memory@a0000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0000000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core0_memory_region: r5f-memory@a0100000 {
+               mcu_r5fss0_core0_memory_region: memory@a0100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0100000 0x00 0xf00000>;
                        no-map;
                };
 
-               mcu_r5fss0_core1_dma_memory_region: r5f-dma-memory@a1000000 {
+               mcu_r5fss0_core1_dma_memory_region: memory@a1000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1000000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core1_memory_region: r5f-memory@a1100000 {
+               mcu_r5fss0_core1_memory_region: memory@a1100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss0_core0_dma_memory_region: r5f-dma-memory@a2000000 {
+               main_r5fss0_core0_dma_memory_region: memory@a2000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core0_memory_region: r5f-memory@a2100000 {
+               main_r5fss0_core0_memory_region: memory@a2100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss0_core1_dma_memory_region: r5f-dma-memory@a3000000 {
+               main_r5fss0_core1_dma_memory_region: memory@a3000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core1_memory_region: r5f-memory@a3100000 {
+               main_r5fss0_core1_memory_region: memory@a3100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core0_dma_memory_region: r5f-dma-memory@a4000000 {
+               main_r5fss1_core0_dma_memory_region: memory@a4000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core0_memory_region: r5f-memory@a4100000 {
+               main_r5fss1_core0_memory_region: memory@a4100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core1_dma_memory_region: r5f-dma-memory@a5000000 {
+               main_r5fss1_core1_dma_memory_region: memory@a5000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa5000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core1_memory_region: r5f-memory@a5100000 {
+               main_r5fss1_core1_memory_region: memory@a5100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa5100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss2_core0_dma_memory_region: r5f-dma-memory@a6000000 {
+               main_r5fss2_core0_dma_memory_region: memory@a6000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa6000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss2_core0_memory_region: r5f-memory@a6100000 {
+               main_r5fss2_core0_memory_region: memory@a6100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa6100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss2_core1_dma_memory_region: r5f-dma-memory@a7000000 {
+               main_r5fss2_core1_dma_memory_region: memory@a7000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa7000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss2_core1_memory_region: r5f-memory@a7100000 {
+               main_r5fss2_core1_memory_region: memory@a7100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa7100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c71_0_dma_memory_region: c71-dma-memory@a8000000 {
+               c71_0_dma_memory_region: memory@a8000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa8000000 0x00 0x100000>;
                        no-map;
                };
 
-               c71_0_memory_region: c71-memory@a8100000 {
+               c71_0_memory_region: memory@a8100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa8100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c71_1_dma_memory_region: c71-dma-memory@a9000000 {
+               c71_1_dma_memory_region: memory@a9000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa9000000 0x00 0x100000>;
                        no-map;
                };
 
-               c71_1_memory_region: c71-memory@a9100000 {
+               c71_1_memory_region: memory@a9100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa9100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c71_2_dma_memory_region: c71-dma-memory@aa000000 {
+               c71_2_dma_memory_region: memory@aa000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xaa000000 0x00 0x100000>;
                        no-map;
                };
 
-               c71_2_memory_region: c71-memory@aa100000 {
+               c71_2_memory_region: memory@aa100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xaa100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c71_3_dma_memory_region: c71-dma-memory@ab000000 {
+               c71_3_dma_memory_region: memory@ab000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xab000000 0x00 0x100000>;
                        no-map;
                };
 
-               c71_3_memory_region: c71-memory@ab100000 {
+               c71_3_memory_region: memory@ab100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xab100000 0x00 0xf00000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi b/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi
index 90befcdc8d08531333e038fabc91b9ef76648807..c689e417cf458464b47ddc6652c152d2509e8cc4 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi
@@ -29,55 +29,55 @@
                        no-map;
                };
 
-               mcu_r5fss0_core0_dma_memory_region: r5f-dma-memory@a0000000 {
+               mcu_r5fss0_core0_dma_memory_region: memory@a0000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0000000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core0_memory_region: r5f-memory@a0100000 {
+               mcu_r5fss0_core0_memory_region: memory@a0100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0100000 0x00 0xf00000>;
                        no-map;
                };
 
-               mcu_r5fss0_core1_dma_memory_region: r5f-dma-memory@a1000000 {
+               mcu_r5fss0_core1_dma_memory_region: memory@a1000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1000000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core1_memory_region: r5f-memory@a1100000 {
+               mcu_r5fss0_core1_memory_region: memory@a1100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss0_core0_dma_memory_region: r5f-dma-memory@a2000000 {
+               main_r5fss0_core0_dma_memory_region: memory@a2000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core0_memory_region: r5f-memory@a2100000 {
+               main_r5fss0_core0_memory_region: memory@a2100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss0_core1_dma_memory_region: r5f-dma-memory@a3000000 {
+               main_r5fss0_core1_dma_memory_region: memory@a3000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core1_memory_region: r5f-memory@a3100000 {
+               main_r5fss0_core1_memory_region: memory@a3100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3100000 0x00 0xf00000>;
                        no-map;
                };
 
-               rtos_ipc_memory_region: ipc-memories@a4000000 {
+               rtos_ipc_memory_region: memory@a4000000 {
                        reg = <0x00 0xa4000000 0x00 0x00800000>;
                        alignment = <0x1000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts b/arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts
index 0d1a313a7d103218915871cddbe4fb948d19314e..ac4d90e82aab513864542ae041c3d2a733ff3fca 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts
@@ -51,115 +51,115 @@
                        no-map;
                };
 
-               mcu_r5fss0_core0_dma_memory_region: r5f-dma-memory@a0000000 {
+               mcu_r5fss0_core0_dma_memory_region: memory@a0000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0000000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core0_memory_region: r5f-memory@a0100000 {
+               mcu_r5fss0_core0_memory_region: memory@a0100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0100000 0x00 0xf00000>;
                        no-map;
                };
 
-               mcu_r5fss0_core1_dma_memory_region: r5f-dma-memory@a1000000 {
+               mcu_r5fss0_core1_dma_memory_region: memory@a1000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1000000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core1_memory_region: r5f-memory@a1100000 {
+               mcu_r5fss0_core1_memory_region: memory@a1100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss0_core0_dma_memory_region: r5f-dma-memory@a2000000 {
+               main_r5fss0_core0_dma_memory_region: memory@a2000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core0_memory_region: r5f-memory@a2100000 {
+               main_r5fss0_core0_memory_region: memory@a2100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss0_core1_dma_memory_region: r5f-dma-memory@a3000000 {
+               main_r5fss0_core1_dma_memory_region: memory@a3000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core1_memory_region: r5f-memory@a3100000 {
+               main_r5fss0_core1_memory_region: memory@a3100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core0_dma_memory_region: r5f-dma-memory@a4000000 {
+               main_r5fss1_core0_dma_memory_region: memory@a4000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core0_memory_region: r5f-memory@a4100000 {
+               main_r5fss1_core0_memory_region: memory@a4100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core1_dma_memory_region: r5f-dma-memory@a5000000 {
+               main_r5fss1_core1_dma_memory_region: memory@a5000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa5000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core1_memory_region: r5f-memory@a5100000 {
+               main_r5fss1_core1_memory_region: memory@a5100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa5100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c66_0_dma_memory_region: c66-dma-memory@a6000000 {
+               c66_0_dma_memory_region: memory@a6000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa6000000 0x00 0x100000>;
                        no-map;
                };
 
-               c66_0_memory_region: c66-memory@a6100000 {
+               c66_0_memory_region: memory@a6100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa6100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c66_1_dma_memory_region: c66-dma-memory@a7000000 {
+               c66_1_dma_memory_region: memory@a7000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa7000000 0x00 0x100000>;
                        no-map;
                };
 
-               c66_1_memory_region: c66-memory@a7100000 {
+               c66_1_memory_region: memory@a7100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa7100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c71_0_dma_memory_region: c71-dma-memory@a8000000 {
+               c71_0_dma_memory_region: memory@a8000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa8000000 0x00 0x100000>;
                        no-map;
                };
 
-               c71_0_memory_region: c71-memory@a8100000 {
+               c71_0_memory_region: memory@a8100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa8100000 0x00 0xf00000>;
                        no-map;
                };
 
-               rtos_ipc_memory_region: ipc-memories@aa000000 {
+               rtos_ipc_memory_region: memory@aa000000 {
                        reg = <0x00 0xaa000000 0x00 0x01c00000>;
                        alignment = <0x1000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-sk.dts b/arch/arm64/boot/dts/ti/k3-j721e-sk.dts
index 62b9c13a91e704ff8c8018ab0f0a4640923a1345..0f05e65f7bf713c7a16eb593c100143cded1934f 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721e-sk.dts
@@ -48,115 +48,115 @@
                        no-map;
                };
 
-               mcu_r5fss0_core0_dma_memory_region: r5f-dma-memory@a0000000 {
+               mcu_r5fss0_core0_dma_memory_region: memory@a0000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0000000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core0_memory_region: r5f-memory@a0100000 {
+               mcu_r5fss0_core0_memory_region: memory@a0100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0100000 0x00 0xf00000>;
                        no-map;
                };
 
-               mcu_r5fss0_core1_dma_memory_region: r5f-dma-memory@a1000000 {
+               mcu_r5fss0_core1_dma_memory_region: memory@a1000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1000000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core1_memory_region: r5f-memory@a1100000 {
+               mcu_r5fss0_core1_memory_region: memory@a1100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss0_core0_dma_memory_region: r5f-dma-memory@a2000000 {
+               main_r5fss0_core0_dma_memory_region: memory@a2000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core0_memory_region: r5f-memory@a2100000 {
+               main_r5fss0_core0_memory_region: memory@a2100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss0_core1_dma_memory_region: r5f-dma-memory@a3000000 {
+               main_r5fss0_core1_dma_memory_region: memory@a3000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core1_memory_region: r5f-memory@a3100000 {
+               main_r5fss0_core1_memory_region: memory@a3100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core0_dma_memory_region: r5f-dma-memory@a4000000 {
+               main_r5fss1_core0_dma_memory_region: memory@a4000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core0_memory_region: r5f-memory@a4100000 {
+               main_r5fss1_core0_memory_region: memory@a4100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core1_dma_memory_region: r5f-dma-memory@a5000000 {
+               main_r5fss1_core1_dma_memory_region: memory@a5000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa5000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core1_memory_region: r5f-memory@a5100000 {
+               main_r5fss1_core1_memory_region: memory@a5100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa5100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c66_0_dma_memory_region: c66-dma-memory@a6000000 {
+               c66_0_dma_memory_region: memory@a6000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa6000000 0x00 0x100000>;
                        no-map;
                };
 
-               c66_0_memory_region: c66-memory@a6100000 {
+               c66_0_memory_region: memory@a6100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa6100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c66_1_dma_memory_region: c66-dma-memory@a7000000 {
+               c66_1_dma_memory_region: memory@a7000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa7000000 0x00 0x100000>;
                        no-map;
                };
 
-               c66_1_memory_region: c66-memory@a7100000 {
+               c66_1_memory_region: memory@a7100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa7100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c71_0_dma_memory_region: c71-dma-memory@a8000000 {
+               c71_0_dma_memory_region: memory@a8000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa8000000 0x00 0x100000>;
                        no-map;
                };
 
-               c71_0_memory_region: c71-memory@a8100000 {
+               c71_0_memory_region: memory@a8100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa8100000 0x00 0xf00000>;
                        no-map;
                };
 
-               rtos_ipc_memory_region: ipc-memories@aa000000 {
+               rtos_ipc_memory_region: memory@aa000000 {
                        reg = <0x00 0xaa000000 0x00 0x01c00000>;
                        alignment = <0x1000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi
index 795b041ee733d15ad32c7a4c74ae0af45aa5821c..06388f28d122b8f1b8a86ed099c523749bbfbbfb 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi
@@ -29,115 +29,115 @@
                        no-map;
                };
 
-               mcu_r5fss0_core0_dma_memory_region: r5f-dma-memory@a0000000 {
+               mcu_r5fss0_core0_dma_memory_region: memory@a0000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0000000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core0_memory_region: r5f-memory@a0100000 {
+               mcu_r5fss0_core0_memory_region: memory@a0100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0100000 0x00 0xf00000>;
                        no-map;
                };
 
-               mcu_r5fss0_core1_dma_memory_region: r5f-dma-memory@a1000000 {
+               mcu_r5fss0_core1_dma_memory_region: memory@a1000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1000000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core1_memory_region: r5f-memory@a1100000 {
+               mcu_r5fss0_core1_memory_region: memory@a1100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss0_core0_dma_memory_region: r5f-dma-memory@a2000000 {
+               main_r5fss0_core0_dma_memory_region: memory@a2000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core0_memory_region: r5f-memory@a2100000 {
+               main_r5fss0_core0_memory_region: memory@a2100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss0_core1_dma_memory_region: r5f-dma-memory@a3000000 {
+               main_r5fss0_core1_dma_memory_region: memory@a3000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core1_memory_region: r5f-memory@a3100000 {
+               main_r5fss0_core1_memory_region: memory@a3100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core0_dma_memory_region: r5f-dma-memory@a4000000 {
+               main_r5fss1_core0_dma_memory_region: memory@a4000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core0_memory_region: r5f-memory@a4100000 {
+               main_r5fss1_core0_memory_region: memory@a4100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core1_dma_memory_region: r5f-dma-memory@a5000000 {
+               main_r5fss1_core1_dma_memory_region: memory@a5000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa5000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core1_memory_region: r5f-memory@a5100000 {
+               main_r5fss1_core1_memory_region: memory@a5100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa5100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c66_1_dma_memory_region: c66-dma-memory@a6000000 {
+               c66_1_dma_memory_region: memory@a6000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa6000000 0x00 0x100000>;
                        no-map;
                };
 
-               c66_0_memory_region: c66-memory@a6100000 {
+               c66_0_memory_region: memory@a6100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa6100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c66_0_dma_memory_region: c66-dma-memory@a7000000 {
+               c66_0_dma_memory_region: memory@a7000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa7000000 0x00 0x100000>;
                        no-map;
                };
 
-               c66_1_memory_region: c66-memory@a7100000 {
+               c66_1_memory_region: memory@a7100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa7100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c71_0_dma_memory_region: c71-dma-memory@a8000000 {
+               c71_0_dma_memory_region: memory@a8000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa8000000 0x00 0x100000>;
                        no-map;
                };
 
-               c71_0_memory_region: c71-memory@a8100000 {
+               c71_0_memory_region: memory@a8100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa8100000 0x00 0xf00000>;
                        no-map;
                };
 
-               rtos_ipc_memory_region: ipc-memories@aa000000 {
+               rtos_ipc_memory_region: memory@aa000000 {
                        reg = <0x00 0xaa000000 0x00 0x01c00000>;
                        alignment = <0x1000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi
index f252007262d3cb292fb7a3afec807fc4e7a54812..ff5264d4c2da5098131eb6b4004ff6371272645c 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi
@@ -31,103 +31,103 @@
                        no-map;
                };
 
-               mcu_r5fss0_core0_dma_memory_region: r5f-dma-memory@a0000000 {
+               mcu_r5fss0_core0_dma_memory_region: memory@a0000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0000000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core0_memory_region: r5f-memory@a0100000 {
+               mcu_r5fss0_core0_memory_region: memory@a0100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0100000 0x00 0xf00000>;
                        no-map;
                };
 
-               mcu_r5fss0_core1_dma_memory_region: r5f-dma-memory@a1000000 {
+               mcu_r5fss0_core1_dma_memory_region: memory@a1000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1000000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core1_memory_region: r5f-memory@a1100000 {
+               mcu_r5fss0_core1_memory_region: memory@a1100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss0_core0_dma_memory_region: r5f-dma-memory@a2000000 {
+               main_r5fss0_core0_dma_memory_region: memory@a2000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core0_memory_region: r5f-memory@a2100000 {
+               main_r5fss0_core0_memory_region: memory@a2100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss0_core1_dma_memory_region: r5f-dma-memory@a3000000 {
+               main_r5fss0_core1_dma_memory_region: memory@a3000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core1_memory_region: r5f-memory@a3100000 {
+               main_r5fss0_core1_memory_region: memory@a3100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core0_dma_memory_region: r5f-dma-memory@a4000000 {
+               main_r5fss1_core0_dma_memory_region: memory@a4000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core0_memory_region: r5f-memory@a4100000 {
+               main_r5fss1_core0_memory_region: memory@a4100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core1_dma_memory_region: r5f-dma-memory@a5000000 {
+               main_r5fss1_core1_dma_memory_region: memory@a5000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa5000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core1_memory_region: r5f-memory@a5100000 {
+               main_r5fss1_core1_memory_region: memory@a5100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa5100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c71_0_dma_memory_region: c71-dma-memory@a6000000 {
+               c71_0_dma_memory_region: memory@a6000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa6000000 0x00 0x100000>;
                        no-map;
                };
 
-               c71_0_memory_region: c71-memory@a6100000 {
+               c71_0_memory_region: memory@a6100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa6100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c71_1_dma_memory_region: c71-dma-memory@a7000000 {
+               c71_1_dma_memory_region: memory@a7000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa7000000 0x00 0x100000>;
                        no-map;
                };
 
-               c71_1_memory_region: c71-memory@a7100000 {
+               c71_1_memory_region: memory@a7100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa7100000 0x00 0xf00000>;
                        no-map;
                };
 
-               rtos_ipc_memory_region: ipc-memories@a8000000 {
+               rtos_ipc_memory_region: memory@a8000000 {
                        reg = <0x00 0xa8000000 0x00 0x01c00000>;
                        alignment = <0x1000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-j722s-evm.dts b/arch/arm64/boot/dts/ti/k3-j722s-evm.dts
index 2b9e007432a908329e7bc8881aa358b409e4e455..d323284a30abd7e77f1a1c4fc4c64b9072234eda 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j722s-evm.dts
+++ b/arch/arm64/boot/dts/ti/k3-j722s-evm.dts
@@ -52,67 +52,67 @@
                        no-map;
                };
 
-               wkup_r5fss0_core0_dma_memory_region: r5f-dma-memory@a0000000 {
+               wkup_r5fss0_core0_dma_memory_region: memory@a0000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0000000 0x00 0x100000>;
                        no-map;
                };
 
-               wkup_r5fss0_core0_memory_region: r5f-memory@a0100000 {
+               wkup_r5fss0_core0_memory_region: memory@a0100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0100000 0x00 0xf00000>;
                        no-map;
                };
 
-               mcu_r5fss0_core0_dma_memory_region: mcu-r5fss-dma-memory-region@a1000000 {
+               mcu_r5fss0_core0_dma_memory_region: memory@a1000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1000000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core0_memory_region: mcu-r5fss-memory-region@a1100000 {
+               mcu_r5fss0_core0_memory_region: memory@a1100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss0_core0_dma_memory_region: main-r5fss-dma-memory-region@a2000000 {
+               main_r5fss0_core0_dma_memory_region: memory@a2000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core0_memory_region: main-r5fss-memory-region@a2100000 {
+               main_r5fss0_core0_memory_region: memory@a2100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c7x_0_dma_memory_region: c7x-dma-memory@a3000000 {
+               c7x_0_dma_memory_region: memory@a3000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3000000 0x00 0x100000>;
                        no-map;
                };
 
-               c7x_0_memory_region: c7x-memory@a3100000 {
+               c7x_0_memory_region: memory@a3100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c7x_1_dma_memory_region: c7x-dma-memory@a4000000 {
+               c7x_1_dma_memory_region: memory@a4000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4000000 0x00 0x100000>;
                        no-map;
                };
 
-               c7x_1_memory_region: c7x-memory@a4100000 {
+               c7x_1_memory_region: memory@a4100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4100000 0x00 0xf00000>;
                        no-map;
                };
 
-               rtos_ipc_memory_region: ipc-memories@a5000000 {
+               rtos_ipc_memory_region: memory@a5000000 {
                        reg = <0x00 0xa5000000 0x00 0x1c00000>;
                        alignment = <0x1000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-j784s4-evm.dts b/arch/arm64/boot/dts/ti/k3-j784s4-evm.dts
index a84bde08f85e4a2d3ec6d66625c5cbaa63e1a210..2ed1ec6d53c880b66780034a1706a825efacfd4d 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j784s4-evm.dts
+++ b/arch/arm64/boot/dts/ti/k3-j784s4-evm.dts
@@ -28,13 +28,13 @@
                #address-cells = <2>;
                #size-cells = <2>;
 
-               c71_3_dma_memory_region: c71-dma-memory@ab000000 {
+               c71_3_dma_memory_region: memory@ab000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xab000000 0x00 0x100000>;
                        no-map;
                };
 
-               c71_3_memory_region: c71-memory@ab100000 {
+               c71_3_memory_region: memory@ab100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xab100000 0x00 0xf00000>;
                        no-map;

diff --git a/arch/arm64/boot/dts/ti/k3-j784s4-j742s2-evm-common.dtsi b/arch/arm64/boot/dts/ti/k3-j784s4-j742s2-evm-common.dtsi
index c269e5b29b969452d8daafecb54559e07c508630..fdde1bd0e8316a92a9aa599baf89ca9e128cf8ad 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j784s4-j742s2-evm-common.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j784s4-j742s2-evm-common.dtsi
@@ -35,133 +35,133 @@
                        no-map;
                };
 
-               mcu_r5fss0_core0_dma_memory_region: r5f-dma-memory@a0000000 {
+               mcu_r5fss0_core0_dma_memory_region: memory@a0000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0000000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core0_memory_region: r5f-memory@a0100000 {
+               mcu_r5fss0_core0_memory_region: memory@a0100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa0100000 0x00 0xf00000>;
                        no-map;
                };
 
-               mcu_r5fss0_core1_dma_memory_region: r5f-dma-memory@a1000000 {
+               mcu_r5fss0_core1_dma_memory_region: memory@a1000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1000000 0x00 0x100000>;
                        no-map;
                };
 
-               mcu_r5fss0_core1_memory_region: r5f-memory@a1100000 {
+               mcu_r5fss0_core1_memory_region: memory@a1100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa1100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss0_core0_dma_memory_region: r5f-dma-memory@a2000000 {
+               main_r5fss0_core0_dma_memory_region: memory@a2000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core0_memory_region: r5f-memory@a2100000 {
+               main_r5fss0_core0_memory_region: memory@a2100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa2100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss0_core1_dma_memory_region: r5f-dma-memory@a3000000 {
+               main_r5fss0_core1_dma_memory_region: memory@a3000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss0_core1_memory_region: r5f-memory@a3100000 {
+               main_r5fss0_core1_memory_region: memory@a3100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa3100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core0_dma_memory_region: r5f-dma-memory@a4000000 {
+               main_r5fss1_core0_dma_memory_region: memory@a4000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core0_memory_region: r5f-memory@a4100000 {
+               main_r5fss1_core0_memory_region: memory@a4100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa4100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss1_core1_dma_memory_region: r5f-dma-memory@a5000000 {
+               main_r5fss1_core1_dma_memory_region: memory@a5000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa5000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss1_core1_memory_region: r5f-memory@a5100000 {
+               main_r5fss1_core1_memory_region: memory@a5100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa5100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss2_core0_dma_memory_region: r5f-dma-memory@a6000000 {
+               main_r5fss2_core0_dma_memory_region: memory@a6000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa6000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss2_core0_memory_region: r5f-memory@a6100000 {
+               main_r5fss2_core0_memory_region: memory@a6100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa6100000 0x00 0xf00000>;
                        no-map;
                };
 
-               main_r5fss2_core1_dma_memory_region: r5f-dma-memory@a7000000 {
+               main_r5fss2_core1_dma_memory_region: memory@a7000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa7000000 0x00 0x100000>;
                        no-map;
                };
 
-               main_r5fss2_core1_memory_region: r5f-memory@a7100000 {
+               main_r5fss2_core1_memory_region: memory@a7100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa7100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c71_0_dma_memory_region: c71-dma-memory@a8000000 {
+               c71_0_dma_memory_region: memory@a8000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa8000000 0x00 0x100000>;
                        no-map;
                };
 
-               c71_0_memory_region: c71-memory@a8100000 {
+               c71_0_memory_region: memory@a8100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa8100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c71_1_dma_memory_region: c71-dma-memory@a9000000 {
+               c71_1_dma_memory_region: memory@a9000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa9000000 0x00 0x100000>;
                        no-map;
                };
 
-               c71_1_memory_region: c71-memory@a9100000 {
+               c71_1_memory_region: memory@a9100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xa9100000 0x00 0xf00000>;
                        no-map;
                };
 
-               c71_2_dma_memory_region: c71-dma-memory@aa000000 {
+               c71_2_dma_memory_region: memory@aa000000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xaa000000 0x00 0x100000>;
                        no-map;
                };
 
-               c71_2_memory_region: c71-memory@aa100000 {
+               c71_2_memory_region: memory@aa100000 {
                        compatible = "shared-dma-pool";
                        reg = <0x00 0xaa100000 0x00 0xf00000>;
                        no-map;