[nrf fromlist] nrfx: align errata checks to nrfx 4.0

Signed-off-by: Norbert Morawski <[email protected]>

Author: nomo-nordic

drivers/flash/nrf_qspi_nor.c

@@ -111,7 +111,7 @@ BUILD_ASSERT(INST_0_SCK_FREQUENCY >= (NRF_QSPI_BASE_CLOCK_FREQ / 16),
 #define BASE_CLOCK_DIV NRF_CLOCK_HFCLK_DIV_1
 #define INST_0_SCK_CFG NRF_QSPI_FREQ_DIV1
 /* If anomaly 159 is to be prevented, only /1 divider can be used. */
-#elif NRF53_ERRATA_159_ENABLE_WORKAROUND
+#elif NRF_ERRATA_STATIC_CHECK(53, 159)
 #define BASE_CLOCK_DIV NRF_CLOCK_HFCLK_DIV_1
 #define INST_0_SCK_CFG (DIV_ROUND_UP(NRF_QSPI_BASE_CLOCK_FREQ, \
 				     INST_0_SCK_FREQUENCY) - 1)
@@ -251,7 +251,7 @@ static inline int qspi_get_zephyr_ret_code(nrfx_err_t res)
 		return -EINVAL;
 	case NRFX_ERROR_INVALID_STATE:
 		return -ECANCELED;
-#if NRF53_ERRATA_159_ENABLE_WORKAROUND
+#if NRF_ERRATA_STATIC_CHECK(53, 159)
 	case NRFX_ERROR_FORBIDDEN:
 		LOG_ERR("nRF5340 anomaly 159 conditions detected");
 		LOG_ERR("Set the CPU clock to 64 MHz before starting QSPI operation");

drivers/flash/soc_flash_nrf.c

@@ -121,7 +121,7 @@ static inline bool is_uicr_addr_valid(off_t addr, size_t len)
 #endif /* CONFIG_SOC_FLASH_NRF_UICR */
 }
 
-#if CONFIG_SOC_FLASH_NRF_UICR && IS_ENABLED(NRF91_ERRATA_7_ENABLE_WORKAROUND)
+#if CONFIG_SOC_FLASH_NRF_UICR && NRF_ERRATA_STATIC_CHECK(91, 7)
 static inline void nrf91_errata_7_enter(void)
 {
 	__disable_irq();
@@ -164,7 +164,7 @@ static int flash_nrf_read(const struct device *dev, off_t addr,
 		return 0;
 	}
 
-#if CONFIG_SOC_FLASH_NRF_UICR && IS_ENABLED(NRF91_ERRATA_7_ENABLE_WORKAROUND)
+#if CONFIG_SOC_FLASH_NRF_UICR && NRF_ERRATA_STATIC_CHECK(91, 7)
 	if (within_uicr) {
 		nrf_buffer_read_91_uicr(data, (uint32_t)addr, len);
 		return 0;

drivers/pwm/pwm_nrfx.c

@@ -19,10 +19,7 @@
 
 LOG_MODULE_REGISTER(pwm_nrfx, CONFIG_PWM_LOG_LEVEL);
 
-/* NRFX_PWM_NRF52_ANOMALY_109_WORKAROUND_ENABLED can be undefined or defined
- * to 0 or 1, hence the use of #if IS_ENABLED().
- */
-#if IS_ENABLED(NRFX_PWM_NRF52_ANOMALY_109_WORKAROUND_ENABLED)
+#if NRF_ERRATA_STATIC_CHECK(52, 109)
 #define ANOMALY_109_EGU_IRQ_CONNECT(idx) _EGU_IRQ_CONNECT(idx)
 #define _EGU_IRQ_CONNECT(idx) \
 	extern void nrfx_egu_##idx##_irq_handler(void); \