Skip to content

[nrf fromlist] drivers: audio: pdm: Align to driver without cb #3416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: collab-nrfx-4.0
Choose a base branch
from
Open

[nrf fromlist] drivers: audio: pdm: Align to driver without cb #3416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecc3081
[nrf fromlist] soc: nordic: Remove PDM instances from Kconfigs
jaz1-nordic Oct 20, 2025
db968c6
[nrf fromlist] drivers: audio: pdm: Align to driver without cb
jaz1-nordic Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions drivers/audio/Kconfig.dmic_pdm_nrfx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ config AUDIO_DMIC_NRFX_PDM
bool "nRF PDM nrfx driver"
default y
depends on DT_HAS_NORDIC_NRF_PDM_ENABLED
select NRFX_PDM0 if HAS_HW_NRF_PDM0
select NRFX_PDM20 if HAS_HW_NRF_PDM20
select NRFX_PDM21 if HAS_HW_NRF_PDM21
select NRFX_PDM
select PINCTRL
help
Enable support for nrfx PDM driver for nRF MCU series.
172 changes: 77 additions & 95 deletions drivers/audio/dmic_nrfx_pdm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/

#define DT_DRV_COMPAT nordic_nrf_pdm

#include <zephyr/audio/dmic.h>
#include <zephyr/drivers/clock_control/nrf_clock_control.h>
#include <zephyr/drivers/pinctrl.h>
Expand Down Expand Up @@ -35,7 +37,7 @@ BUILD_ASSERT((DMIC_NRFX_AUDIO_CLOCK_FREQ == NRF_AUXPLL_FREQ_DIV_AUDIO_48K) ||
#endif

struct dmic_nrfx_pdm_drv_data {
const nrfx_pdm_t *pdm;
nrfx_pdm_t pdm;
#if CONFIG_CLOCK_CONTROL_NRFS_AUDIOPLL || DT_NODE_HAS_STATUS_OKAY(NODE_AUDIO_AUXPLL)
const struct device *audiopll_dev;
#elif CONFIG_CLOCK_CONTROL_NRF
Expand Down Expand Up @@ -73,7 +75,7 @@ static void free_buffer(struct dmic_nrfx_pdm_drv_data *drv_data, void *buffer)
static void stop_pdm(struct dmic_nrfx_pdm_drv_data *drv_data)
{
drv_data->stopping = true;
nrfx_pdm_stop(drv_data->pdm);
nrfx_pdm_stop(&drv_data->pdm);
}

static int request_clock(struct dmic_nrfx_pdm_drv_data *drv_data)
Expand Down Expand Up @@ -114,7 +116,7 @@ static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)

if (evt->buffer_requested) {
void *buffer;
nrfx_err_t err;
int err;

ret = k_mem_slab_alloc(drv_data->mem_slab, &mem_slab_buffer, K_NO_WAIT);
if (ret < 0) {
Expand All @@ -136,9 +138,9 @@ static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)
stop_pdm(drv_data);
return;
}
err = nrfx_pdm_buffer_set(drv_data->pdm, buffer, drv_data->block_size / 2);
if (err != NRFX_SUCCESS) {
LOG_ERR("Failed to set buffer: 0x%08x", err);
err = nrfx_pdm_buffer_set(&drv_data->pdm, buffer, drv_data->block_size / 2);
if (err != 0) {
LOG_ERR("Failed to set buffer: %d", err);
stop = true;
}
}
Expand Down Expand Up @@ -209,7 +211,7 @@ static int dmic_nrfx_pdm_configure(const struct device *dev,
struct pcm_stream_cfg *stream = &config->streams[0];
uint32_t def_map, alt_map;
nrfx_pdm_config_t nrfx_cfg;
nrfx_err_t err;
int err;

if (drv_data->active) {
LOG_ERR("Cannot configure device while it is active");
Expand Down Expand Up @@ -255,7 +257,7 @@ static int dmic_nrfx_pdm_configure(const struct device *dev,
/* If either rate or width is 0, the stream is to be disabled. */
if (stream->pcm_rate == 0 || stream->pcm_width == 0) {
if (drv_data->configured) {
nrfx_pdm_uninit(drv_data->pdm);
nrfx_pdm_uninit(&drv_data->pdm);
drv_data->configured = false;
}

Expand Down Expand Up @@ -292,19 +294,19 @@ static int dmic_nrfx_pdm_configure(const struct device *dev,
.output_freq_max = config->io.max_pdm_clk_freq
};

if (nrfx_pdm_prescalers_calc(&output_config, &nrfx_cfg.prescalers) != NRFX_SUCCESS) {
if (nrfx_pdm_prescalers_calc(&output_config, &nrfx_cfg.prescalers) != 0) {
LOG_ERR("Cannot find suitable PDM clock configuration.");
return -EINVAL;
}

if (drv_data->configured) {
nrfx_pdm_uninit(drv_data->pdm);
nrfx_pdm_uninit(&drv_data->pdm);
drv_data->configured = false;
}

err = nrfx_pdm_init(drv_data->pdm, &nrfx_cfg, drv_cfg->event_handler);
if (err != NRFX_SUCCESS) {
LOG_ERR("Failed to initialize PDM: 0x%08x", err);
err = nrfx_pdm_init(&drv_data->pdm, &nrfx_cfg, drv_cfg->event_handler);
if (err != 0) {
LOG_ERR("Failed to initialize PDM: %d", err);
return -EIO;
}

Expand All @@ -325,15 +327,15 @@ static int dmic_nrfx_pdm_configure(const struct device *dev,

static int start_transfer(struct dmic_nrfx_pdm_drv_data *drv_data)
{
nrfx_err_t err;
int err;
int ret;

err = nrfx_pdm_start(drv_data->pdm);
if (err == NRFX_SUCCESS) {
err = nrfx_pdm_start(&drv_data->pdm);
if (err == 0) {
return 0;
}

LOG_ERR("Failed to start PDM: 0x%08x", err);
LOG_ERR("Failed to start PDM: %d", err);
ret = -EIO;

ret = release_clock(drv_data);
Expand Down Expand Up @@ -410,7 +412,7 @@ static int dmic_nrfx_pdm_trigger(const struct device *dev,
case DMIC_TRIGGER_STOP:
if (drv_data->active) {
drv_data->stopping = true;
nrfx_pdm_stop(drv_data->pdm);
nrfx_pdm_stop(&drv_data->pdm);
}
break;

Expand Down Expand Up @@ -493,80 +495,60 @@ static const struct _dmic_ops dmic_ops = {
.read = dmic_nrfx_pdm_read,
};

#define PDM(idx) DT_NODELABEL(pdm##idx)
#define PDM_CLK_SRC(idx) DT_STRING_TOKEN(PDM(idx), clock_source)

#define PDM_NRFX_DEVICE(idx) \
static void *rx_msgs##idx[DT_PROP(PDM(idx), queue_size)]; \
static void *mem_slab_msgs##idx[DT_PROP(PDM(idx), queue_size)]; \
static struct dmic_nrfx_pdm_drv_data dmic_nrfx_pdm_data##idx; \
static const nrfx_pdm_t dmic_nrfx_pdm##idx = NRFX_PDM_INSTANCE(idx); \
static int pdm_nrfx_init##idx(const struct device *dev) \
{ \
IRQ_CONNECT(DT_IRQN(PDM(idx)), DT_IRQ(PDM(idx), priority), \
nrfx_isr, nrfx_pdm_##idx##_irq_handler, 0); \
const struct dmic_nrfx_pdm_drv_cfg *drv_cfg = dev->config; \
int err = pinctrl_apply_state(drv_cfg->pcfg, \
PINCTRL_STATE_DEFAULT); \
if (err < 0) { \
return err; \
} \
dmic_nrfx_pdm_data##idx.pdm = &dmic_nrfx_pdm##idx; \
k_msgq_init(&dmic_nrfx_pdm_data##idx.rx_queue, \
(char *)rx_msgs##idx, sizeof(void *), \
ARRAY_SIZE(rx_msgs##idx)); \
k_msgq_init(&dmic_nrfx_pdm_data##idx.mem_slab_queue, \
(char *)mem_slab_msgs##idx, sizeof(void *), \
ARRAY_SIZE(mem_slab_msgs##idx)); \
init_clock_manager(dev); \
return 0; \
} \
static void event_handler##idx(const nrfx_pdm_evt_t *evt) \
{ \
event_handler(DEVICE_DT_GET(PDM(idx)), evt); \
} \
PINCTRL_DT_DEFINE(PDM(idx)); \
static const struct dmic_nrfx_pdm_drv_cfg dmic_nrfx_pdm_cfg##idx = { \
.event_handler = event_handler##idx, \
.nrfx_def_cfg = NRFX_PDM_DEFAULT_CONFIG(0, 0), \
.nrfx_def_cfg.skip_gpio_cfg = true, \
.nrfx_def_cfg.skip_psel_cfg = true, \
.pcfg = PINCTRL_DT_DEV_CONFIG_GET(PDM(idx)), \
.clk_src = PDM_CLK_SRC(idx), \
.mem_reg = DMM_DEV_TO_REG(PDM(idx)), \
}; \
NRF_DT_CHECK_NODE_HAS_REQUIRED_MEMORY_REGIONS(PDM(idx)); \
BUILD_ASSERT(PDM_CLK_SRC(idx) != ACLK || \
NRF_PDM_HAS_SELECTABLE_CLOCK, \
"Clock source ACLK is not available."); \
BUILD_ASSERT(PDM_CLK_SRC(idx) != ACLK || \
DT_NODE_HAS_PROP(DT_NODELABEL(clock), \
hfclkaudio_frequency) || \
DT_NODE_HAS_PROP(DT_NODELABEL(aclk), \
clock_frequency) || \
DT_NODE_HAS_PROP(NODE_AUDIOPLL, \
frequency) || \
DT_NODE_HAS_PROP(NODE_AUDIO_AUXPLL, \
nordic_frequency), \
"Clock source ACLK requires one following defined frequency "\
"properties: " \
"hfclkaudio-frequency in the nordic,nrf-clock node, " \
"clock-frequency in the aclk node, " \
"frequency in the audiopll node, " \
"nordic-frequency in the audio_auxpll node"); \
DEVICE_DT_DEFINE(PDM(idx), pdm_nrfx_init##idx, NULL, \
&dmic_nrfx_pdm_data##idx, &dmic_nrfx_pdm_cfg##idx, \
POST_KERNEL, CONFIG_AUDIO_DMIC_INIT_PRIORITY, \
&dmic_ops);

#ifdef CONFIG_HAS_HW_NRF_PDM0
PDM_NRFX_DEVICE(0);
#endif

#ifdef CONFIG_HAS_HW_NRF_PDM20
PDM_NRFX_DEVICE(20);
#endif

#ifdef CONFIG_HAS_HW_NRF_PDM21
PDM_NRFX_DEVICE(21);
#endif
#define PDM_CLK_SRC(inst) DT_STRING_TOKEN(DT_DRV_INST(inst), clock_source)

#define PDM_NRFX_DEVICE(inst) \
static void *rx_msgs##inst[DT_INST_PROP(inst, queue_size)]; \
static void *mem_slab_msgs##inst[DT_INST_PROP(inst, queue_size)]; \
static struct dmic_nrfx_pdm_drv_data dmic_nrfx_pdm_data##inst = { \
.pdm = NRFX_PDM_INSTANCE(DT_INST_REG_ADDR(inst)), \
}; \
static int pdm_nrfx_init##inst(const struct device *dev) \
{ \
IRQ_CONNECT(DT_INST_IRQN(inst), DT_INST_IRQ(inst, priority), nrfx_pdm_irq_handler, \
&dmic_nrfx_pdm_data##inst.pdm, 0); \
const struct dmic_nrfx_pdm_drv_cfg *drv_cfg = dev->config; \
int err = pinctrl_apply_state(drv_cfg->pcfg, PINCTRL_STATE_DEFAULT); \
if (err < 0) { \
return err; \
} \
k_msgq_init(&dmic_nrfx_pdm_data##inst.rx_queue, (char *)rx_msgs##inst, \
sizeof(void *), ARRAY_SIZE(rx_msgs##inst)); \
k_msgq_init(&dmic_nrfx_pdm_data##inst.mem_slab_queue, (char *)mem_slab_msgs##inst, \
sizeof(void *), ARRAY_SIZE(mem_slab_msgs##inst)); \
init_clock_manager(dev); \
return 0; \
} \
static void event_handler##inst(const nrfx_pdm_evt_t *evt) \
{ \
event_handler(DEVICE_DT_INST_GET(inst), evt); \
} \
PINCTRL_DT_INST_DEFINE(inst); \
static const struct dmic_nrfx_pdm_drv_cfg dmic_nrfx_pdm_cfg##inst = { \
.event_handler = event_handler##inst, \
.nrfx_def_cfg = NRFX_PDM_DEFAULT_CONFIG(0, 0), \
.nrfx_def_cfg.skip_gpio_cfg = true, \
.nrfx_def_cfg.skip_psel_cfg = true, \
.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(inst), \
.clk_src = PDM_CLK_SRC(inst), \
.mem_reg = DMM_DEV_TO_REG(DT_DRV_INST(inst)), \
}; \
NRF_DT_CHECK_NODE_HAS_REQUIRED_MEMORY_REGIONS(DT_DRV_INST(inst)); \
BUILD_ASSERT(PDM_CLK_SRC(inst) != ACLK || NRF_PDM_HAS_SELECTABLE_CLOCK, \
"Clock source ACLK is not available."); \
BUILD_ASSERT(PDM_CLK_SRC(inst) != ACLK || \
DT_NODE_HAS_PROP(DT_NODELABEL(clock), hfclkaudio_frequency) || \
DT_NODE_HAS_PROP(DT_NODELABEL(aclk), clock_frequency) || \
DT_NODE_HAS_PROP(NODE_AUDIOPLL, frequency) || \
DT_NODE_HAS_PROP(NODE_AUDIO_AUXPLL, nordic_frequency), \
"Clock source ACLK requires one following defined frequency " \
"properties: " \
"hfclkaudio-frequency in the nordic,nrf-clock node, " \
"clock-frequency in the aclk node, " \
"frequency in the audiopll node, " \
"nordic-frequency in the audio_auxpll node"); \
DEVICE_DT_INST_DEFINE(inst, pdm_nrfx_init##inst, NULL, &dmic_nrfx_pdm_data##inst, \
&dmic_nrfx_pdm_cfg##inst, POST_KERNEL, \
CONFIG_AUDIO_DMIC_INIT_PRIORITY, &dmic_ops);

DT_INST_FOREACH_STATUS_OKAY(PDM_NRFX_DEVICE)
17 changes: 1 addition & 16 deletions modules/hal_nordic/nrfx/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,22 +287,7 @@ config NRFX_NVMC
depends on $(dt_nodelabel_exists,flash_controller)

config NRFX_PDM
bool

config NRFX_PDM0
bool "PDM0 driver instance"
depends on $(dt_nodelabel_exists,pdm0)
select NRFX_PDM

config NRFX_PDM20
bool "PDM20 driver instance"
depends on $(dt_nodelabel_exists,pdm20)
select NRFX_PDM

config NRFX_PDM21
bool "PDM21 driver instance"
depends on $(dt_nodelabel_exists,pdm21)
select NRFX_PDM
bool "PDM driver"

config NRFX_POWER
bool "POWER driver"
Expand Down
9 changes: 0 additions & 9 deletions modules/hal_nordic/nrfx/nrfx_kconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,15 +272,6 @@
#ifdef CONFIG_NRFX_PDM_LOG
#define NRFX_PDM_CONFIG_LOG_ENABLED 1
#endif
#ifdef CONFIG_NRFX_PDM0
#define NRFX_PDM0_ENABLED 1
#endif
#ifdef CONFIG_NRFX_PDM20
#define NRFX_PDM20_ENABLED 1
#endif
#ifdef CONFIG_NRFX_PDM21
#define NRFX_PDM21_ENABLED 1
#endif

#ifdef CONFIG_NRFX_POWER
#define NRFX_POWER_ENABLED 1
Expand Down
9 changes: 0 additions & 9 deletions soc/nordic/common/Kconfig.peripherals
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,6 @@ config HAS_HW_NRF_NVMC_PE
config HAS_HW_NRF_OSCILLATORS
def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_OSCILLATORS))

config HAS_HW_NRF_PDM0
def_bool $(dt_nodelabel_enabled_with_compat,pdm0,$(DT_COMPAT_NORDIC_NRF_PDM))

config HAS_HW_NRF_PDM20
def_bool $(dt_nodelabel_enabled_with_compat,pdm20,$(DT_COMPAT_NORDIC_NRF_PDM))

config HAS_HW_NRF_PDM21
def_bool $(dt_nodelabel_enabled_with_compat,pdm21,$(DT_COMPAT_NORDIC_NRF_PDM))

config HAS_HW_NRF_POWER
def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_POWER))

Expand Down
Loading