all: Remove CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n

Module has been removed and replaced with API for requesting no MRAM latency. By default MRAM latency is enabled and it needs to be explicitly enabled. When Bluetooth is enabled then no MRAM latency is enforced like it used to be. Signed-off-by: Krzysztof Chruściński <[email protected]>
nrfconnect · Dec 6, 2024 · 10edacd · 10edacd
1 parent f4c121f
commit 10edacd
Show file tree

Hide file tree

Showing 47 changed files with 7 additions and 53 deletions.
diff --git a/samples/suit/flash_companion/prj.conf b/samples/suit/flash_companion/prj.conf
@@ -20,9 +20,8 @@ CONFIG_FLASH=y
 # Disable power management
 CONFIG_PM=n
 
-# Disable GPD service, MRAM latency service and NRFS
+# Disable GPD service and NRFS
 CONFIG_SOC_NRF54H20_GPD=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 CONFIG_NRFS=n
 
 # Disable unneeded interrupt features

diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig
@@ -44,7 +44,8 @@ config BT_LL_SOFTDEVICE
 	select BT_CTLR_LE_PATH_LOSS_MONITORING_SUPPORT
 	select BT_CTLR_SUBRATING_SUPPORT
 	select BT_LL_SOFTDEVICE_HEADERS_INCLUDE
-	select SOC_NRF54H20_NO_MRAM_LATENCY if SOC_NRF54H20_CPURAD
+	select MRAM_LATENCY if SOC_NRF54H20_CPURAD
+	select MRAM_LATENCY_AUTO_REQ if SOC_NRF54H20_CPURAD
 	depends on (SOC_SERIES_BSIM_NRFXX || SOC_SERIES_NRF52X || SOC_COMPATIBLE_NRF5340_CPUNET ||\
 			    SOC_NRF54H20_CPURAD || SOC_SERIES_NRF54LX)
 	depends on DT_HAS_NORDIC_BT_HCI_SDC_ENABLED

diff --git a/tests/benchmarks/current_consumption/nfc_idle/testcase.yaml b/tests/benchmarks/current_consumption/nfc_idle/testcase.yaml
@@ -25,7 +25,6 @@ tests:
       - CONFIG_PM_S2RAM=y
       - CONFIG_PM_S2RAM_CUSTOM_MARKING=y
       - CONFIG_BOOT_BANNER=n
-      - CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
     harness: pytest
     harness_config:
       fixture: ppk_power_measure

diff --git a/tests/benchmarks/multicore/idle/testcase.yaml b/tests/benchmarks/multicore/idle/testcase.yaml
@@ -72,10 +72,9 @@ tests:
       CONFIG_FIRST_SLEEP_OFFSET=y
       CONFIG_PM=y CONFIG_PM_S2RAM=y CONFIG_POWEROFF=y CONFIG_PM_S2RAM_CUSTOM_MARKING=y
       CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_GPIO=n CONFIG_BOOT_BANNER=n
-      CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
       remote_CONFIG_PM=y remote_CONFIG_POWEROFF=y remote_CONFIG_CONSOLE=n
       remote_CONFIG_UART_CONSOLE=n remote_CONFIG_SERIAL=n remote_CONFIG_GPIO=n
-      remote_CONFIG_BOOT_BANNER=n remote_CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
+      remote_CONFIG_BOOT_BANNER=n
     harness: pytest
     harness_config:
       fixture: ppk_power_measure
@@ -93,10 +92,9 @@ tests:
       CONFIG_FIRST_SLEEP_OFFSET=y
       CONFIG_PM=y CONFIG_PM_S2RAM=y CONFIG_POWEROFF=y CONFIG_PM_S2RAM_CUSTOM_MARKING=y
       CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_GPIO=n CONFIG_BOOT_BANNER=n
-      CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
       remote_CONFIG_PM=y remote_CONFIG_POWEROFF=y remote_CONFIG_CONSOLE=n
       remote_CONFIG_UART_CONSOLE=n remote_CONFIG_SERIAL=n remote_CONFIG_GPIO=n
-      remote_CONFIG_BOOT_BANNER=n remote_CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
+      remote_CONFIG_BOOT_BANNER=n
       DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_ram_high_usage.overlay"
     harness: pytest
     harness_config:
@@ -115,10 +113,9 @@ tests:
       CONFIG_FIRST_SLEEP_OFFSET=y
       CONFIG_PM=y CONFIG_PM_S2RAM=y CONFIG_POWEROFF=y CONFIG_PM_S2RAM_CUSTOM_MARKING=y
       CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_GPIO=n CONFIG_BOOT_BANNER=n
