From 27737924905aadb473c83659feff2fe1a970837a Mon Sep 17 00:00:00 2001 From: Kamil Gawor Date: Mon, 15 Apr 2024 11:52:36 +0200 Subject: [PATCH] boards: nordic: nrf54h20dk: Change IPC default backend Change IPC backend between Application and Radio core to icbmsg which is more future proof than legacy icmsg_me backend. Signed-off-by: Kamil Gawor --- boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf.dtsi | 1 + boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts | 3 ++- boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf.dtsi index abe93b34ba9..944dd7fb6ab 100644 --- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf.dtsi +++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf.dtsi @@ -21,6 +21,7 @@ }; cpuapp_cpurad_ipc: ipc-2-3 { + compatible = "zephyr,ipc-icbmsg"; status = "disabled"; mboxes = <&cpuapp_bellboard 18>, <&cpurad_bellboard 12>; diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts index 60e872141ba..59e10976561 100644 --- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts +++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts @@ -112,10 +112,11 @@ }; &cpuapp_cpurad_ipc { - compatible = "zephyr,ipc-icmsg-me-initiator"; mbox-names = "rx", "tx"; tx-region = <&cpuapp_cpurad_ipc_shm>; rx-region = <&cpurad_cpuapp_ipc_shm>; + tx-blocks = <32>; + rx-blocks = <32>; }; &cpuapp_cpusys_ipc { diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts index 4cfeb3dbe9b..1507a78b0a1 100644 --- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts +++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts @@ -46,10 +46,11 @@ }; &cpuapp_cpurad_ipc { - compatible = "zephyr,ipc-icmsg-me-follower"; mbox-names = "tx", "rx"; tx-region = <&cpurad_cpuapp_ipc_shm>; rx-region = <&cpuapp_cpurad_ipc_shm>; + tx-blocks = <32>; + rx-blocks = <32>; }; &cpurad_cpusys_ipc {