Skip to content

[nrf fromtree] drivers: audio: dmic_nrfx: add support for audio_auxpl… #3268

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 1 commit into
base: main
Choose a base branch
from
+36 −22
Open

[nrf fromtree] drivers: audio: dmic_nrfx: add support for audio_auxpl… #3268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 35 additions & 20 deletions drivers/audio/dmic_nrfx_pdm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <zephyr/audio/dmic.h>
#include <zephyr/drivers/clock_control/nrf_clock_control.h>
#include <zephyr/drivers/pinctrl.h>
#include <zephyr/dt-bindings/clock/nrf-auxpll.h>
#include <soc.h>
#include <dmm.h>
#include <nrfx_pdm.h>
Expand All @@ -15,11 +16,20 @@
#include <zephyr/irq.h>
LOG_MODULE_REGISTER(dmic_nrfx_pdm, CONFIG_AUDIO_DMIC_LOG_LEVEL);

#define NODE_AUDIO_AUXPLL DT_NODELABEL(audio_auxpll)
#define NODE_AUDIOPLL DT_NODELABEL(audiopll)

#if CONFIG_SOC_SERIES_NRF54HX
#define DMIC_NRFX_CLOCK_FREQ MHZ(16)
#define DMIC_NRFX_CLOCK_FACTOR 8192
#define DMIC_NRFX_AUDIO_CLOCK_FREQ DT_PROP_OR(DT_NODELABEL(audiopll), frequency, 0)
#define DMIC_NRFX_AUDIO_CLOCK_FREQ DT_PROP_OR(NODE_AUDIOPLL, frequency, 0)
#elif DT_NODE_HAS_STATUS_OKAY(NODE_AUDIO_AUXPLL)
#define DMIC_NRFX_AUDIO_CLOCK_FREQ DT_PROP(NODE_AUDIO_AUXPLL, nordic_frequency)
BUILD_ASSERT((DMIC_NRFX_AUDIO_CLOCK_FREQ == NRF_AUXPLL_FREQ_DIV_AUDIO_48K) ||
(DMIC_NRFX_AUDIO_CLOCK_FREQ == NRF_AUXPLL_FREQ_DIV_AUDIO_44K1),
"Unsupported Audio AUXPLL frequency selection for PDM");
#define DMIC_NRFX_CLOCK_FREQ MHZ(32)
#else

Check notice on line 32 in drivers/audio/dmic_nrfx_pdm.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

drivers/audio/dmic_nrfx_pdm.c:32 
-	     (DMIC_NRFX_AUDIO_CLOCK_FREQ == NRF_AUXPLL_FREQ_DIV_AUDIO_44K1),
-	      "Unsupported Audio AUXPLL frequency selection for PDM");
-#define DMIC_NRFX_CLOCK_FREQ MHZ(32)
+		     (DMIC_NRFX_AUDIO_CLOCK_FREQ == NRF_AUXPLL_FREQ_DIV_AUDIO_44K1),
+	     "Unsupported Audio AUXPLL frequency selection for PDM");
+#define DMIC_NRFX_CLOCK_FREQ       MHZ(32)
#define DMIC_NRFX_CLOCK_FREQ MHZ(32)
#define DMIC_NRFX_CLOCK_FACTOR 4096
#define DMIC_NRFX_AUDIO_CLOCK_FREQ DT_PROP_OR(DT_NODELABEL(aclk), clock_frequency, \
Expand All @@ -28,10 +38,10 @@

