From 658883b0c61467415a4e29627eda039da9d4424e Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Tue, 15 Oct 2024 16:25:34 +0200
Subject: [PATCH] Revert "[nrf noup] boards: nordic: Turn off MRAM suspend for
 NRF54H20 DK"

This reverts commit 38f2104a801b1db40ab4596f972c0178f21821c5.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 4b246a0b9ed88077a8581956e562cba8606aca9b)
---
 boards/nordic/nrf54h20dk/CMakeLists.txt |  6 ---
 boards/nordic/nrf54h20dk/board.c        | 58 -------------------------
 modules/hal_nordic/nrfs/Kconfig         |  3 --
 3 files changed, 67 deletions(-)
 delete mode 100644 boards/nordic/nrf54h20dk/CMakeLists.txt
 delete mode 100644 boards/nordic/nrf54h20dk/board.c

diff --git a/boards/nordic/nrf54h20dk/CMakeLists.txt b/boards/nordic/nrf54h20dk/CMakeLists.txt
deleted file mode 100644
index a5a06d8805a..00000000000
--- a/boards/nordic/nrf54h20dk/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-zephyr_library()
-if(CONFIG_NRFS_MRAM_SERVICE_ENABLED)
-  zephyr_library_sources(board.c)
-endif()
diff --git a/boards/nordic/nrf54h20dk/board.c b/boards/nordic/nrf54h20dk/board.c
deleted file mode 100644
index 0699e93a7c3..00000000000
--- a/boards/nordic/nrf54h20dk/board.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/init.h>
-
-#define MODULE mram_suspend_off
-#include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(MODULE);
-
-#include <services/nrfs_mram.h>
-#include <nrfs_backend_ipc_service.h>
-
-#define MRAM_SUSPEND_OFF_INIT_PRIO 90
-
-void mram_latency_handler(nrfs_mram_latency_evt_t const *p_evt, void *context)
-{
-	switch (p_evt->type) {
-	case NRFS_MRAM_LATENCY_REQ_APPLIED:
-		LOG_DBG("MRAM latency handler: response received");
-		break;
-	case NRFS_MRAM_LATENCY_REQ_REJECTED:
-		LOG_ERR("MRAM latency handler - request rejected!");
-		break;
-	default:
-		LOG_ERR("MRAM latency handler - unexpected event: 0x%x", p_evt->type);
-		break;
-	}
-}
-
-static int turn_off_suspend_mram(void)
-{
-	/* Turn off mram automatic suspend as it causes delays in time depended code sections. */
-
-	nrfs_err_t err = NRFS_SUCCESS;
-
-	/* Wait for ipc initialization */
-	nrfs_backend_wait_for_connection(K_FOREVER);
-
-	err = nrfs_mram_init(mram_latency_handler);
-	if (err != NRFS_SUCCESS) {
-		LOG_ERR("MRAM service init failed: %d", err);
-	} else {
-		LOG_DBG("MRAM service initialized");
-	}
-
-	LOG_DBG("MRAM: set latency: NOT ALLOWED");
-	err = nrfs_mram_set_latency(MRAM_LATENCY_NOT_ALLOWED, NULL);
-	if (err) {
-		LOG_ERR("MRAM: set latency failed (%d)", err);
-	}
-
-	return err;
-}
-
-SYS_INIT(turn_off_suspend_mram, APPLICATION, MRAM_SUSPEND_OFF_INIT_PRIO);
diff --git a/modules/hal_nordic/nrfs/Kconfig b/modules/hal_nordic/nrfs/Kconfig
index 8325c8db3bc..eafe0616764 100644
--- a/modules/hal_nordic/nrfs/Kconfig
+++ b/modules/hal_nordic/nrfs/Kconfig
@@ -46,8 +46,6 @@ config NRFS
 				    SOC_NRF9280_CPUAPP || \
 				    SOC_NRF9280_CPURAD
 	depends on HAS_NRFS
-	depends on !MISRA_SANE
-	default y if !ZTEST
 	help
 	  This option enables the nRF Services library.
 
@@ -82,7 +80,6 @@ config NRFS_RESET_SERVICE_ENABLED
 config NRFS_MRAM_SERVICE_ENABLED
 	bool "MRAM latency service"
 	depends on NRFS_HAS_MRAM_SERVICE
-	default y
 
 config NRFS_TEMP_SERVICE_ENABLED
 	bool "Temperature service"