-      CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
       remote_CONFIG_PM=y remote_CONFIG_POWEROFF=y remote_CONFIG_CONSOLE=n
       remote_CONFIG_UART_CONSOLE=n remote_CONFIG_SERIAL=n remote_CONFIG_GPIO=n
-      remote_CONFIG_BOOT_BANNER=n remote_CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
+      remote_CONFIG_BOOT_BANNER=n
       DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_ram_low_usage.overlay"
     harness: pytest
     harness_config:

diff --git a/tests/benchmarks/multicore/idle_adc/prj.conf b/tests/benchmarks/multicore/idle_adc/prj.conf
@@ -8,7 +8,6 @@ CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_POWEROFF=y
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 CONFIG_ASSERT=y
 
 # Enable for debugging purposes only

diff --git a/tests/benchmarks/multicore/idle_adc/remote/prj.conf b/tests/benchmarks/multicore/idle_adc/remote/prj.conf
@@ -5,4 +5,3 @@ CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_GPIO=n
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
diff --git a/tests/benchmarks/multicore/idle_clock_control/prj.conf b/tests/benchmarks/multicore/idle_clock_control/prj.conf
@@ -7,7 +7,6 @@ CONFIG_POWEROFF=y
 
 CONFIG_GPIO=n
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 
 CONFIG_NRFS=y
 CONFIG_CLOCK_CONTROL=y

diff --git a/tests/benchmarks/multicore/idle_clock_control/remote/prj.conf b/tests/benchmarks/multicore/idle_clock_control/remote/prj.conf
@@ -5,4 +5,3 @@ CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_GPIO=n
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
diff --git a/tests/benchmarks/multicore/idle_comp/prj.conf b/tests/benchmarks/multicore/idle_comp/prj.conf
@@ -8,7 +8,6 @@ CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_POWEROFF=y
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 CONFIG_ASSERT=y
 
 # Enable for debugging purposes only

diff --git a/tests/benchmarks/multicore/idle_comp/remote/prj.conf b/tests/benchmarks/multicore/idle_comp/remote/prj.conf
@@ -5,4 +5,3 @@ CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_GPIO=n
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
diff --git a/tests/benchmarks/multicore/idle_gpio/prj_s2ram.conf b/tests/benchmarks/multicore/idle_gpio/prj_s2ram.conf
@@ -7,4 +7,3 @@ CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_GPIO=y
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
diff --git a/tests/benchmarks/multicore/idle_gpio/remote/prj_s2ram.conf b/tests/benchmarks/multicore/idle_gpio/remote/prj_s2ram.conf
@@ -5,4 +5,3 @@ CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_GPIO=y
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
diff --git a/tests/benchmarks/multicore/idle_hpu_temp_meas/prj.conf b/tests/benchmarks/multicore/idle_hpu_temp_meas/prj.conf
@@ -7,7 +7,6 @@ CONFIG_POWEROFF=y
 
 CONFIG_GPIO=n
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 
 CONFIG_ASSERT=y
 

diff --git a/tests/benchmarks/multicore/idle_outside_of_main/prj.conf b/tests/benchmarks/multicore/idle_outside_of_main/prj.conf
@@ -5,7 +5,6 @@ CONFIG_POWEROFF=y
 
 CONFIG_BOOT_BANNER=n
 CONFIG_NCS_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 
 # Enable for debugging purposes only
 CONFIG_SERIAL=n

diff --git a/tests/benchmarks/multicore/idle_outside_of_main/remote/prj.conf b/tests/benchmarks/multicore/idle_outside_of_main/remote/prj.conf
@@ -6,4 +6,3 @@ CONFIG_SERIAL=n
 CONFIG_GPIO=n
 CONFIG_NCS_BOOT_BANNER=n
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
diff --git a/tests/benchmarks/multicore/idle_ppr/prj_s2ram.conf b/tests/benchmarks/multicore/idle_ppr/prj_s2ram.conf
@@ -2,7 +2,6 @@ CONFIG_PM=y
 CONFIG_PM_S2RAM=y
 CONFIG_PM_S2RAM_CUSTOM_MARKING=y
 CONFIG_POWEROFF=y
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y

diff --git a/tests/benchmarks/multicore/idle_ppr/remote/prj_s2ram.conf b/tests/benchmarks/multicore/idle_ppr/remote/prj_s2ram.conf
@@ -9,7 +9,6 @@ CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_BOOT_BANNER=n
 CONFIG_NCS_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 
 CONFIG_ASSERT=y
 CONFIG_GPIO=y
