Skip to content

Add audio aux pll support to nrf tdm #98010

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: main
Choose a base branch
from
+36 −15
Open

Add audio aux pll support to nrf tdm #98010

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
8658ca0
drivers: i2s: Support audio auxpll in TDM driver
Oct 16, 2025
0b3d000
tests: drivers: Trigger drop event for proper clean-up
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
48 changes: 33 additions & 15 deletions drivers/i2s/i2s_nrf_tdm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <hal/nrf_tdm.h>
#include <haly/nrfy_gpio.h>
#include <zephyr/drivers/clock_control/nrf_clock_control.h>
#include <zephyr/dt-bindings/clock/nrf-auxpll.h>
#include <zephyr/drivers/i2s.h>
#include <zephyr/drivers/pinctrl.h>
#include <zephyr/irq.h>
Expand Down Expand Up @@ -47,11 +48,13 @@ LOG_MODULE_REGISTER(tdm_nrf, CONFIG_I2S_LOG_LEVEL);
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(audiopll))
#define NODE_ACLK DT_NODELABEL(audiopll)
#define ACLK_FREQUENCY DT_PROP_OR(NODE_ACLK, frequency, 0)

static const struct device *audiopll = DEVICE_DT_GET(NODE_ACLK);
static const struct nrf_clock_spec aclk_spec = {
.frequency = ACLK_FREQUENCY,
};
#elif DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(audio_auxpll))
#define NODE_AUDIO_AUXPLL DT_NODELABEL(audio_auxpll)
#define ACLK_NORDIC_FREQUENCY DT_PROP(NODE_AUDIO_AUXPLL, nordic_frequency)
BUILD_ASSERT((ACLK_NORDIC_FREQUENCY == NRF_AUXPLL_FREQ_DIV_AUDIO_48K) ||
(ACLK_NORDIC_FREQUENCY == NRF_AUXPLL_FREQ_DIV_AUDIO_44K1),
"Unsupported Audio AUXPLL frequency selection for TDM");
#define ACLK_FREQUENCY CLOCK_CONTROL_NRF_AUXPLL_GET_FREQ(NODE_AUDIO_AUXPLL)
#elif DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(aclk))
#define NODE_ACLK DT_NODELABEL(aclk)
#define ACLK_FREQUENCY DT_PROP_OR(NODE_ACLK, clock_frequency, 0)
Expand Down Expand Up @@ -107,7 +110,10 @@ struct tdm_drv_cfg {
};

