Skip to content

Commit 4bba44f

Browse files
jaz1-nordicmasz-nordic
authored andcommitted
[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 43938e0 commit 4bba44f

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
@@ -277,22 +277,7 @@ config NRFX_NVMC
277277
depends on $(dt_nodelabel_exists,flash_controller)
278278

279279
config NRFX_PDM
280-
bool
281-
282-
config NRFX_PDM0
283-
bool "PDM0 driver instance"
284-
depends on $(dt_nodelabel_exists,pdm0)
285-
select NRFX_PDM
286-
287-
config NRFX_PDM20
288-
bool "PDM20 driver instance"
289-
depends on $(dt_nodelabel_exists,pdm20)
290-
select NRFX_PDM
291-
292-
config NRFX_PDM21
293-
bool "PDM21 driver instance"
294-
depends on $(dt_nodelabel_exists,pdm21)
295-
select NRFX_PDM
280+
bool "PDM driver"
296281

297282
config NRFX_POWER
298283
bool "POWER driver"

modules/hal_nordic/nrfx/nrfx_kconfig.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -266,15 +266,6 @@
266266
#ifdef CONFIG_NRFX_PDM_LOG
267267
#define NRFX_PDM_CONFIG_LOG_ENABLED 1
268268
#endif
269-
#ifdef CONFIG_NRFX_PDM0
270-
#define NRFX_PDM0_ENABLED 1
271-
#endif
272-
#ifdef CONFIG_NRFX_PDM20
273-
#define NRFX_PDM20_ENABLED 1
274-
#endif
275-
#ifdef CONFIG_NRFX_PDM21
276-
#define NRFX_PDM21_ENABLED 1
277-
#endif
278269

279270
#ifdef CONFIG_NRFX_POWER
280271
#define NRFX_POWER_ENABLED 1

soc/nordic/common/Kconfig.peripherals

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,15 +123,6 @@ config HAS_HW_NRF_NVMC_PE
123123
config HAS_HW_NRF_OSCILLATORS
124124
def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_OSCILLATORS))
125125

126-
config HAS_HW_NRF_PDM0
127-
def_bool $(dt_nodelabel_enabled_with_compat,pdm0,$(DT_COMPAT_NORDIC_NRF_PDM))
128-
129-
config HAS_HW_NRF_PDM20
130-
def_bool $(dt_nodelabel_enabled_with_compat,pdm20,$(DT_COMPAT_NORDIC_NRF_PDM))
131-
132-
config HAS_HW_NRF_PDM21
133-
def_bool $(dt_nodelabel_enabled_with_compat,pdm21,$(DT_COMPAT_NORDIC_NRF_PDM))
134-
135126
config HAS_HW_NRF_POWER
136127
def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_POWER))
137128

0 commit comments

Comments
 (0)