diff --git a/tests/benchmarks/multicore/idle_pwm_led/prj_s2ram.conf b/tests/benchmarks/multicore/idle_pwm_led/prj_s2ram.conf
@@ -10,6 +10,5 @@ CONFIG_CONSOLE=n
 CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 
 CONFIG_PWM=y
diff --git a/tests/benchmarks/multicore/idle_pwm_led/remote/prj_s2ram.conf b/tests/benchmarks/multicore/idle_pwm_led/remote/prj_s2ram.conf
@@ -5,6 +5,5 @@ CONFIG_CONSOLE=n
 CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 
 CONFIG_PWM=y
diff --git a/tests/benchmarks/multicore/idle_pwm_loopback/prj_s2ram.conf b/tests/benchmarks/multicore/idle_pwm_loopback/prj_s2ram.conf
@@ -2,7 +2,6 @@ CONFIG_PM=y
 CONFIG_PM_S2RAM=y
 CONFIG_PM_S2RAM_CUSTOM_MARKING=y
 CONFIG_POWEROFF=y
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y

diff --git a/tests/benchmarks/multicore/idle_pwm_loopback/remote/prj_s2ram.conf b/tests/benchmarks/multicore/idle_pwm_loopback/remote/prj_s2ram.conf
@@ -1,6 +1,5 @@
 CONFIG_PM=y
 CONFIG_POWEROFF=y
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y

diff --git a/tests/benchmarks/multicore/idle_spim/prj.conf b/tests/benchmarks/multicore/idle_spim/prj.conf
@@ -8,7 +8,6 @@ CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_POWEROFF=y
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 
 CONFIG_ASSERT=y
 

diff --git a/tests/benchmarks/multicore/idle_spim/remote/prj.conf b/tests/benchmarks/multicore/idle_spim/remote/prj.conf
@@ -5,4 +5,3 @@ CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_GPIO=n
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
diff --git a/tests/benchmarks/multicore/idle_spim_loopback/prj_s2ram.conf b/tests/benchmarks/multicore/idle_spim_loopback/prj_s2ram.conf
@@ -2,7 +2,6 @@ CONFIG_PM=y
 CONFIG_PM_S2RAM=y
 CONFIG_PM_S2RAM_CUSTOM_MARKING=y
 CONFIG_POWEROFF=y
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y

diff --git a/tests/benchmarks/multicore/idle_stm/prj_s2ram.conf b/tests/benchmarks/multicore/idle_stm/prj_s2ram.conf
@@ -2,7 +2,6 @@ CONFIG_PM=y
 CONFIG_PM_S2RAM=y
 CONFIG_PM_S2RAM_CUSTOM_MARKING=y
 CONFIG_POWEROFF=y
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y

diff --git a/tests/benchmarks/multicore/idle_stm/remote/prj_s2ram.conf b/tests/benchmarks/multicore/idle_stm/remote/prj_s2ram.conf
@@ -10,4 +10,3 @@ CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_BOOT_BANNER=n
 CONFIG_NCS_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
diff --git a/tests/benchmarks/multicore/idle_twim/prj.conf b/tests/benchmarks/multicore/idle_twim/prj.conf
@@ -9,7 +9,6 @@ CONFIG_POWEROFF=y
 
 CONFIG_GPIO=n
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 
 CONFIG_ASSERT=y
 

diff --git a/tests/benchmarks/multicore/idle_twim/remote/prj.conf b/tests/benchmarks/multicore/idle_twim/remote/prj.conf
@@ -5,4 +5,3 @@ CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_GPIO=n
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
diff --git a/tests/benchmarks/multicore/idle_uarte/prj.conf b/tests/benchmarks/multicore/idle_uarte/prj.conf
@@ -12,7 +12,6 @@ CONFIG_POWEROFF=y
 
 CONFIG_BOOT_BANNER=n
 CONFIG_ASSERT=y
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 
 # Enable for debugging purposes only
 CONFIG_PRINTK=n

diff --git a/tests/benchmarks/multicore/idle_usb/prj.conf b/tests/benchmarks/multicore/idle_usb/prj.conf
@@ -13,7 +13,6 @@ CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_POWEROFF=y
 
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 
 # Enable for debugging purposes only
 CONFIG_PRINTK=y

diff --git a/tests/benchmarks/multicore/idle_wdt/prj_s2ram.conf b/tests/benchmarks/multicore/idle_wdt/prj_s2ram.conf
@@ -2,7 +2,6 @@ CONFIG_PM=y
 CONFIG_PM_S2RAM=y
 CONFIG_PM_S2RAM_CUSTOM_MARKING=y
 CONFIG_POWEROFF=y
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y

