Skip to content

driver: i2s: fix nxp i2s fifo combine values #97039

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

Merged
merged 1 commit into from
Oct 7, 2025
Merged

driver: i2s: fix nxp i2s fifo combine values #97039

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
8 changes: 2 additions & 6 deletions drivers/i2s/i2s_mcux_sai.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,11 +614,7 @@ static int i2s_mcux_config(const struct device *dev, enum i2s_dir dir,

config.fifo.fifoWatermark = (uint32_t)FSL_FEATURE_SAI_FIFO_COUNTn(base) - 1;
#if defined(FSL_FEATURE_SAI_HAS_FIFO_COMBINE_MODE) && FSL_FEATURE_SAI_HAS_FIFO_COMBINE_MODE
/*
* TX FIFO combine on write. The value below has correct value and wrong name
* because RX and TX definitions are different but MCUX uses the same for both.
*/
config.fifo.fifoCombine = kSAI_FifoCombineModeEnabledOnRead;
config.fifo.fifoCombine = kSAI_FifoCombineModeEnabledOnWrite;
#endif
/* set bit clock divider */
SAI_TxSetConfig(base, &config);
Expand All @@ -639,7 +635,7 @@ static int i2s_mcux_config(const struct device *dev, enum i2s_dir dir,
/* For RX, DMA reads from FIFO whenever data present */
config.fifo.fifoWatermark = 0;
#if defined(FSL_FEATURE_SAI_HAS_FIFO_COMBINE_MODE) && FSL_FEATURE_SAI_HAS_FIFO_COMBINE_MODE
config.fifo.fifoCombine = kSAI_FifoCombineModeEnabledOnRead;
config.fifo.fifoCombine = kSAI_RXFifoCombineModeEnabledOnRead;
#endif

memcpy(&dev_data->rx.cfg, i2s_cfg, sizeof(struct i2s_config));
Expand Down