struct dmic_nrfx_pdm_drv_data {
const nrfx_pdm_t *pdm;
#if CONFIG_CLOCK_CONTROL_NRF
struct onoff_manager *clk_mgr;
#elif CONFIG_CLOCK_CONTROL_NRFS_AUDIOPLL
#if CONFIG_CLOCK_CONTROL_NRFS_AUDIOPLL || DT_NODE_HAS_STATUS_OKAY(NODE_AUDIO_AUXPLL)
const struct device *audiopll_dev;
#elif CONFIG_CLOCK_CONTROL_NRF
struct onoff_manager *clk_mgr;
#endif
struct onoff_client clk_cli;
struct k_mem_slab *mem_slab;
Expand Down Expand Up @@ -73,10 +83,10 @@
if (!drv_data->request_clock) {
return 0;
}
#if CONFIG_CLOCK_CONTROL_NRF
return onoff_request(drv_data->clk_mgr, &drv_data->clk_cli);
#elif CONFIG_CLOCK_CONTROL_NRFS_AUDIOPLL
#if CONFIG_CLOCK_CONTROL_NRFS_AUDIOPLL || DT_NODE_HAS_STATUS_OKAY(NODE_AUDIO_AUXPLL)
return nrf_clock_control_request(drv_data->audiopll_dev, NULL, &drv_data->clk_cli);
#elif CONFIG_CLOCK_CONTROL_NRF
return onoff_request(drv_data->clk_mgr, &drv_data->clk_cli);
#else
return -ENOTSUP;
#endif
Expand All @@ -87,11 +97,10 @@
if (!drv_data->request_clock) {
return 0;
}

#if CONFIG_CLOCK_CONTROL_NRF
return onoff_release(drv_data->clk_mgr);
#elif CONFIG_CLOCK_CONTROL_NRFS_AUDIOPLL
#if CONFIG_CLOCK_CONTROL_NRFS_AUDIOPLL || DT_NODE_HAS_STATUS_OKAY(NODE_AUDIO_AUXPLL)
return nrf_clock_control_release(drv_data->audiopll_dev, NULL);
#elif CONFIG_CLOCK_CONTROL_NRF
return onoff_release(drv_data->clk_mgr);
#else
return -ENOTSUP;
#endif
Expand Down Expand Up @@ -657,9 +666,11 @@

static void init_clock_manager(const struct device *dev)
{
#if CONFIG_CLOCK_CONTROL_NRF
clock_control_subsys_t subsys;
struct dmic_nrfx_pdm_drv_data *drv_data = dev->data;
#if DT_NODE_HAS_STATUS_OKAY(NODE_AUDIO_AUXPLL)
drv_data->audiopll_dev = DEVICE_DT_GET(NODE_AUDIO_AUXPLL);
#elif CONFIG_CLOCK_CONTROL_NRF
clock_control_subsys_t subsys;
#if NRF_CLOCK_HAS_HFCLKAUDIO
const struct dmic_nrfx_pdm_drv_cfg *drv_cfg = dev->config;

Expand All @@ -676,7 +687,7 @@
#elif CONFIG_CLOCK_CONTROL_NRFS_AUDIOPLL
struct dmic_nrfx_pdm_drv_data *drv_data = dev->data;

drv_data->audiopll_dev = DEVICE_DT_GET(DT_NODELABEL(audiopll));
drv_data->audiopll_dev = DEVICE_DT_GET(NODE_AUDIOPLL);
#endif
}

Expand Down Expand Up @@ -737,16 +748,20 @@
hfclkaudio_frequency) || \
DT_NODE_HAS_PROP(DT_NODELABEL(aclk), \
clock_frequency) || \
DT_NODE_HAS_PROP(DT_NODELABEL(audiopll), \
frequency), \
"Clock source ACLK requires the hfclkaudio-frequency " \
"property to be defined in the nordic,nrf-clock node " \
"or clock-frequency property to be defined in aclk node" \
"or frequency property to be defined in audiopll node"); \
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);

Check notice on line 764 in drivers/audio/dmic_nrfx_pdm.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

drivers/audio/dmic_nrfx_pdm.c:764 
-#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,	     \
+#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) {

#ifdef CONFIG_HAS_HW_NRF_PDM0
PDM_NRFX_DEVICE(0);
Expand Down
3 changes: 1 addition & 2 deletions dts/bindings/audio/nordic,nrf-pdm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ properties:
(HFXO) for better clock accuracy and jitter performance
- "ACLK": Audio PLL clock with configurable frequency (frequency for
this clock must be set via the "hfclkaudio-frequency" property
in the "nordic,nrf-clock" node); this clock source is only available
in the nRF53 Series SoCs and it requires the use of HFXO
in the "nordic,nrf-clock" node); this clock source requires the use of HFXO
enum:
- "PCLK32M"
- "PCLK32M_HFXO"
Expand Down
Loading