Skip to content

Conversation

herculanodavi
Copy link
Contributor

MCUX defined RX fifo combine names and the references need to be adjusted in the i2s driver.

Current definition:

typedef enum _sai_fifo_combine
{
    kSAI_FifoCombineDisabled               = 0U, /*!< sai TX/RX fifo combine mode disabled */
    kSAI_FifoCombineModeEnabledOnRead      = 1U, /*!< sai TX fifo combine mode enabled on FIFO reads */
    kSAI_FifoCombineModeEnabledOnWrite     = 2U, /*!< sai TX fifo combine mode enabled on FIFO write */
    kSAI_RxFifoCombineModeEnabledOnWrite   = 1U, /*!< sai RX fifo combine mode enabled on FIFO write */
    kSAI_RXFifoCombineModeEnabledOnRead    = 2U, /*!< sai RX fifo combine mode enabled on FIFO reads */
    kSAI_FifoCombineModeEnabledOnReadWrite = 3U, /*!< sai TX/RX fifo combined mode enabled on FIFO read/writes */
} sai_fifo_combine_t;

Past definition (used in v4.2.0):

typedef enum _sai_fifo_combine
{
    kSAI_FifoCombineDisabled = 0U,          /*!< sai fifo combine mode disabled */
    kSAI_FifoCombineModeEnabledOnWrite,     /*!< sai fifo combine mode enabled on FIFO write */
    kSAI_FifoCombineModeEnabledOnRead,      /*!< sai fifo combine mode enabled on FIFO reads */
    kSAI_FifoCombineModeEnabledOnReadWrite, /*!< sai fifo combined mode enabled on FIFO read/writes */
} sai_fifo_combine_t;
#endif

MCUX defined RX fifo combine names and the
references need to be adjusted in the i2s driver.

Signed-off-by: Davi Herculano <[email protected]>
@herculanodavi herculanodavi force-pushed the fix/i2s-fifo-combine-new-naming branch from afacb4e to e487a3e Compare October 6, 2025 08:29
Copy link

sonarqubecloud bot commented Oct 6, 2025

Please retry analysis of this Pull-Request directly on SonarQube Cloud

@dleach02
Copy link
Member

dleach02 commented Oct 6, 2025

good catch.. lgtm

@hakehuang can you regress test and give +1 of okay

@dleach02 dleach02 added the Trivial Changes that can be reviewed by anyone, i.e. doc changes, minor build system tweaks, etc. label Oct 6, 2025
Copy link
Contributor

@hakehuang hakehuang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

board testing on mimxrt1170_evk_cm7@A pass

@henrikbrixandersen henrikbrixandersen merged commit d1493b6 into zephyrproject-rtos:main Oct 7, 2025
28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: I2S platform: NXP NXP Trivial Changes that can be reviewed by anyone, i.e. doc changes, minor build system tweaks, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants