From f98517194ece8f7146661117aac86195a10359a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Ku=C5=BAnia?= Date: Tue, 15 Oct 2024 13:07:20 +0200 Subject: [PATCH] [nrf fromlist] modules: hal_nordic: Enable nrfx_ppib drivers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The new nrfx_ppib driver can now be enabled, when the corrensponding device tree node has the okay status. Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/79857 Signed-off-by: Rafał Kuźnia --- modules/hal_nordic/nrfx/CMakeLists.txt | 1 + modules/hal_nordic/nrfx/Kconfig | 43 +++++++++++++++++++++++++ modules/hal_nordic/nrfx/Kconfig.logging | 4 +++ modules/hal_nordic/nrfx/nrfx_config.h | 31 ++++++++++++++++++ 4 files changed, 79 insertions(+) diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt index 8d7adc114d7..05b0cc7b268 100644 --- a/modules/hal_nordic/nrfx/CMakeLists.txt +++ b/modules/hal_nordic/nrfx/CMakeLists.txt @@ -132,6 +132,7 @@ zephyr_library_sources_ifdef(CONFIG_NRFX_NVMC ${SRC_DIR}/nrfx_nvmc.c) zephyr_library_sources_ifdef(CONFIG_NRFX_PDM ${SRC_DIR}/nrfx_pdm.c) zephyr_library_sources_ifdef(CONFIG_NRFX_POWER ${SRC_DIR}/nrfx_power.c) zephyr_library_sources_ifdef(CONFIG_NRFX_PPI ${SRC_DIR}/nrfx_ppi.c) +zephyr_library_sources_ifdef(CONFIG_NRFX_PPIB ${SRC_DIR}/nrfx_ppib.c) zephyr_library_sources_ifdef(CONFIG_NRFX_PWM ${SRC_DIR}/nrfx_pwm.c) zephyr_library_sources_ifdef(CONFIG_NRFX_QDEC ${SRC_DIR}/nrfx_qdec.c) zephyr_library_sources_ifdef(CONFIG_NRFX_QSPI ${SRC_DIR}/nrfx_qspi.c) diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig index 971ba9716d9..4c8cc09444e 100644 --- a/modules/hal_nordic/nrfx/Kconfig +++ b/modules/hal_nordic/nrfx/Kconfig @@ -263,6 +263,49 @@ config NRFX_PPI bool "PPI allocator" depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_PPI)) +config NRFX_PPIB + bool + +config NRFX_PPIB00 + bool "PPIB00 driver instance" + depends on $(dt_nodelabel_has_compat,ppib00,$(DT_COMPAT_NORDIC_NRF_PPIB)) + select NRFX_PPIB + +config NRFX_PPIB01 + bool "PPIB01 driver instance" + depends on $(dt_nodelabel_has_compat,ppib01,$(DT_COMPAT_NORDIC_NRF_PPIB)) + select NRFX_PPIB + +config NRFX_PPIB10 + bool "PPIB10 driver instance" + depends on $(dt_nodelabel_has_compat,ppib10,$(DT_COMPAT_NORDIC_NRF_PPIB)) + select NRFX_PPIB + +config NRFX_PPIB11 + bool "PPIB11 driver instance" + depends on $(dt_nodelabel_has_compat,ppib11,$(DT_COMPAT_NORDIC_NRF_PPIB)) + select NRFX_PPIB + +config NRFX_PPIB20 + bool "PPIB20 driver instance" + depends on $(dt_nodelabel_has_compat,ppib20,$(DT_COMPAT_NORDIC_NRF_PPIB)) + select NRFX_PPIB + +config NRFX_PPIB21 + bool "PPIB21 driver instance" + depends on $(dt_nodelabel_has_compat,ppib21,$(DT_COMPAT_NORDIC_NRF_PPIB)) + select NRFX_PPIB + +config NRFX_PPIB22 + bool "PPIB22 driver instance" + depends on $(dt_nodelabel_has_compat,ppib22,$(DT_COMPAT_NORDIC_NRF_PPIB)) + select NRFX_PPIB + +config NRFX_PPIB30 + bool "PPIB30 driver instance" + depends on $(dt_nodelabel_has_compat,ppib30,$(DT_COMPAT_NORDIC_NRF_PPIB)) + select NRFX_PPIB + config NRFX_PWM bool diff --git a/modules/hal_nordic/nrfx/Kconfig.logging b/modules/hal_nordic/nrfx/Kconfig.logging index b24d683d3de..2bf24721880 100644 --- a/modules/hal_nordic/nrfx/Kconfig.logging +++ b/modules/hal_nordic/nrfx/Kconfig.logging @@ -64,6 +64,10 @@ config NRFX_PPI_LOG bool "PPI driver logging" depends on NRFX_PPI +config NRFX_PPIB_LOG + bool "PPIB driver logging" + depends on NRFX_PPIB + config NRFX_PRS_LOG bool "PRS driver logging" depends on NRFX_PRS diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h index 10546e29878..f726bf7d066 100644 --- a/modules/hal_nordic/nrfx/nrfx_config.h +++ b/modules/hal_nordic/nrfx/nrfx_config.h @@ -278,6 +278,37 @@ #define NRFX_PPI_CONFIG_LOG_ENABLED 1 #endif +#ifdef CONFIG_NRFX_PPIB +#define NRFX_PPIB_ENABLED 1 +#endif +#ifdef CONFIG_NRFX_PPIB_LOG +#define NRFX_PPIB_CONFIG_LOG_ENABLED 1 +#endif +#ifdef CONFIG_NRFX_PPIB00 +#define NRFX_PPIB00_ENABLED 1 +#endif +#ifdef CONFIG_NRFX_PPIB01 +#define NRFX_PPIB01_ENABLED 1 +#endif +#ifdef CONFIG_NRFX_PPIB10 +#define NRFX_PPIB10_ENABLED 1 +#endif +#ifdef CONFIG_NRFX_PPIB11 +#define NRFX_PPIB11_ENABLED 1 +#endif +#ifdef CONFIG_NRFX_PPIB20 +#define NRFX_PPIB20_ENABLED 1 +#endif +#ifdef CONFIG_NRFX_PPIB21 +#define NRFX_PPIB21_ENABLED 1 +#endif +#ifdef CONFIG_NRFX_PPIB22 +#define NRFX_PPIB22_ENABLED 1 +#endif +#ifdef CONFIG_NRFX_PPIB30 +#define NRFX_PPIB30_ENABLED 1 +#endif + #ifdef CONFIG_NRFX_PRS #define NRFX_PRS_ENABLED 1 #endif