Revert "[nrf noup] soc: nordic: nrf54h20: Turn off MRAM suspend"

nordic-krch · nordic-krch · commit 8f1b1b152bc9 · 2024-12-03T07:46:21.000+01:00
This reverts commit 8027617. Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
diff --git a/soc/nordic/nrf54h/CMakeLists.txt b/soc/nordic/nrf54h/CMakeLists.txt
@@ -12,8 +12,6 @@ zephyr_library_sources_ifdef(CONFIG_PM_S2RAM pm_s2ram.c)
 
 zephyr_include_directories(.)
 
-zephyr_library_sources_ifdef(CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY mram.c)
-
 # Ensure that image size aligns with 16 bytes so that MRAMC finalizes all writes
 # for the image correctly
 zephyr_linker_sources(SECTIONS SORT_KEY zzz_place_align_at_end align.ld)
diff --git a/soc/nordic/nrf54h/Kconfig b/soc/nordic/nrf54h/Kconfig
@@ -65,9 +65,3 @@ config SOC_NRF54H20_CPUFLPR
 	depends on RISCV_CORE_NORDIC_VPR
 
 rsource "gpd/Kconfig"
-
-config SOC_NRF54H20_NO_MRAM_LATENCY
-	bool "Disallow MRAM latency"
-	imply NRFS
-	imply NRFS_MRAM_SERVICE_ENABLED
-	default y if SOC_NRF54H20_CPUAPP
diff --git a/soc/nordic/nrf54h/mram.c b/soc/nordic/nrf54h/mram.c
