michaelh/zephyr
1
0
Fork 0
Code Releases Activity

modules: hal_nordic: nrfx: Handle properly I2S0 instance

Browse source 
Although existing nRF SoCs have only one I2S instance, the nrfx_i2s
driver has now multi-instance API and the related nrfx configuration
symbols need to be used appropriately.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This commit is contained in:
Andrzej Głąbek 2023-05-05 09:44:25 +02:00 • committed by Carles Cufí
commit 7a54aed015
4 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/i2s/Kconfig.nrfx
View file

@ -5,7 +5,7 @@ menuconfig I2S_NRFX
bool "nRF I2S nrfx driver" bool "nRF I2S nrfx driver"
default y default y
depends on DT_HAS_NORDIC_NRF_I2S_ENABLED depends on DT_HAS_NORDIC_NRF_I2S_ENABLED
select NRFX_I2S select NRFX_I2S0 if HAS_HW_NRF_I2S0
help help
Enable support for nrfx I2S driver for nRF MCU series. Enable support for nrfx I2S driver for nRF MCU series.

8
modules/hal_nordic/nrfx/Kconfig
View file

@ -73,8 +73,12 @@ config NRFX_GPIOTE_NUM_OF_EVT_HANDLERS
by the user. by the user.
config NRFX_I2S config NRFX_I2S
bool "I2S driver" bool
depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_I2S))
config NRFX_I2S0
bool "I2S0 driver instance"
depends on $(dt_nodelabel_has_compat,i2s0,$(DT_COMPAT_NORDIC_NRF_I2S))
select NRFX_I2S
config NRFX_IPC config NRFX_IPC
bool "IPC driver" bool "IPC driver"

3
modules/hal_nordic/nrfx/nrfx_config.h
View file

@ -111,6 +111,9 @@
#ifdef CONFIG_NRFX_I2S #ifdef CONFIG_NRFX_I2S
#define NRFX_I2S_ENABLED 1 #define NRFX_I2S_ENABLED 1
#endif #endif
#ifdef CONFIG_NRFX_I2S0
#define NRFX_I2S0_ENABLED 1
#endif
#ifdef CONFIG_NRFX_IPC #ifdef CONFIG_NRFX_IPC
#define NRFX_IPC_ENABLED 1 #define NRFX_IPC_ENABLED 1

4
soc/arm/nordic_nrf/Kconfig.peripherals
View file

@ -69,8 +69,8 @@ config HAS_HW_NRF_GPIO1
config HAS_HW_NRF_GPIOTE config HAS_HW_NRF_GPIOTE
def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_GPIOTE)) def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_GPIOTE))
config HAS_HW_NRF_I2S config HAS_HW_NRF_I2S0
def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_I2S)) def_bool $(dt_nodelabel_enabled_with_compat,i2s0,$(DT_COMPAT_NORDIC_NRF_I2S))
config HAS_HW_NRF_IPC config HAS_HW_NRF_IPC
def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_IPC)) def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_IPC))