Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb527149 authored by Peter Rosin's avatar Peter Rosin Committed by Mark Brown
Browse files

ASoC: atmel_ssc_dai: Support SND_SOC_DAIFMT_CBM_CFS on I2S 



Signed-off-by: default avatarPeter Rosin <peda@axentia.se>
Acked-by: default avatarBo Shen <voice.shen@atmel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 67d1aed0

sound/soc/atmel/atmel_ssc_dai.c

+48 −0
Original line number Original line Diff line number Diff line
@@ -485,6 +485,54 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, 
			| SSC_BF(TFMR_DATLEN, (bits - 1));

			| SSC_BF(TFMR_DATLEN, (bits - 1));

		break;

		break;





	case SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBM_CFS:

		/* I2S format, CODEC supplies BCLK, SSC supplies LRCLK. */

		if (bits > 16 && !ssc->pdata->has_fslen_ext) {

			dev_err(dai->dev,

				"sample size %d is too large for SSC device\n",

				bits);

			return -EINVAL;

		}



		fslen_ext = (bits - 1) / 16;

		fslen = (bits - 1) % 16;



		rcmr =	  SSC_BF(RCMR_PERIOD, ssc_p->rcmr_period)

			| SSC_BF(RCMR_STTDLY, START_DELAY)

			| SSC_BF(RCMR_START, SSC_START_FALLING_RF)

			| SSC_BF(RCMR_CKI, SSC_CKI_RISING)

			| SSC_BF(RCMR_CKO, SSC_CKO_NONE)

			| SSC_BF(RCMR_CKS, ssc->clk_from_rk_pin ?

					   SSC_CKS_PIN : SSC_CKS_CLOCK);



		rfmr =    SSC_BF(RFMR_FSLEN_EXT, fslen_ext)

			| SSC_BF(RFMR_FSEDGE, SSC_FSEDGE_POSITIVE)

			| SSC_BF(RFMR_FSOS, SSC_FSOS_NEGATIVE)

			| SSC_BF(RFMR_FSLEN, fslen)

			| SSC_BF(RFMR_DATNB, (channels - 1))

			| SSC_BIT(RFMR_MSBF)

			| SSC_BF(RFMR_LOOP, 0)

			| SSC_BF(RFMR_DATLEN, (bits - 1));



		tcmr =	  SSC_BF(TCMR_PERIOD, ssc_p->tcmr_period)

			| SSC_BF(TCMR_STTDLY, START_DELAY)

			| SSC_BF(TCMR_START, SSC_START_FALLING_RF)

			| SSC_BF(TCMR_CKI, SSC_CKI_FALLING)

			| SSC_BF(TCMR_CKO, SSC_CKO_NONE)

			| SSC_BF(TCMR_CKS, ssc->clk_from_rk_pin ?

					   SSC_CKS_CLOCK : SSC_CKS_PIN);



		tfmr =    SSC_BF(TFMR_FSLEN_EXT, fslen_ext)

			| SSC_BF(TFMR_FSEDGE, SSC_FSEDGE_NEGATIVE)

			| SSC_BF(TFMR_FSDEN, 0)

			| SSC_BF(TFMR_FSOS, SSC_FSOS_NEGATIVE)

			| SSC_BF(TFMR_FSLEN, fslen)

			| SSC_BF(TFMR_DATNB, (channels - 1))

			| SSC_BIT(TFMR_MSBF)

			| SSC_BF(TFMR_DATDEF, 0)

			| SSC_BF(TFMR_DATLEN, (bits - 1));

		break;



	case SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_CBS_CFS:

	case SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_CBS_CFS:

		/*

		/*

		 * DSP/PCM Mode A format, SSC provides BCLK and LRC clocks.

		 * DSP/PCM Mode A format, SSC provides BCLK and LRC clocks.