struct tdm_drv_data {
#if CONFIG_CLOCK_CONTROL_NRF
#if CONFIG_CLOCK_CONTROL_NRFS_AUDIOPLL || DT_NODE_HAS_STATUS_OKAY(NODE_AUDIO_AUXPLL)
const struct device *audiopll;
struct nrf_clock_spec aclk_spec;
#elif CONFIG_CLOCK_CONTROL_NRF
struct onoff_manager *clk_mgr;
#endif
struct onoff_client clk_cli;
Expand All @@ -132,8 +138,10 @@ static int audio_clock_request(struct tdm_drv_data *drv_data)
{
#if DT_NODE_HAS_STATUS_OKAY(NODE_ACLK) && CONFIG_CLOCK_CONTROL_NRF
return onoff_request(drv_data->clk_mgr, &drv_data->clk_cli);
#elif DT_NODE_HAS_STATUS_OKAY(NODE_ACLK) && CONFIG_CLOCK_CONTROL_NRFS_AUDIOPLL
return nrf_clock_control_request(audiopll, &aclk_spec, &drv_data->clk_cli);
#elif (DT_NODE_HAS_STATUS_OKAY(NODE_ACLK) && CONFIG_CLOCK_CONTROL_NRFS_AUDIOPLL) || \
DT_NODE_HAS_STATUS_OKAY(NODE_AUDIO_AUXPLL)
return nrf_clock_control_request(drv_data->audiopll, &drv_data->aclk_spec,
&drv_data->clk_cli);
#else
(void)drv_data;

Expand All @@ -145,10 +153,9 @@ static int audio_clock_release(struct tdm_drv_data *drv_data)
{
#if DT_NODE_HAS_STATUS_OKAY(NODE_ACLK) && CONFIG_CLOCK_CONTROL_NRF
return onoff_release(drv_data->clk_mgr);
#elif DT_NODE_HAS_STATUS_OKAY(NODE_ACLK) && CONFIG_CLOCK_CONTROL_NRFS_AUDIOPLL
(void)drv_data;

return nrf_clock_control_release(audiopll, &aclk_spec);
#elif (DT_NODE_HAS_STATUS_OKAY(NODE_ACLK) && CONFIG_CLOCK_CONTROL_NRFS_AUDIOPLL) || \
DT_NODE_HAS_STATUS_OKAY(NODE_AUDIO_AUXPLL)
return nrf_clock_control_release(drv_data->audiopll, &drv_data->aclk_spec);
#else
(void)drv_data;

Expand Down Expand Up @@ -1120,6 +1127,16 @@ static void clock_manager_init(const struct device *dev)
subsys = CLOCK_CONTROL_NRF_SUBSYS_HFAUDIO;
drv_data->clk_mgr = z_nrf_clock_control_get_onoff(subsys);
__ASSERT_NO_MSG(drv_data->clk_mgr != NULL);
#elif DT_NODE_HAS_STATUS_OKAY(NODE_ACLK) && CONFIG_CLOCK_CONTROL_NRFS_AUDIOPLL
struct tdm_drv_data *drv_data = dev->data;

drv_data->audiopll = DEVICE_DT_GET(NODE_ACLK);
drv_data->aclk_spec.frequency = ACLK_FREQUENCY;
#elif DT_NODE_HAS_STATUS_OKAY(NODE_AUDIO_AUXPLL)
struct tdm_drv_data *drv_data = dev->data;

drv_data->audiopll = DEVICE_DT_GET(NODE_AUDIO_AUXPLL);
drv_data->aclk_spec.frequency = ACLK_FREQUENCY;
#else
(void)dev;
#endif
Expand Down Expand Up @@ -1194,9 +1211,10 @@ static DEVICE_API(i2s, tdm_nrf_drv_api) = {
clock_manager_init(dev); \
return 0; \
} \
BUILD_ASSERT((TDM_SCK_CLK_SRC(idx) != ACLK && TDM_MCK_CLK_SRC(idx) != ACLK) || \
DT_NODE_HAS_STATUS_OKAY(NODE_ACLK), \
"Clock source ACLK requires the audiopll node."); \
BUILD_ASSERT((TDM_SCK_CLK_SRC(idx) != ACLK && TDM_MCK_CLK_SRC(idx) != ACLK) || \
(DT_NODE_HAS_STATUS_OKAY(NODE_ACLK) || \
DT_NODE_HAS_STATUS_OKAY(NODE_AUDIO_AUXPLL)), \
"Clock source ACLK requires the audiopll/audio_auxpll node."); \
NRF_DT_CHECK_NODE_HAS_REQUIRED_MEMORY_REGIONS(TDM(idx)); \
DEVICE_DT_DEFINE(TDM(idx), tdm_nrf_init##idx, NULL, &tdm_nrf_data##idx, &tdm_nrf_cfg##idx, \
POST_KERNEL, CONFIG_I2S_INIT_PRIORITY, &tdm_nrf_drv_api);
Expand Down
3 changes: 3 additions & 0 deletions tests/drivers/i2s/i2s_api/src/test_i2s_errors.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ ZTEST_USER(i2s_errors, test_i2s_config_attempt_in_wrong_state)
err = i2s_trigger(dev_i2s, I2S_DIR_TX, I2S_TRIGGER_STOP);
zassert_equal(err, 0, "I2S_TRIGGER_STOP unexpected error: %d", err);

err = i2s_trigger(dev_i2s, I2S_DIR_TX, I2S_TRIGGER_DROP);
zassert_equal(err, 0, "I2S_TRIGGER_DROP unexpected error: %d", err);

zassert_not_equal(
config_err, 0,
"I2S configuration should not be possible in states other than I2S_STATE_READY");
Expand Down