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

Unverified Commit badc9595 authored by Nicolin Chen's avatar Nicolin Chen Committed by Mark Brown
Browse files

ASoC: fsl_ssi: Add bool synchronous to mark synchronous mode 



Using symmetric_rates in the cpu_dai_drv is a bit implicit,
so this patch adds a bool synchronous instead.

Signed-off-by: default avatarNicolin Chen <nicoleotsuka@gmail.com>
Tested-by: default avatarCaleb Crome <caleb@crome.org>
Tested-by: default avatarMaciej S. Szmigiero <mail@maciej.szmigiero.name>
Reviewed-by: default avatarMaciej S. Szmigiero <mail@maciej.szmigiero.name>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 26b31f4f

sound/soc/fsl/fsl_ssi.c

+8 −5
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ struct fsl_ssi_soc_data { 
 * @dai_fmt: DAI configuration this device is currently used with

 * @streams: Mask of current active streams: BIT(TX) and BIT(RX)

 * @i2s_net: I2S and Network mode configurations of SCR register

 * @synchronous: Use synchronous mode - both of TX and RX use STCK and SFCK

 * @use_dma: DMA is used or FIQ with stream filter

 * @use_dual_fifo: DMA with support for dual FIFO mode

 * @has_ipg_clk_name: If "ipg" is in the clock name list of device tree
@@ -262,6 +263,7 @@ struct fsl_ssi { 
	unsigned int dai_fmt;

	u8 streams;

	u8 i2s_net;

	bool synchronous;

	bool use_dma;

	bool use_dual_fifo;

	bool has_ipg_clk_name;
@@ -673,7 +675,6 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream, 
	bool tx2, tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;

	struct fsl_ssi *ssi = snd_soc_dai_get_drvdata(dai);

	struct regmap *regs = ssi->regs;

	int synchronous = ssi->cpu_dai_drv.symmetric_rates, ret;

	u32 pm = 999, div2, psr, stccr, mask, afreq, factor, i;

	unsigned long clkrate, baudrate, tmprate;

	unsigned int slots = params_channels(hw_params);
@@ -681,6 +682,7 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream, 
	u64 sub, savesub = 100000;

	unsigned int freq;

	bool baudclk_is_used;

	int ret;



	/* Override slots and slot_width if being specifically set... */

	if (ssi->slots)
@@ -759,7 +761,7 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream, 
	mask = SSI_SxCCR_PM_MASK | SSI_SxCCR_DIV2 | SSI_SxCCR_PSR;



	/* STCCR is used for RX in synchronous mode */

	tx2 = tx || synchronous;

	tx2 = tx || ssi->synchronous;

	regmap_update_bits(regs, REG_SSI_SxCCR(tx2), mask, stccr);



	if (!baudclk_is_used) {
@@ -807,7 +809,7 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream, 
	 * that should set separate configurations for STCCR and SRCCR

	 * despite running in the synchronous mode.

	 */

	if (enabled && ssi->cpu_dai_drv.symmetric_rates)

	if (enabled && ssi->synchronous)

		return 0;



	if (fsl_ssi_is_i2s_master(ssi)) {
@@ -839,7 +841,7 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream, 
	}



	/* In synchronous mode, the SSI uses STCCR for capture */

	tx2 = tx || ssi->cpu_dai_drv.symmetric_rates;

	tx2 = tx || ssi->synchronous;

	regmap_update_bits(regs, REG_SSI_SxCCR(tx2), SSI_SxCCR_WL_MASK, wl);



	return 0;
@@ -968,7 +970,7 @@ static int _fsl_ssi_set_dai_fmt(struct fsl_ssi *ssi, unsigned int fmt) 
	srcr = strcr;



	/* Set SYN mode and clear RXDIR bit when using SYN or AC97 mode */

	if (ssi->cpu_dai_drv.symmetric_rates || fsl_ssi_is_ac97(ssi)) {

	if (ssi->synchronous || fsl_ssi_is_ac97(ssi)) {

		srcr &= ~SSI_SRCR_RXDIR;

		scr |= SSI_SCR_SYN;

	}
@@ -1456,6 +1458,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) 
		if (!fsl_ssi_is_ac97(ssi)) {

			ssi->cpu_dai_drv.symmetric_rates = 1;

			ssi->cpu_dai_drv.symmetric_samplebits = 1;

			ssi->synchronous = true;

		}



		ssi->cpu_dai_drv.symmetric_channels = 1;