ASoC: pxa-ssp.c, Automatically set TDM when needed
Subsystems (3)
PATCH v2 2/2 ASoC: pxa-ssp.c, Automatically set TDM when needed
* Automatically sets TDM mode for frame_width larger than 32 bits, if the user doesn't setup the TDM slots with set_tdm_slot().
* Reset SSCR0_EDSS and SSCR0_DSS on pxa_ssp_set_dai_fmt.
* Makes SSCR0_MOD optional.
* Clears SSCR1_RWOT case SSCR0_MOD is set.
Signed-off-by Daniel Ribeiro <[email protected]>
--- sound/soc/pxa/pxa-ssp.c | 88 ++++++++++++++++++++++++++++------------------ 1 files changed, 53 insertions(+), 35 deletions(-)
sound/soc/pxa/pxa-ssp.c +53 -35
@@ -452,8 +452,8 @@ static int pxa_ssp_set_dai_fmt(struct snd_soc_dai *cpu_dai, }/* reset port settings */ - sscr0 =ssp_read_reg (ssp,SSCR0 ) & - (SSCR0_ECS |SSCR0_NCS |SSCR0_MOD |SSCR0_ACS ); + sscr0 =ssp_read_reg (ssp,SSCR0 ) & (SSCR0_ECS |SSCR0_NCS |SSCR0_MOD | +SSCR0_ACS |SSCR0_DSS |SSCR0_EDSS ); sscr1 =SSCR1_RxTresh (8 ) |SSCR1_TxTresh (7 ); sspsp =0 ;
@@ -496,7 +496,7 @@ static int pxa_ssp_set_dai_fmt(struct snd_soc_dai *cpu_dai,case SND_SOC_DAIFMT_DSP_A : sspsp |=SSPSP_FSRT ;case SND_SOC_DAIFMT_DSP_B : - sscr0 |=SSCR0_MOD |SSCR0_PSP ; + sscr0 |=SSCR0_PSP ; sscr1 |=SSCR1_TRAIL |SSCR1_RWOT ;break ;
@@ -532,10 +532,18 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream,struct ssp_priv *priv = cpu_dai->private_data;struct ssp_device *ssp = priv->dev.ssp;int chn =params_channels (params); -u32 sscr0; -u32 sspsp; +u32 sscr0, sscr1, sspsp;int width =snd_pcm_format_physical_width (params_format (params)); -int ttsa =ssp_read_reg (ssp,SSTSA ) &0xf ; +int slot_width, frame_width =0 ; + +/* check if the user explicitly set a slot_width */ + sscr0 =ssp_read_reg (ssp,SSCR0 ); + +if (sscr0 & (SSCR0_EDSS |SSCR0_DSS )) + slot_width = (sscr0 &SSCR0_DSS ) + + (sscr0 &SSCR0_EDSS ?17 :1 ); +else + frame_width = slot_width = width * chn;/* generate correct DMA params */ if (cpu_dai->dma_data)
@@ -545,35 +553,53 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream,* to force 16-bit frame width on the wire (for S16_LE), even * with two channels. Use 16-bit DMA transfers for this case. */ - cpu_dai->dma_data =ssp_get_dma_params (ssp, - ((chn ==2 ) && (ttsa !=1 )) || (width ==32 ), + cpu_dai->dma_data =ssp_get_dma_params (ssp, slot_width >16 , substream->stream ==SNDRV_PCM_STREAM_PLAYBACK );/* we can only change the settings if the port is not in use */ -if (ssp_read_reg (ssp,SSCR0 ) &SSCR0_SSE ) +if (sscr0 &SSCR0_SSE )return 0 ; -/* clear selected SSP bits */ - sscr0 =ssp_read_reg (ssp,SSCR0 ) & ~(SSCR0_DSS |SSCR0_EDSS ); -ssp_write_reg (ssp,SSCR0 , sscr0); - -/* bit size */ - sscr0 =ssp_read_reg (ssp,SSCR0 ); -switch (params_format (params)) { -case SNDRV_PCM_FORMAT_S16_LE :#ifdef CONFIG_PXA3xx -if (cpu_is_pxa3xx ()) - sscr0 |=SSCR0_FPCKE ; +if (width ==16 &&cpu_is_pxa3xx ()) + sscr0 |=SSCR0_FPCKE ;#endif - sscr0 |=SSCR0_DataSize (16 ); -break ; -case SNDRV_PCM_FORMAT_S24_LE : - sscr0 |= (SSCR0_EDSS |SSCR0_DataSize (8 )); -break ; -case SNDRV_PCM_FORMAT_S32_LE : - sscr0 |= (SSCR0_EDSS |SSCR0_DataSize (16 )); -break ; + +if (frame_width >0 ) { +/* Not using network mode */ +if (frame_width >16 ) + sscr0 |=SSCR0_EDSS |SSCR0_DataSize (frame_width -16 ); +else + sscr0 |=SSCR0_DataSize (frame_width); + +if (frame_width >32 ) { +/* +* Network mode is needed to support this frame width. +* We assume the wire is not networked and setup a +* fake network mode here. Use as many slots as needed +* each with 32 bits. +*/ +int slots = frame_width /32 ; + + sscr0 |=SSCR0_MOD ; + sscr0 |=SSCR0_SlotsPerFrm (slots); + +/* +* Set active slots. Only set an active TX slot +* if we are going to use it. +*/ +ssp_write_reg (ssp,SSRSA , slots -1 ); +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) +ssp_write_reg (ssp,SSTSA , slots -1 ); + } } + +/* If SSCR0_MOD is set we can't use SSCR1_RWOT */ +if (sscr0 &SSCR0_MOD ) { + sscr1 =ssp_read_reg (ssp,SSCR1 ); +ssp_write_reg (ssp,SSCR1 , sscr1 & ~SSCR1_RWOT ); + } +ssp_write_reg (ssp,SSCR0 , sscr0);switch (priv->dai_fmt &SND_SOC_DAIFMT_FORMAT_MASK ) {
@@ -620,14 +646,6 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream,break ; } -/* When we use a network mode, we always require TDM slots -* - complain loudly and fail if they've not been set up yet. -*/ -if ((sscr0 &SSCR0_MOD ) && !ttsa) { -dev_err (&ssp->pdev->dev,"No TDM timeslot configured\n" ); -return -EINVAL ; - } -dump_registers (ssp);return 0 ;
Signature · 4 lines
tg: (5231b18..) asoc/ssp-internals (depends on: asoc/set_tdm_slot) -- Daniel Ribeiro
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel