Skip to content

Pull latest version of the PDM driver #2789

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

Merged
merged 2 commits into from
Apr 22, 2025
Merged

Pull latest version of the PDM driver #2789

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1a9b65
Revert "[nrf fromlist] drivers: audio: dmic_nrfx: add support for aud…
nordic-segl Apr 17, 2025
b46d2c0
[nrf fromlist] drivers: audio: dmic_nrfx: add support for audio clock…
mstasiaknordic Apr 1, 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
14 changes: 7 additions & 7 deletions drivers/audio/dmic_nrfx_pdm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@ LOG_MODULE_REGISTER(dmic_nrfx_pdm, CONFIG_AUDIO_DMIC_LOG_LEVEL);
#else
#define DMIC_NRFX_CLOCK_FREQ MHZ(32)
#define DMIC_NRFX_CLOCK_FACTOR 4096
#define DMIC_NRFX_AUDIO_CLOCK_FREQ \
COND_CODE_1(CONFIG_SOC_NRF54L20, \
(DT_PROP_OR(DT_NODELABEL(aclk), clock_frequency, 0)), \
(DT_PROP_OR(DT_NODELABEL(clock), hfclkaudio_frequency, 0)))
#define DMIC_NRFX_AUDIO_CLOCK_FREQ DT_PROP_OR(DT_NODELABEL(aclk), clock_frequency, \
DT_PROP_OR(DT_NODELABEL(clock), hfclkaudio_frequency, 0))
#endif

struct dmic_nrfx_pdm_drv_data {
Expand Down Expand Up @@ -80,7 +78,7 @@ static int request_clock(struct dmic_nrfx_pdm_drv_data *drv_data)
#elif CONFIG_CLOCK_CONTROL_NRF2_AUDIOPLL
return nrf_clock_control_request(drv_data->audiopll_dev, NULL, &drv_data->clk_cli);
#else
return 0;
return -ENOTSUP;
#endif
}

Expand All @@ -95,7 +93,7 @@ static int release_clock(struct dmic_nrfx_pdm_drv_data *drv_data)
#elif CONFIG_CLOCK_CONTROL_NRF2_AUDIOPLL
return nrf_clock_control_release(drv_data->audiopll_dev, NULL);
#else
return 0;
return -ENOTSUP;
#endif
}

Expand Down Expand Up @@ -513,8 +511,10 @@ static int dmic_nrfx_pdm_configure(const struct device *dev,
* (which is always available without any additional actions),
* it is required to request the proper clock to be running
* before starting the transfer itself.
* Targets using CLKSELECT register to select clock source
* do not need to request audio clock.
*/
drv_data->request_clock = (drv_cfg->clk_src != PCLK32M);
drv_data->request_clock = (drv_cfg->clk_src != PCLK32M && !NRF_PDM_HAS_CLKSELECT);
drv_data->configured = true;
return 0;
}
Expand Down