meta-xilinx-core: openamp: device-tree: Add separate RPU1 IPI Mailbox node

Add separate IPI Mailbox node for Versal NET and ZynqMP Platforms.

Remoteproc driver expects separate IPI Mailbox node for each remoteproc instance.

Signed-off-by: Ben Levinsky <ben.levinsky@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

2 files changed, 27 insertions, 8 deletions

diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/versal-net-openamp.dtsi b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/versal-net-openamp.dtsi
index 5aa73798..c0896a6b 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/versal-net-openamp.dtsi
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/versal-net-openamp.dtsi
@@ -146,5 +146,15 @@
                         #mbox-cells = <0x01>;
                         xlnx,ipi-id = <0x03>;
                 };
+                /* APU<->RPU1 IPI mailbox controller */
+                ipi_mailbox_rpu1: mailbox@eb3f0b00{
+                        reg = <0xeb3f0b00 0x20 0xeb3f0b20 0x20 0xeb3f0940 0x20 0xeb3f0960 0x20>;
+                        reg-names = "local_request_region",
+                                    "local_response_region",
+                                    "remote_request_region",
+                                    "remote_response_region";
+                        #mbox-cells = <0x01>;
+                        xlnx,ipi-id = <0x04>;
+                };
         };
 };
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/zynqmp-openamp.dtsi b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/zynqmp-openamp.dtsi
index d0040ee3..55949e64 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/zynqmp-openamp.dtsi
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/zynqmp-openamp.dtsi
@@ -132,16 +132,25 @@
                         #mbox-cells = <1>;
                         xlnx,ipi-id = <1>;
                 };
+        };
+        zynqmp_ipi2 {
+                compatible = "xlnx,zynqmp-ipi-mailbox";
+                interrupt-parent = <&gic>;
+                interrupts = <0 30 4>;
+                xlnx,ipi-id = <8>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
                 /* APU<->RPU1 IPI mailbox controller */
-                ipi_mailbox_rpu1: mailbox@ff990640 {
-                        reg = <0xff990640 0x20>,
-                              <0xff990660 0x20>,
-                              <0xff9902c0 0x20>,
-                              <0xff9902e0 0x20>;
+                ipi_mailbox_rpu1: mailbox@ff3f0b00 {
+                        reg = <0xff3f0b00 0x20>,
+                                <0xff3f0b20 0x20>,
+                                <0xff3f0940 0x20>,
+                                <0xff3f0960 0x20>;
                         reg-names = "local_request_region",
-                                    "local_response_region",
-                                    "remote_request_region",
-                                    "remote_response_region";
+                                "local_response_region",
+                                "remote_request_region",
+                                "remote_response_region";
                         #mbox-cells = <1>;
                         xlnx,ipi-id = <2>;
                 };