michaelh/zephyr
1
0
Fork 0
Code Releases Activity

driver: i2s: fixing build error

Browse source 
some build error due to adding rt11xx support without testing

update mclk enable to avoid add pinmux driver

note:
  some other PRs still in progress to full enable i2s on rt platform

this fixing: #41153

Signed-off-by: Hake Huang <hake.huang@oss.nxp.com>
This commit is contained in:
Hake Huang 2021-12-15 00:49:58 +08:00 • committed by Carles Cufí
commit 2cbdd12e9c
1 changed files with 33 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

70
drivers/i2s/i2s_mcux_sai.c
View file

@ -18,7 +18,6 @@
#include <drivers/dma.h> #include <drivers/dma.h>
#include <drivers/i2s.h> #include <drivers/i2s.h>
#include <drivers/pinmux.h>
#include <drivers/clock_control.h> #include <drivers/clock_control.h>
#include <dt-bindings/clock/imx_ccm.h> #include <dt-bindings/clock/imx_ccm.h>
#include <soc.h> #include <soc.h>
@ -69,7 +68,6 @@ struct i2s_mcux_config {
uint32_t clk_src; uint32_t clk_src;
uint32_t clk_pre_div; uint32_t clk_pre_div;
uint32_t clk_src_div; uint32_t clk_src_div;
uint32_t clk_src;
uint32_t pll_src; uint32_t pll_src;
uint32_t pll_lp; uint32_t pll_lp;
uint32_t pll_pd; uint32_t pll_pd;
@ -80,7 +78,6 @@ struct i2s_mcux_config {
uint32_t tx_channel; uint32_t tx_channel;
clock_control_subsys_t clk_sub_sys; clock_control_subsys_t clk_sub_sys;
const struct device *ccm_dev; const struct device *ccm_dev;
const struct device *pinmux_dev;
void (*irq_connect)(const struct device *dev); void (*irq_connect)(const struct device *dev);
bool rx_sync_mode; bool rx_sync_mode;
bool tx_sync_mode; bool tx_sync_mode;
@ -329,25 +326,17 @@ static void i2s_dma_rx_callback(const struct device *dma_dev,
static void enable_mclk_direction(const struct device *dev, bool dir) static void enable_mclk_direction(const struct device *dev, bool dir)
{ {
const struct i2s_mcux_config *dev_cfg = dev->config; const struct i2s_mcux_config *dev_cfg = dev->config;
const struct device *iomuxgpr_dev = dev_cfg->pinmux_dev;
uint32_t offset = dev_cfg->mclk_pin_offset; uint32_t offset = dev_cfg->mclk_pin_offset;
uint32_t mask = dev_cfg->mclk_pin_mask; uint32_t mask = dev_cfg->mclk_pin_mask;
uint32_t value = 0; uint32_t value = 0;
uint32_t *gpr = (uint32_t *)DT_REG_ADDR(DT_NODELABEL(iomuxcgpr)) + offset;
if (iomuxgpr_dev == NULL) {
LOG_ERR("fail to find pinmux controller\n");
return;
}
pinmux_pin_get(iomuxgpr_dev, offset, &value);
if (dir) { if (dir) {
/* enable MCLK output */ *gpr |= mask;
value |= mask;
} else { } else {
/* disable MCLK output */ *gpr &= ~mask;
value &= ~mask;
} }
pinmux_pin_set(iomuxgpr_dev, offset, value);
} }
static void get_mclk_rate(const struct device *dev, uint32_t *mclk) static void get_mclk_rate(const struct device *dev, uint32_t *mclk)
@ -961,10 +950,11 @@ static void audio_clock_settings(const struct device *dev)
{ {
clock_audio_pll_config_t audioPllConfig; clock_audio_pll_config_t audioPllConfig;
const struct i2s_mcux_config *dev_cfg = dev->config; const struct i2s_mcux_config *dev_cfg = dev->config;
uint32_t clock_name = (uint32_t) dev_cfg->clk_sub_sys;
/*Clock setting for SAI*/ /*Clock setting for SAI*/
#if CONFIG_CLOCK_CONTROL_MCUX_CCM_REV2 #if CONFIG_CLOCK_CONTROL_MCUX_CCM_REV2
switch (dev_cfg->clk_sub_sys) { switch (clock_name) {
case IMX_CCM_SAI1_CLK: case IMX_CCM_SAI1_CLK:
CLOCK_SetRootClockMux(kCLOCK_Root_Sai1, dev_cfg->clk_src); CLOCK_SetRootClockMux(kCLOCK_Root_Sai1, dev_cfg->clk_src);
CLOCK_SetRootClockDiv(kCLOCK_Root_Sai1, dev_cfg->clk_src_div); CLOCK_SetRootClockDiv(kCLOCK_Root_Sai1, dev_cfg->clk_src_div);
@ -988,7 +978,7 @@ static void audio_clock_settings(const struct device *dev)
#endif #endif
#if CONFIG_CLOCK_CONTROL_MCUX_CCM #if CONFIG_CLOCK_CONTROL_MCUX_CCM
switch (dev_cfg->clk_sub_sys) { switch (clock_name) {
case IMX_CCM_SAI1_CLK: case IMX_CCM_SAI1_CLK:
CLOCK_SetMux(kCLOCK_Sai1Mux, dev_cfg->clk_src); CLOCK_SetMux(kCLOCK_Sai1Mux, dev_cfg->clk_src);
CLOCK_SetDiv(kCLOCK_Sai1PreDiv, dev_cfg->clk_pre_div); CLOCK_SetDiv(kCLOCK_Sai1PreDiv, dev_cfg->clk_pre_div);
@ -1097,29 +1087,35 @@ static const struct i2s_driver_api i2s_mcux_driver_api = {
\ \
static const struct i2s_mcux_config i2s_##i2s_id##_config = { \ static const struct i2s_mcux_config i2s_##i2s_id##_config = { \
.base = (I2S_Type *)DT_INST_REG_ADDR(i2s_id), \ .base = (I2S_Type *)DT_INST_REG_ADDR(i2s_id), \
.clk_src = DT_INST_CLOCKS_CELL_BY_IDX(i2s_id, 0, bits), \ .clk_src = \
.clk_pre_div = DT_INST_PROP(i2s_id, pre_div); \ DT_CLOCKS_CELL_BY_IDX(DT_DRV_INST(i2s_id), \
.clk_src_div = DT_INST_PROP(i2s_id, podf); \ 0, bits), \
.pll_src = DT_INST_PHA_BY_NAME(i2s_id, pll_clocks, src, \ .clk_pre_div = DT_INST_PROP(i2s_id, pre_div), \
value), \ .clk_src_div = DT_INST_PROP(i2s_id, podf), \
.pll_lp = DT_INST_PHA_BY_NAME(i2s_id, pll_clocks, lp, \ .pll_src = \
value), \ DT_PHA_BY_NAME(DT_DRV_INST(i2s_id), \
.pll_pd = DT_INST_PHA_BY_NAME(i2s_id, pll_clocks, pd, \ pll_clocks, src, value), \
value), \ .pll_lp = \
.pll_num = DT_INST_PHA_BY_NAME(i2s_id, pll_clocks, num, \ DT_PHA_BY_NAME(DT_DRV_INST(i2s_id), \
value), \ pll_clocks, lp, value), \
.pll_den = DT_INST_PHA_BY_NAME(i2s_id, pll_clocks, den, \ .pll_pd = \
value), \ DT_PHA_BY_NAME(DT_DRV_INST(i2s_id), \
.mclk_pin_mask = DT_INST_PHA_BY_IDX(i2s_id, pinmuxes, \ pll_clocks, pd, value), \
0, function), \ .pll_num = \
.mclk_pin_offset = DT_INST_PHA_BY_IDX(i2s_id, pinmuxs, \ DT_PHA_BY_NAME(DT_DRV_INST(i2s_id), \
0, pin), \ pll_clocks, num, value), \
.pll_den = \
DT_PHA_BY_NAME(DT_DRV_INST(i2s_id), \
pll_clocks, den, value), \
.mclk_pin_mask = \
DT_PHA_BY_IDX(DT_DRV_INST(i2s_id), \
pinmuxes, 0, function), \
.mclk_pin_offset = \
DT_PHA_BY_IDX(DT_DRV_INST(i2s_id), \
pinmuxes, 0, pin), \
.clk_sub_sys = (clock_control_subsys_t) \ .clk_sub_sys = (clock_control_subsys_t) \
DT_INST_CLOCKS_CELL_BY_IDX(i2s_id, 0, name), \ DT_INST_CLOCKS_CELL_BY_IDX(i2s_id, 0, name), \
.ccm_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(i2s_id)), \ .ccm_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(i2s_id)), \
.pinmux_dev = DEVICE_DT_GET( \
DT_INST_PHANDLE_BY_IDX(i2s_id, pinmuxes,\
0)), \
.irq_connect = i2s_irq_connect_##i2s_id, \ .irq_connect = i2s_irq_connect_##i2s_id, \
.tx_sync_mode = \ .tx_sync_mode = \
DT_INST_PROP(i2s_id, nxp_tx_sync_mode), \ DT_INST_PROP(i2s_id, nxp_tx_sync_mode), \