From 5ede79204c8439f0c8a0397ef97d180dbf98df7e Mon Sep 17 00:00:00 2001
From: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Date: Tue, 4 Feb 2025 13:41:57 +0100
Subject: [PATCH] Revert "[nrf fromlist] drivers: hwinfo: Support for reset
 reasons in nRF54H20"

This reverts commit 622410f49f10b71ee47850f352a2401e4303f5a3.
---
 drivers/hwinfo/hwinfo_nrf.c | 40 ++++++-------------------------------
 1 file changed, 6 insertions(+), 34 deletions(-)

diff --git a/drivers/hwinfo/hwinfo_nrf.c b/drivers/hwinfo/hwinfo_nrf.c
index 50e20906d98..d1fca5350a6 100644
--- a/drivers/hwinfo/hwinfo_nrf.c
+++ b/drivers/hwinfo/hwinfo_nrf.c
@@ -8,7 +8,7 @@
 #include <zephyr/drivers/hwinfo.h>
 #include <string.h>
 #include <zephyr/sys/byteorder.h>
-#if !defined(CONFIG_BOARD_QEMU_CORTEX_M0)
+#if !defined(CONFIG_SOC_SERIES_NRF54HX) && !defined(CONFIG_BOARD_QEMU_CORTEX_M0)
 #include <helpers/nrfx_reset_reason.h>
 #endif
 
@@ -63,7 +63,7 @@ ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
 	return length;
 }
 
-#if !defined(CONFIG_BOARD_QEMU_CORTEX_M0)
+#if !defined(CONFIG_SOC_SERIES_NRF54HX) && !defined(CONFIG_BOARD_QEMU_CORTEX_M0)
 int z_impl_hwinfo_get_reset_cause(uint32_t *cause)
 {
 	uint32_t flags = 0;
@@ -76,37 +76,16 @@ int z_impl_hwinfo_get_reset_cause(uint32_t *cause)
 	if (reason & NRFX_RESET_REASON_DOG_MASK) {
 		flags |= RESET_WATCHDOG;
 	}
-
-#if defined(NRF_RESETINFO)
-	if (reason & NRFX_RESET_REASON_LOCAL_DOG0_MASK) {
-		flags |= RESET_WATCHDOG;
-	}
-#endif
-
-#if defined(NRF_RESETINFO)
-	if ((reason & NRFX_RESET_REASON_LOCKUP)
-		|| (reason & NRFX_RESET_REASON_LOCAL_LOCKUP_MASK))
-#else
-	if (reason & NRFX_RESET_REASON_LOCKUP_MASK)
-#endif
-	{
+	if (reason & NRFX_RESET_REASON_LOCKUP_MASK) {
 		flags |= RESET_CPU_LOCKUP;
 	}
-
 	if (reason & NRFX_RESET_REASON_OFF_MASK) {
 		flags |= RESET_LOW_POWER_WAKE;
 	}
 	if (reason & NRFX_RESET_REASON_DIF_MASK) {
 		flags |= RESET_DEBUG;
 	}
-
-#if defined(NRF_RESETINFO)
-	if ((reason & NRFX_RESET_REASON_SREQ)
-		|| (reason & NRFX_RESET_REASON_LOCAL_SREQ_MASK))
-#else
-	if (reason & NRFX_RESET_REASON_SREQ_MASK)
-#endif
-	{
+	if (reason & NRFX_RESET_REASON_SREQ_MASK) {
 		flags |= RESET_SOFTWARE;
 	}
 
@@ -145,18 +124,11 @@ int z_impl_hwinfo_get_reset_cause(uint32_t *cause)
 		flags |= RESET_DEBUG;
 	}
 #endif
-
 #if !NRF_POWER_HAS_RESETREAS
-#if defined(NRF_RESETINFO)
-	if (reason & NRFX_RESET_REASON_LOCAL_DOG1_MASK)
-#else
-	if (reason & NRFX_RESET_REASON_DOG1_MASK)
-#endif
-	{
+	if (reason & NRFX_RESET_REASON_DOG1_MASK) {
 		flags |= RESET_WATCHDOG;
 	}
-#endif /* !NRF_POWER_HAS_RESETREAS */
-
+#endif
 #if NRFX_RESET_REASON_HAS_GRTC
 	if (reason & NRFX_RESET_REASON_GRTC_MASK) {
 		flags |= RESET_CLOCK;