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 #include #include -#if !defined(CONFIG_BOARD_QEMU_CORTEX_M0) +#if !defined(CONFIG_SOC_SERIES_NRF54HX) && !defined(CONFIG_BOARD_QEMU_CORTEX_M0) #include #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;