diff --git a/subsys/mpsl/pm/Kconfig b/subsys/mpsl/pm/Kconfig index f4125e82bdfa..490e61cc43b1 100644 --- a/subsys/mpsl/pm/Kconfig +++ b/subsys/mpsl/pm/Kconfig @@ -9,5 +9,6 @@ config MPSL_USE_ZEPHYR_PM depends on SOC_SERIES_NRF54HX depends on MPSL depends on PM + default y help This option configures MPSL to use Zephyr's Power Management. diff --git a/subsys/mpsl/pm/mpsl_pm_utils.c b/subsys/mpsl/pm/mpsl_pm_utils.c index 04a81bcfa4c9..156e8bf5e168 100644 --- a/subsys/mpsl/pm/mpsl_pm_utils.c +++ b/subsys/mpsl/pm/mpsl_pm_utils.c @@ -21,7 +21,8 @@ LOG_MODULE_REGISTER(mpsl_pm_utils, CONFIG_MPSL_LOG_LEVEL); * margins and allow optimal power savings. */ #define TIME_TO_REGISTER_EVENT_IN_ZEPHYR_US 1000 -#define PM_MAX_LATENCY_HCI_COMMANDS_US 499999 +/* depends on min-residency-us of idle RAM not retained*/ +#define PM_MAX_LATENCY_HCI_COMMANDS_US (1000 - 1) static void m_work_handler(struct k_work *work); static K_WORK_DELAYABLE_DEFINE(pm_work, m_work_handler); diff --git a/tests/subsys/mpsl/pm/pm_test.c b/tests/subsys/mpsl/pm/pm_test.c index 0c9339abc522..5554281ca8c0 100644 --- a/tests/subsys/mpsl/pm/pm_test.c +++ b/tests/subsys/mpsl/pm/pm_test.c @@ -18,7 +18,7 @@ #include -#define PM_MAX_LATENCY_HCI_COMMANDS_US 499999 +#define PM_MAX_LATENCY_HCI_COMMANDS_US (1000 - 1) #define TIME_TO_REGISTER_EVENT_IN_ZEPHYR_US 1000 diff --git a/west.yml b/west.yml index 5bec1df24b4f..f41bdb8177ef 100644 --- a/west.yml +++ b/west.yml @@ -69,7 +69,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 8bc628d8945cb7bb01f57c92c00b5f1550ed576c + revision: pull/2290/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above