Skip to content

Commit 48a1e6e

Browse files
committed
[nrf fromlist] soc: nordic: Remove I2S instances from Kconfigs
Remove I2S instances from Kconfig files. Upstream PR #: 97915 Signed-off-by: Jakub Zymelka <[email protected]>
1 parent 85ccd8b commit 48a1e6e

File tree

4 files changed

+2
-25
lines changed

4 files changed

+2
-25
lines changed

drivers/i2s/Kconfig.nrfx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ menuconfig I2S_NRFX
55
bool "nRF I2S nrfx driver"
66
default y
77
depends on DT_HAS_NORDIC_NRF_I2S_ENABLED
8-
select NRFX_I2S0 if HAS_HW_NRF_I2S0
9-
select NRFX_I2S20 if HAS_HW_NRF_I2S20
8+
select NRFX_I2S
109
select PINCTRL
1110
help
1211
Enable support for nrfx I2S driver for nRF MCU series.

modules/hal_nordic/nrfx/Kconfig

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -252,17 +252,7 @@ config NRFX_GRTC
252252
depends on $(dt_nodelabel_exists,grtc)
253253

254254
config NRFX_I2S
255-
bool
256-
257-
config NRFX_I2S0
258-
bool "I2S0 driver instance"
259-
depends on $(dt_nodelabel_exists,i2s0)
260-
select NRFX_I2S
261-
262-
config NRFX_I2S20
263-
bool "I2S20 driver instance"
264-
depends on $(dt_nodelabel_exists,i2s20)
265-
select NRFX_I2S
255+
bool "I2S driver"
266256

267257
config NRFX_IPC
268258
bool "IPC driver"

modules/hal_nordic/nrfx/nrfx_kconfig.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -224,12 +224,6 @@
224224
#ifdef CONFIG_NRFX_I2S_LOG
225225
#define NRFX_I2S_CONFIG_LOG_ENABLED 1
226226
#endif
227-
#ifdef CONFIG_NRFX_I2S0
228-
#define NRFX_I2S0_ENABLED 1
229-
#endif
230-
#ifdef CONFIG_NRFX_I2S20
231-
#define NRFX_I2S20_ENABLED 1
232-
#endif
233227

234228
#ifdef CONFIG_NRFX_IPC
235229
#define NRFX_IPC_ENABLED 1

soc/nordic/common/Kconfig.peripherals

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,6 @@ config HAS_HW_NRF_GPIOTE131
9898
config HAS_HW_NRF_GRTC
9999
def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_GRTC))
100100

101-
config HAS_HW_NRF_I2S0
102-
def_bool $(dt_nodelabel_enabled_with_compat,i2s0,$(DT_COMPAT_NORDIC_NRF_I2S))
103-
104-
config HAS_HW_NRF_I2S20
105-
def_bool $(dt_nodelabel_enabled_with_compat,i2s20,$(DT_COMPAT_NORDIC_NRF_I2S))
106-
107101
config HAS_HW_NRF_KMU
108102
def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_KMU))
109103

0 commit comments

Comments
 (0)