diff options
| author | Nicolin Chen <Guangyu.Chen@freescale.com> | 2014-01-06 17:25:09 +0800 |
|---|---|---|
| committer | Nicolin Chen <Guangyu.Chen@freescale.com> | 2014-01-16 19:27:49 +0800 |
| commit | 9d2543eab3b8e441a9135644060558bbc1e66aa5 (patch) | |
| tree | 93f3a29454e9c41a9186798e7beadcedb29fac73 /sound | |
| parent | 6f77992ba7b282df9168de9cea1c9f3374cf23b0 (diff) | |
ENGR00295423-4 ASoC: fsl_ssi: Set the default slot number in startup()
Set a default slot number in startup() so that those who use I2S or other
2-channel DAI format would not need to call set_dai_tdm_slot() in their
machine drivers.
Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com>
(cherry picked from commit eb22fac84c62cccb98dc4503bc9a537c435d216b)
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/fsl/fsl_ssi.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 0d711544c023..a66dd375047b 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -431,6 +431,12 @@ static int fsl_ssi_startup(struct snd_pcm_substream *substream, * finished initializing the DMA controller. */ + /* Set default slot number -- 2 */ + write_ssi_mask(&ssi->stccr, CCSR_SSI_SxCCR_DC_MASK, + CCSR_SSI_SxCCR_DC(2)); + write_ssi_mask(&ssi->srccr, CCSR_SSI_SxCCR_DC_MASK, + CCSR_SSI_SxCCR_DC(2)); + spin_lock_irqsave(&ssi_private->baudclk_lock, flags); ssi_private->baudclk_locked = false; spin_unlock_irqrestore(&ssi_private->baudclk_lock, flags); |