Skip to content

Commit e707d11

Browse files
committed
NRFX-8421: align errata macros to nrfx 4.0
Signed-off-by: Norbert Morawski <[email protected]>
1 parent c2ec77a commit e707d11

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

drivers/pwm/pwm_nrfx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222

2323
LOG_MODULE_REGISTER(pwm_nrfx, CONFIG_PWM_LOG_LEVEL);
2424

25-
/* NRFX_PWM_NRF52_ANOMALY_109_WORKAROUND_ENABLED can be undefined or defined
25+
/* NRF52_ERRATA_109_ENABLE_WORKAROUND can be undefined or defined
2626
* to 0 or 1, hence the use of #if IS_ENABLED().
2727
*/
28-
#if IS_ENABLED(NRFX_PWM_NRF52_ANOMALY_109_WORKAROUND_ENABLED)
28+
#if IS_ENABLED(NRF52_ERRATA_109_ENABLE_WORKAROUND)
2929
#define ANOMALY_109_EGU_IRQ_CONNECT(idx) _EGU_IRQ_CONNECT(idx)
3030
#define _EGU_IRQ_CONNECT(idx) \
3131
extern void nrfx_egu_##idx##_irq_handler(void); \

modules/hal_nordic/nrfx/nrfx_kconfig.h

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@
495495
#ifdef CONFIG_NRFX_SPIM3
496496
#define NRFX_SPIM3_ENABLED 1
497497
#ifdef CONFIG_NRF52_ANOMALY_198_WORKAROUND
498-
#define NRFX_SPIM3_NRF52840_ANOMALY_198_WORKAROUND_ENABLED 1
498+
#define NRF52_ERRATA_198_ENABLE_WORKAROUND 1
499499
#endif
500500
#endif
501501
#ifdef CONFIG_NRFX_SPIM4
@@ -806,10 +806,10 @@
806806
#define NRFX_TWIM137_ENABLED 1
807807
#endif
808808
#ifdef CONFIG_NRF52_ANOMALY_219_WORKAROUND
809-
#define NRFX_TWIM_NRF52_ANOMALY_219_WORKAROUND_ENABLED 1
809+
#define NRF52_ERRATA_219_ENABLE_WORKAROUND 1
810810
#endif
811811
#ifdef CONFIG_SOC_NRF53_ANOMALY_47_WORKAROUND
812-
#define NRFX_TWIM_NRF53_ANOMALY_47_WORKAROUND_ENABLED 1
812+
#define NRF53_ERRATA_47_ENABLE_WORKAROUND 1
813813
#endif
814814

815815
#ifdef CONFIG_NRFX_TWIS
@@ -1007,10 +1007,7 @@
10071007
#endif
10081008

10091009
#ifdef CONFIG_NRF52_ANOMALY_109_WORKAROUND
1010-
#define NRFX_SPIM_NRF52_ANOMALY_109_WORKAROUND_ENABLED 1
1011-
#define NRFX_SPIS_NRF52_ANOMALY_109_WORKAROUND_ENABLED 1
1012-
#define NRFX_TWIM_NRF52_ANOMALY_109_WORKAROUND_ENABLED 1
1013-
#define NRFX_PWM_NRF52_ANOMALY_109_WORKAROUND_ENABLED 1
1010+
#define NRF52_ERRATA_109_ENABLE_WORKAROUND 1
10141011
#define NRFX_PWM_NRF52_ANOMALY_109_EGU_INSTANCE \
10151012
CONFIG_NRF52_ANOMALY_109_WORKAROUND_EGU_INSTANCE
10161013
#endif

0 commit comments

Comments
 (0)