boards: nrf53: switch to the network CPU management API
Switch to the network CPU management API from direct nrfx calls.
Signed-off-by: Jędrzej Ciupis <jedrzej.ciupis@nordicsemi.no>
diff --git a/boards/lairdconnect/bl5340_dvk/bl5340_dvk_nrf5340_cpunet_reset.c b/boards/lairdconnect/bl5340_dvk/bl5340_dvk_nrf5340_cpunet_reset.c
index 49c0e5a..c4f3946 100644
--- a/boards/lairdconnect/bl5340_dvk/bl5340_dvk_nrf5340_cpunet_reset.c
+++ b/boards/lairdconnect/bl5340_dvk/bl5340_dvk_nrf5340_cpunet_reset.c
@@ -10,7 +10,7 @@
#include <zephyr/logging/log.h>
#include <soc.h>
-#include <hal/nrf_reset.h>
+#include <nrf53_cpunet_mgmt.h>
LOG_MODULE_REGISTER(bl5340_dvk_cpuapp, CONFIG_LOG_DEFAULT_LEVEL);
@@ -50,7 +50,7 @@
*/
/* Release the Network MCU, 'Release force off signal' */
- nrf_reset_network_force_off(NRF_RESET, false);
+ nrf53_cpunet_enable(true);
LOG_DBG("Network MCU released.");
#endif /* !CONFIG_TRUSTED_EXECUTION_SECURE */
diff --git a/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_cpunet_reset.c b/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_cpunet_reset.c
index f9082e6..3d08a5d 100644
--- a/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_cpunet_reset.c
+++ b/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_cpunet_reset.c
@@ -9,7 +9,7 @@
#include <zephyr/logging/log.h>
#include <soc.h>
-#include <hal/nrf_reset.h>
+#include <nrf53_cpunet_mgmt.h>
#include <hal/nrf_gpiote.h>
LOG_MODULE_REGISTER(nrf5340_audio_dk_nrf5340_cpuapp, CONFIG_LOG_DEFAULT_LEVEL);
@@ -71,7 +71,7 @@
*/
/* Release the Network MCU, 'Release force off signal' */
- nrf_reset_network_force_off(NRF_RESET, false);
+ nrf53_cpunet_enable(true);
LOG_DBG("Network MCU released.");
#endif /* !CONFIG_TRUSTED_EXECUTION_SECURE */
diff --git a/boards/nordic/nrf5340dk/nrf5340_cpunet_reset.c b/boards/nordic/nrf5340dk/nrf5340_cpunet_reset.c
index dadba8c..3b85d55 100644
--- a/boards/nordic/nrf5340dk/nrf5340_cpunet_reset.c
+++ b/boards/nordic/nrf5340dk/nrf5340_cpunet_reset.c
@@ -9,7 +9,7 @@
#include <zephyr/logging/log.h>
#include <soc.h>
-#include <hal/nrf_reset.h>
+#include <nrf53_cpunet_mgmt.h>
LOG_MODULE_REGISTER(nrf5340dk_nrf5340_cpuapp, CONFIG_LOG_DEFAULT_LEVEL);
@@ -49,7 +49,7 @@
*/
/* Release the Network MCU, 'Release force off signal' */
- nrf_reset_network_force_off(NRF_RESET, false);
+ nrf53_cpunet_enable(true);
LOG_DBG("Network MCU released.");
#endif /* !CONFIG_TRUSTED_EXECUTION_SECURE */
diff --git a/boards/nordic/thingy53/board.c b/boards/nordic/thingy53/board.c
index 67059bd..491808f 100644
--- a/boards/nordic/thingy53/board.c
+++ b/boards/nordic/thingy53/board.c
@@ -8,7 +8,7 @@
#include <zephyr/kernel.h>
#include <zephyr/logging/log.h>
#include <soc.h>
-#include <hal/nrf_reset.h>
+#include <nrf53_cpunet_mgmt.h>
LOG_MODULE_REGISTER(thingy53_board_init);
@@ -52,7 +52,7 @@
*/
/* Release the Network MCU, 'Release force off signal' */
- nrf_reset_network_force_off(NRF_RESET, false);
+ nrf53_cpunet_enable(true);
LOG_DBG("Network MCU released.");
#endif /* !CONFIG_TRUSTED_EXECUTION_SECURE */
diff --git a/boards/panasonic/pan1783/pan1783_nrf5340_cpunet_reset.c b/boards/panasonic/pan1783/pan1783_nrf5340_cpunet_reset.c
index bf0626c..cd8281c 100644
--- a/boards/panasonic/pan1783/pan1783_nrf5340_cpunet_reset.c
+++ b/boards/panasonic/pan1783/pan1783_nrf5340_cpunet_reset.c
@@ -9,7 +9,7 @@
#include <zephyr/logging/log.h>
#include <soc.h>
-#include <hal/nrf_reset.h>
+#include <nrf53_cpunet_mgmt.h>
#if defined(CONFIG_BOARD_PAN1783_EVB_NRF5340_CPUAPP)
LOG_MODULE_REGISTER(pan1783_evb_cpuapp, CONFIG_LOG_DEFAULT_LEVEL);
@@ -42,7 +42,7 @@
remoteproc_mgr_config();
/* Release the Network MCU, 'Release force off signal' */
- nrf_reset_network_force_off(NRF_RESET, false);
+ nrf53_cpunet_enable(true);
LOG_DBG("Network MCU released.");
diff --git a/drivers/bluetooth/hci/nrf53_support.c b/drivers/bluetooth/hci/nrf53_support.c
index 995586e..2d0f64a 100644
--- a/drivers/bluetooth/hci/nrf53_support.c
+++ b/drivers/bluetooth/hci/nrf53_support.c
@@ -6,7 +6,7 @@
#include <soc.h>
#include <zephyr/device.h>
-#include <hal/nrf_reset.h>
+#include <nrf53_cpunet_mgmt.h>
#if defined(CONFIG_BT_CTLR_DEBUG_PINS_CPUAPP)
#include <../subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/debug.h>
#else
@@ -21,7 +21,7 @@
{
ARG_UNUSED(dev);
/* Put the Network MCU in Forced-OFF mode. */
- nrf_reset_network_force_off(NRF_RESET, true);
+ nrf53_cpunet_enable(false);
LOG_DBG("Network MCU placed in Forced-OFF mode");
return 0;
@@ -43,7 +43,7 @@
#endif /* !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) */
/* Release the Network MCU, 'Release force off signal' */
- nrf_reset_network_force_off(NRF_RESET, false);
+ nrf53_cpunet_enable(true);
return 0;
}
diff --git a/samples/subsys/ipc/ipc_service/icmsg/src/main.c b/samples/subsys/ipc/ipc_service/icmsg/src/main.c
index 3500b47..d10fa6c 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/src/main.c
+++ b/samples/subsys/ipc/ipc_service/icmsg/src/main.c
@@ -8,7 +8,7 @@
#include <zephyr/device.h>
#include <zephyr/ipc/ipc_service.h>
-#include <hal/nrf_reset.h>
+#include <nrf53_cpunet_mgmt.h>
#include <string.h>
#include "common.h"
@@ -130,7 +130,7 @@
k_msleep(500);
LOG_INF("Stop network core");
- nrf_reset_network_force_off(NRF_RESET, true);
+ nrf53_cpunet_enable(false);
LOG_INF("Reset IPC service");
@@ -158,7 +158,7 @@
}
LOG_INF("Run network core");
- nrf_reset_network_force_off(NRF_RESET, false);
+ nrf53_cpunet_enable(true);
k_sem_take(&bound_sem, K_FOREVER);