diff --git a/tests/benchmarks/multicore/idle_wdt/remote/prj_s2ram.conf b/tests/benchmarks/multicore/idle_wdt/remote/prj_s2ram.conf
@@ -5,6 +5,5 @@ CONFIG_CONSOLE=n
 CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 
 CONFIG_WATCHDOG=y
diff --git a/tests/benchmarks/power_consumption/adc/prj.conf b/tests/benchmarks/power_consumption/adc/prj.conf
@@ -12,4 +12,3 @@ CONFIG_CONSOLE=n
 CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
diff --git a/tests/benchmarks/power_consumption/adc_async/prj.conf b/tests/benchmarks/power_consumption/adc_async/prj.conf
@@ -14,4 +14,3 @@ CONFIG_CONSOLE=n
 CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
diff --git a/tests/benchmarks/power_consumption/common/remote_sleep_forever/prj.conf b/tests/benchmarks/power_consumption/common/remote_sleep_forever/prj.conf
@@ -5,4 +5,3 @@ CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_GPIO=n
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
diff --git a/tests/benchmarks/power_consumption/flash/prj.conf b/tests/benchmarks/power_consumption/flash/prj.conf
@@ -12,4 +12,3 @@ CONFIG_CONSOLE=n
 CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
diff --git a/tests/benchmarks/power_consumption/gpio/prj.conf b/tests/benchmarks/power_consumption/gpio/prj.conf
@@ -3,6 +3,5 @@ CONFIG_CONSOLE=n
 CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 
 CONFIG_ASSERT=y
diff --git a/tests/benchmarks/power_consumption/i2c/prj.conf b/tests/benchmarks/power_consumption/i2c/prj.conf
@@ -13,4 +13,3 @@ CONFIG_CONSOLE=n
 CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
diff --git a/tests/benchmarks/power_consumption/lpcomp/prj.conf b/tests/benchmarks/power_consumption/lpcomp/prj.conf
@@ -14,5 +14,4 @@ CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_POWEROFF=y
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 CONFIG_ASSERT=y
diff --git a/tests/benchmarks/power_consumption/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/benchmarks/power_consumption/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -2,4 +2,3 @@ CONFIG_PM=y
 CONFIG_PM_S2RAM=y
 CONFIG_POWEROFF=y
 CONFIG_PM_S2RAM_CUSTOM_MARKING=y
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
diff --git a/tests/benchmarks/power_consumption/spi/prj.conf b/tests/benchmarks/power_consumption/spi/prj.conf
@@ -13,4 +13,3 @@ CONFIG_CONSOLE=n
 CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
diff --git a/tests/benchmarks/power_consumption/temperature_sensor/prj.conf b/tests/benchmarks/power_consumption/temperature_sensor/prj.conf
@@ -13,4 +13,3 @@ CONFIG_PM=y
 CONFIG_PM_S2RAM=y
 CONFIG_POWEROFF=y
 CONFIG_PM_S2RAM_CUSTOM_MARKING=y
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
diff --git a/tests/benchmarks/power_consumption/timer_waiting/prj.conf b/tests/benchmarks/power_consumption/timer_waiting/prj.conf
@@ -13,4 +13,3 @@ CONFIG_CONSOLE=n
 CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
diff --git a/tests/benchmarks/power_consumption/uart_async/prj.conf b/tests/benchmarks/power_consumption/uart_async/prj.conf
@@ -10,4 +10,3 @@ CONFIG_PM_S2RAM=y
 CONFIG_POWEROFF=y
 CONFIG_PM_S2RAM_CUSTOM_MARKING=y
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
diff --git a/tests/benchmarks/power_consumption/uart_interrupt/prj.conf b/tests/benchmarks/power_consumption/uart_interrupt/prj.conf
@@ -10,4 +10,3 @@ CONFIG_PM_S2RAM=y
 CONFIG_POWEROFF=y
 CONFIG_PM_S2RAM_CUSTOM_MARKING=y
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
diff --git a/tests/benchmarks/power_consumption/uart_polling/prj.conf b/tests/benchmarks/power_consumption/uart_polling/prj.conf
@@ -7,4 +7,3 @@ CONFIG_PM_S2RAM=y
 CONFIG_POWEROFF=y
 CONFIG_PM_S2RAM_CUSTOM_MARKING=y
 CONFIG_BOOT_BANNER=n
-CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
diff --git 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: pull/2271/head
+      revision: a7fe5f7c4aab18312bd7f61afef55647e38f3db6
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above