lkml.org 
[lkml]   [2020]   [Aug]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 1/2] ASoC: fsl_sai: Clean code for synchronous mode
    Date
    Tx synchronous with Rx: The RMR is the word mask register, it is used
    to mask any word in the frame, it is not relating to clock generation,
    So it is no need to be changed when Tx is going to be enabled.

    Rx synchronous with Tx: The TMR is the word mask register, it is used
    to mask any word in the frame, it is not relating to clock generation,
    So it is no need to be changed when Rx is going to be enabled.

    Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
    ---
    sound/soc/fsl/fsl_sai.c | 7 +------
    1 file changed, 1 insertion(+), 6 deletions(-)

    diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
    index cdff739924e2..84714fe7144c 100644
    --- a/sound/soc/fsl/fsl_sai.c
    +++ b/sound/soc/fsl/fsl_sai.c
    @@ -470,8 +470,7 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream,
    /*
    * For SAI master mode, when Tx(Rx) sync with Rx(Tx) clock, Rx(Tx) will
    * generate bclk and frame clock for Tx(Rx), we should set RCR4(TCR4),
    - * RCR5(TCR5) and RMR(TMR) for playback(capture), or there will be sync
    - * error.
    + * RCR5(TCR5) for playback(capture), or there will be sync error.
    */

    if (!sai->is_slave_mode) {
    @@ -482,8 +481,6 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream,
    regmap_update_bits(sai->regmap, FSL_SAI_TCR5(ofs),
    FSL_SAI_CR5_WNW_MASK | FSL_SAI_CR5_W0W_MASK |
    FSL_SAI_CR5_FBT_MASK, val_cr5);
    - regmap_write(sai->regmap, FSL_SAI_TMR,
    - ~0UL - ((1 << channels) - 1));
    } else if (!sai->synchronous[RX] && sai->synchronous[TX] && tx) {
    regmap_update_bits(sai->regmap, FSL_SAI_RCR4(ofs),
    FSL_SAI_CR4_SYWD_MASK | FSL_SAI_CR4_FRSZ_MASK,
    @@ -491,8 +488,6 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream,
    regmap_update_bits(sai->regmap, FSL_SAI_RCR5(ofs),
    FSL_SAI_CR5_WNW_MASK | FSL_SAI_CR5_W0W_MASK |
    FSL_SAI_CR5_FBT_MASK, val_cr5);
    - regmap_write(sai->regmap, FSL_SAI_RMR,
    - ~0UL - ((1 << channels) - 1));
    }
    }

    --
    2.27.0
    \
     
     \ /
      Last update: 2020-08-05 04:28    [W:3.034 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site