aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolin Chen <Guangyu.Chen@freescale.com>2014-01-06 04:25:09 -0500
committerNitin Garg <nitin.garg@freescale.com>2014-04-16 09:47:38 -0400
commit69d56fc0aa96e87c621a95119fc930acaf6461d5 (patch)
tree7024151fec72372e0ba327d06006f730af7abbb1
parent521b351b58f4678547c59e1bafa5d2142c1150ed (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>
-rw-r--r--sound/soc/fsl/fsl_ssi.c6
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,
431 * finished initializing the DMA controller. 431 * finished initializing the DMA controller.
432 */ 432 */
433 433
434 /* Set default slot number -- 2 */
435 write_ssi_mask(&ssi->stccr, CCSR_SSI_SxCCR_DC_MASK,
436 CCSR_SSI_SxCCR_DC(2));
437 write_ssi_mask(&ssi->srccr, CCSR_SSI_SxCCR_DC_MASK,
438 CCSR_SSI_SxCCR_DC(2));
439
434 spin_lock_irqsave(&ssi_private->baudclk_lock, flags); 440 spin_lock_irqsave(&ssi_private->baudclk_lock, flags);
435 ssi_private->baudclk_locked = false; 441 ssi_private->baudclk_locked = false;
436 spin_unlock_irqrestore(&ssi_private->baudclk_lock, flags); 442 spin_unlock_irqrestore(&ssi_private->baudclk_lock, flags);