Skip to content

Commit d86d82a

Browse files
committed
[nrf fromlist] soc: nordic: Remove PDM instances from Kconfigs
Remove PDM instances from Kconfig files. Upstream PR #: 97933 Signed-off-by: Jakub Zymelka <[email protected]>
1 parent 1b55b75 commit d86d82a

File tree

4 files changed

+2
-37
lines changed

4 files changed

+2
-37
lines changed

drivers/audio/Kconfig.dmic_pdm_nrfx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ config AUDIO_DMIC_NRFX_PDM
55
bool "nRF PDM nrfx driver"
66
default y
77
depends on DT_HAS_NORDIC_NRF_PDM_ENABLED
8-
select NRFX_PDM0 if HAS_HW_NRF_PDM0
9-
select NRFX_PDM20 if HAS_HW_NRF_PDM20
10-
select NRFX_PDM21 if HAS_HW_NRF_PDM21
8+
select NRFX_PDM
119
select PINCTRL
1210
help
1311
Enable support for nrfx PDM driver for nRF MCU series.

modules/hal_nordic/nrfx/Kconfig

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -287,22 +287,7 @@ config NRFX_NVMC
287287
depends on $(dt_nodelabel_exists,flash_controller)
288288

289289
config NRFX_PDM
290-
bool
291-
292-
config NRFX_PDM0
293-
bool "PDM0 driver instance"
294-
depends on $(dt_nodelabel_exists,pdm0)
295-
select NRFX_PDM
296-
297-
config NRFX_PDM20
298-
bool "PDM20 driver instance"
299-
depends on $(dt_nodelabel_exists,pdm20)
300-
select NRFX_PDM
301-
302-
config NRFX_PDM21
303-
bool "PDM21 driver instance"
304-
depends on $(dt_nodelabel_exists,pdm21)
305-
select NRFX_PDM
290+
bool "PDM driver"
306291

307292
config NRFX_POWER
308293
bool "POWER driver"

modules/hal_nordic/nrfx/nrfx_kconfig.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -272,15 +272,6 @@
272272
#ifdef CONFIG_NRFX_PDM_LOG
273273
#define NRFX_PDM_CONFIG_LOG_ENABLED 1
274274
#endif
275-
#ifdef CONFIG_NRFX_PDM0
276-
#define NRFX_PDM0_ENABLED 1
277-
#endif
278-
#ifdef CONFIG_NRFX_PDM20
279-
#define NRFX_PDM20_ENABLED 1
280-
#endif
281-
#ifdef CONFIG_NRFX_PDM21
282-
#define NRFX_PDM21_ENABLED 1
283-
#endif
284275

285276
#ifdef CONFIG_NRFX_POWER
286277
#define NRFX_POWER_ENABLED 1

soc/nordic/common/Kconfig.peripherals

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,6 @@ config HAS_HW_NRF_NVMC_PE
129129
config HAS_HW_NRF_OSCILLATORS
130130
def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_OSCILLATORS))
131131

132-
config HAS_HW_NRF_PDM0
133-
def_bool $(dt_nodelabel_enabled_with_compat,pdm0,$(DT_COMPAT_NORDIC_NRF_PDM))
134-
135-
config HAS_HW_NRF_PDM20
136-
def_bool $(dt_nodelabel_enabled_with_compat,pdm20,$(DT_COMPAT_NORDIC_NRF_PDM))
137-
138-
config HAS_HW_NRF_PDM21
139-
def_bool $(dt_nodelabel_enabled_with_compat,pdm21,$(DT_COMPAT_NORDIC_NRF_PDM))
140-
141132
config HAS_HW_NRF_POWER
142133
def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_POWER))
143134

0 commit comments

Comments
 (0)