From cf92c31e02d572d18418883d9632b6d4f153cfbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= Date: Fri, 25 Oct 2019 16:14:04 +0200 Subject: [PATCH] modules: hal_nordic: Update nrfx to version 2.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update the hal_nordic module revision to switch to nrfx 2.0.0. Add Kconfig options that enable to use the newly introduced nrfx drivers in Zephyr. Signed-off-by: Andrzej Głąbek --- modules/Kconfig.nordic | 58 ++++++++++++++++++++++---- soc/arm/nordic_nrf/Kconfig.peripherals | 6 +++ west.yml | 2 +- 3 files changed, 57 insertions(+), 9 deletions(-) diff --git a/modules/Kconfig.nordic b/modules/Kconfig.nordic index 86a11e2d112..f8bdfe48760 100644 --- a/modules/Kconfig.nordic +++ b/modules/Kconfig.nordic @@ -27,6 +27,41 @@ config NRFX_DPPI bool "Enable DPPI allocator" depends on HAS_HW_NRF_DPPIC +config NRFX_EGU + bool "Enable EGU driver" + depends on HAS_HW_NRF_EGU0 || HAS_HW_NRF_EGU1 || HAS_HW_NRF_EGU2 || \ + HAS_HW_NRF_EGU3 || HAS_HW_NRF_EGU4 || HAS_HW_NRF_EGU5 + +config NRFX_EGU0 + bool "Enable EGU0 instance" + depends on HAS_HW_NRF_EGU0 + select NRFX_EGU + +config NRFX_EGU1 + bool "Enable EGU1 instance" + depends on HAS_HW_NRF_EGU1 + select NRFX_EGU + +config NRFX_EGU2 + bool "Enable EGU2 instance" + depends on HAS_HW_NRF_EGU2 + select NRFX_EGU + +config NRFX_EGU3 + bool "Enable EGU3 instance" + depends on HAS_HW_NRF_EGU3 + select NRFX_EGU + +config NRFX_EGU4 + bool "Enable EGU4 instance" + depends on HAS_HW_NRF_EGU4 + select NRFX_EGU + +config NRFX_EGU5 + bool "Enable EGU5 instance" + depends on HAS_HW_NRF_EGU5 + select NRFX_EGU + config NRFX_GPIOTE bool "Enable GPIOTE driver" depends on HAS_HW_NRF_GPIOTE @@ -35,6 +70,10 @@ config NRFX_I2S bool "Enable I2S driver" depends on HAS_HW_NRF_I2S +config NRFX_IPC + bool "Enable IPC driver" + depends on HAS_HW_NRF_IPC + config NRFX_LPCOMP bool "Enable LPCOMP driver" depends on HAS_HW_NRF_LPCOMP @@ -188,13 +227,6 @@ config NRFX_SPIS3 depends on HAS_HW_NRF_SPIS3 select NRFX_SPIS -config NRFX_SWI - bool "Enable SWI/EGU allocator" - depends on HAS_HW_NRF_EGU0 || HAS_HW_NRF_EGU1 || HAS_HW_NRF_EGU2 || \ - HAS_HW_NRF_EGU3 || HAS_HW_NRF_EGU4 || HAS_HW_NRF_EGU5 || \ - HAS_HW_NRF_SWI0 || HAS_HW_NRF_SWI1 || HAS_HW_NRF_SWI2 || \ - HAS_HW_NRF_SWI3 || HAS_HW_NRF_SWI4 || HAS_HW_NRF_SWI5 - config NRFX_SYSTICK bool "Enable SYSTICK driver" depends on CPU_CORTEX_M_HAS_SYSTICK @@ -339,7 +371,17 @@ config NRFX_USBD config NRFX_WDT bool "Enable WDT driver" - depends on HAS_HW_NRF_WDT + depends on HAS_HW_NRF_WDT || HAS_HW_NRF_WDT0 || HAS_HW_NRF_WDT1 + +config NRFX_WDT0 + bool "Enable WDT0 instance" + depends on HAS_HW_NRF_WDT || HAS_HW_NRF_WDT0 + select NRFX_WDT + +config NRFX_WDT1 + bool "Enable WDT1 instance" + depends on HAS_HW_NRF_WDT1 + select NRFX_WDT config NRFX_PRS bool "Enable Peripheral Resource Sharing module" diff --git a/soc/arm/nordic_nrf/Kconfig.peripherals b/soc/arm/nordic_nrf/Kconfig.peripherals index 52c0ec08355..1809ffd7118 100644 --- a/soc/arm/nordic_nrf/Kconfig.peripherals +++ b/soc/arm/nordic_nrf/Kconfig.peripherals @@ -245,3 +245,9 @@ config HAS_HW_NRF_USBD config HAS_HW_NRF_WDT bool + +config HAS_HW_NRF_WDT0 + bool + +config HAS_HW_NRF_WDT1 + bool diff --git a/west.yml b/west.yml index 2efa5452cd3..34f8e841f0d 100644 --- a/west.yml +++ b/west.yml @@ -44,7 +44,7 @@ manifest: revision: a12d92816a53a521d79cefcf5c38b9dc8a4fed6e path: modules/hal/cypress - name: hal_nordic - revision: e0bfd6f253ca6a5e87b6f53a8bb317bd6f483511 + revision: 080d1dff4a07b5798ab979fde40dde8da452b854 path: modules/hal/nordic - name: hal_openisa revision: 0cbbf29f1523fe2970e57622bd79d9b115ca84e5