From 9e0e41ea1da79371c246c324fede4cff3a2393af Mon Sep 17 00:00:00 2001 From: Declan Snyder Date: Wed, 20 Nov 2024 17:57:54 -0600 Subject: [PATCH] drivers: i2s_mcux_sai: clock config readability Change this code about the frame and bit clock to be more readable Signed-off-by: Declan Snyder --- drivers/i2s/i2s_mcux_sai.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/drivers/i2s/i2s_mcux_sai.c b/drivers/i2s/i2s_mcux_sai.c index 1ab2ba7e646c1a..1e3737b7c64ef5 100644 --- a/drivers/i2s/i2s_mcux_sai.c +++ b/drivers/i2s/i2s_mcux_sai.c @@ -541,18 +541,17 @@ static int i2s_mcux_config(const struct device *dev, enum i2s_dir dir, config.syncMode = dev_cfg->rx_sync_mode; } - if (i2s_cfg->options & I2S_OPT_FRAME_CLK_SLAVE) { - if (i2s_cfg->options & I2S_OPT_BIT_CLK_SLAVE) { - config.masterSlave = kSAI_Slave; - } else { - config.masterSlave = kSAI_Bclk_Master_FrameSync_Slave; - } + bool frame_clk_slave = i2s_cfg->options & I2S_OPT_FRAME_CLK_SLAVE; + bool bit_clk_slave = i2s_cfg->options & I2S_OPT_BIT_CLK_SLAVE; + + if (frame_clk_slave && bit_clk_slave) { + config.masterSlave = kSAI_Slave; + } else if (frame_clk_slave && !bit_clk_slave) { + config.masterSlave = kSAI_Bclk_Master_FrameSync_Slave; + } else if (!frame_clk_slave && bit_clk_slave) { + config.masterSlave = kSAI_Bclk_Slave_FrameSync_Master; } else { - if (i2s_cfg->options & I2S_OPT_BIT_CLK_SLAVE) { - config.masterSlave = kSAI_Bclk_Slave_FrameSync_Master; - } else { - config.masterSlave = kSAI_Master; - } + config.masterSlave = kSAI_Master; } /* clock signal polarity */ @@ -568,7 +567,6 @@ static int i2s_mcux_config(const struct device *dev, enum i2s_dir dir, ? kSAI_SampleOnRisingEdge : kSAI_SampleOnFallingEdge; break; - case I2S_FMT_CLK_IF_NB: /* Swap frame sync polarity */ config.frameSync.frameSyncPolarity = @@ -576,7 +574,6 @@ static int i2s_mcux_config(const struct device *dev, enum i2s_dir dir, ? kSAI_PolarityActiveLow : kSAI_PolarityActiveHigh; break; - case I2S_FMT_CLK_IF_IB: /* Swap frame sync and bclk polarity */ config.frameSync.frameSyncPolarity =