diff options
author | Mark Brown <broonie@kernel.org> | 2023-09-26 17:14:44 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2023-09-26 17:14:44 +0300 |
commit | af08458988cb5dd4b4ff87cfb9da81c6d2c8ef7a (patch) | |
tree | 5a71f1c4e3099d7cfe4c6f880e707173b6ec9cda /sound/soc/fsl/fsl_sai.c | |
parent | e952e89b0602aeb856396eac4306098249c43548 (diff) | |
parent | 2b21207afd06714986a3d22442ed4860ba4f9ced (diff) | |
download | linux-af08458988cb5dd4b4ff87cfb9da81c6d2c8ef7a.tar.xz |
ASoC: Merge up fixes
For the benefit of CI.
Diffstat (limited to 'sound/soc/fsl/fsl_sai.c')
-rw-r--r-- | sound/soc/fsl/fsl_sai.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index 1e4020fae05a..8a9a30dd31e2 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -710,10 +710,15 @@ static void fsl_sai_config_disable(struct fsl_sai *sai, int dir) { unsigned int ofs = sai->soc_data->reg_offset; bool tx = dir == TX; - u32 xcsr, count = 100; + u32 xcsr, count = 100, mask; + + if (sai->soc_data->mclk_with_tere && sai->mclk_direction_output) + mask = FSL_SAI_CSR_TERE; + else + mask = FSL_SAI_CSR_TERE | FSL_SAI_CSR_BCE; regmap_update_bits(sai->regmap, FSL_SAI_xCSR(tx, ofs), - FSL_SAI_CSR_TERE | FSL_SAI_CSR_BCE, 0); + mask, 0); /* TERE will remain set till the end of current frame */ do { |