michael/zephyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drivers: i2s: mcux_sai: init base,mask,offset as 0

Browse Source 
Initialize mclk_control_base,
mclk_pin_mask, mclk_pin_offset as 0
and skip mclk settings when
there is no property pinmuxes.

Signed-off-by: Biwen Li <biwen.li@nxp.com>
This commit is contained in:
Biwen Li
2025-10-20 18:05:30 +09:00
committed by Fabio Baltieri
parent 7cc95ae919
commit 7a1cc72efa
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/i2s/i2s_mcux_sai.c
View File

@@ -427,6 +427,10 @@ static void enable_mclk_direction(const struct device *dev, bool dir)
uint32_t mask = dev_cfg->mclk_pin_mask;
uint32_t *base = (uint32_t *)(control_base + offset);
if (control_base == 0 && offset == 0 && mask == 0) {
return;
}
if (dir) {
*base |= mask;
} else {
@@ -1215,6 +1219,15 @@ static DEVICE_API(i2s, i2s_mcux_driver_api) = {
.trigger = i2s_mcux_trigger,
};
#define I2S_MCUX_PINMUX_INIT(i2s_id) \
COND_CODE_1(DT_NODE_HAS_PROP(DT_DRV_INST(i2s_id), pinmuxes), \
(.mclk_control_base = DT_REG_ADDR(DT_PHANDLE(DT_DRV_INST(i2s_id), pinmuxes)), \
.mclk_pin_mask = DT_PHA_BY_IDX(DT_DRV_INST(i2s_id), pinmuxes, 0, mask), \
.mclk_pin_offset = DT_PHA_BY_IDX(DT_DRV_INST(i2s_id), pinmuxes, 0, offset),), \
(.mclk_control_base = 0, \
.mclk_pin_mask = 0, \
.mclk_pin_offset = 0,))
#define I2S_MCUX_INIT(i2s_id) \
static void i2s_irq_connect_##i2s_id(const struct device *dev); \
\
@@ -1230,10 +1243,7 @@ static DEVICE_API(i2s, i2s_mcux_driver_api) = {
.pll_pd = DT_PHA_BY_NAME_OR(DT_DRV_INST(i2s_id), pll_clocks, pd, value, 0), \
.pll_num = DT_PHA_BY_NAME_OR(DT_DRV_INST(i2s_id), pll_clocks, num, value, 0), \
.pll_den = DT_PHA_BY_NAME_OR(DT_DRV_INST(i2s_id), pll_clocks, den, value, 0), \
.mclk_control_base = COND_CODE_1(DT_NODE_HAS_PROP(DT_DRV_INST(i2s_id), pinmuxes), \
(DT_REG_ADDR(DT_PHANDLE(DT_DRV_INST(i2s_id), pinmuxes))), (0)), \
.mclk_pin_mask = DT_PHA_BY_IDX_OR(DT_DRV_INST(i2s_id), pinmuxes, 0, mask, 0), \
.mclk_pin_offset = DT_PHA_BY_IDX_OR(DT_DRV_INST(i2s_id), pinmuxes, 0, offset, 0), \
I2S_MCUX_PINMUX_INIT(i2s_id) \
.mclk_output = DT_INST_PROP_OR(i2s_id, mclk_output, 0), \
.clk_sub_sys = \
(clock_control_subsys_t)DT_INST_CLOCKS_CELL_BY_IDX(i2s_id, 0, name), \