mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mark Brown <broonie@kernel.org>,
	Liam Girdwood <lgirdwood@gmail.com>,
	Vinod Koul <vinod.koul@intel.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Nicolin Chen <b42378@freescale.com>,
	Nicolin Chen <Guangyu.Chen@freescale.com>
Subject: linux-next: manual merge of the sound-asoc tree with the slave-dma tree
Date: Mon, 13 Jan 2014 12:43:52 +1100	[thread overview]
Message-ID: <20140113124352.70e2580496aa2ce8aff535a8@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 4171 bytes --]

Hi all,

Today's linux-next merge of the sound-asoc tree got a conflict in
sound/soc/fsl/fsl_ssi.c between commit 0da9e55e71bc ("ASoC: fsl_ssi: Add
dual fifo mode support") from the slave-dma tree and commit 2b56b5f02029
("ASoC: fsl_ssi: Set default slot number for common cases") from the
sound-asoc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc sound/soc/fsl/fsl_ssi.c
index 2101fc5c5739,7864ec5cf5f9..000000000000
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@@ -140,8 -162,9 +162,10 @@@ struct fsl_ssi_private 
  	bool ssi_on_imx;
  	bool imx_ac97;
  	bool use_dma;
 +	bool use_dual_fifo;
  	bool baudclk_locked;
+ 	bool irq_stats;
+ 	bool offline_config;
  	u8 i2s_mode;
  	spinlock_t baudclk_lock;
  	struct clk *baudclk;
@@@ -421,12 -711,17 +712,23 @@@ static int fsl_ssi_setup(struct fsl_ssi
  	if (ssi_private->imx_ac97)
  		fsl_ssi_setup_ac97(ssi_private);
  
 +	if (ssi_private->use_dual_fifo) {
 +		write_ssi_mask(&ssi->srcr, 0, CCSR_SSI_SRCR_RFEN1);
 +		write_ssi_mask(&ssi->stcr, 0, CCSR_SSI_STCR_TFEN1);
 +		write_ssi_mask(&ssi->scr, 0, CCSR_SSI_SCR_TCH_EN);
 +	}
 +
+ 	/*
+ 	 * Set a default slot number so that there is no need for those common
+ 	 * cases like I2S mode to call the extra set_tdm_slot() any more.
+ 	 */
+ 	if (!ssi_private->imx_ac97) {
+ 		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));
+ 	}
+ 
  	return 0;
  }
  
@@@ -1170,8 -1343,35 +1359,35 @@@ static int fsl_ssi_probe(struct platfor
  	ssi_private->baudclk_locked = false;
  	spin_lock_init(&ssi_private->baudclk_lock);
  
- 	if (of_device_is_compatible(pdev->dev.of_node, "fsl,imx21-ssi")) {
+ 	/*
+ 	 * imx51 and later SoCs have a slightly different IP that allows the
+ 	 * SSI configuration while the SSI unit is running.
+ 	 *
+ 	 * More important, it is necessary on those SoCs to configure the
+ 	 * sperate TX/RX DMA bits just before starting the stream
+ 	 * (fsl_ssi_trigger). The SDMA unit has to be configured before fsl_ssi
+ 	 * sends any DMA requests to the SDMA unit, otherwise it is not defined
+ 	 * how the SDMA unit handles the DMA request.
+ 	 *
+ 	 * SDMA units are present on devices starting at imx35 but the imx35
+ 	 * reference manual states that the DMA bits should not be changed
+ 	 * while the SSI unit is running (SSIEN). So we support the necessary
+ 	 * online configuration of fsl-ssi starting at imx51.
+ 	 */
+ 	switch (hw_type) {
+ 	case FSL_SSI_MCP8610:
+ 	case FSL_SSI_MX21:
+ 	case FSL_SSI_MX35:
+ 		ssi_private->offline_config = true;
+ 		break;
+ 	case FSL_SSI_MX51:
+ 		ssi_private->offline_config = false;
+ 		break;
+ 	}
+ 
+ 	if (hw_type == FSL_SSI_MX21 || hw_type == FSL_SSI_MX51 ||
+ 			hw_type == FSL_SSI_MX35) {
 -		u32 dma_events[2];
 +		u32 dma_events[2], dmas[4];
  		ssi_private->ssi_on_imx = true;
  
  		ssi_private->clk = devm_clk_get(&pdev->dev, NULL);
@@@ -1234,16 -1435,13 +1451,22 @@@
  			dma_events[0], shared ? IMX_DMATYPE_SSI_SP : IMX_DMATYPE_SSI);
  		imx_pcm_dma_params_init_data(&ssi_private->filter_data_rx,
  			dma_events[1], shared ? IMX_DMATYPE_SSI_SP : IMX_DMATYPE_SSI);
 +		if (!of_property_read_u32_array(pdev->dev.of_node, "dmas", dmas, 4)
 +				&& dmas[2] == IMX_DMATYPE_SSI_DUAL) {
 +			ssi_private->use_dual_fifo = true;
 +			/* When using dual fifo mode, we need to keep watermark
 +			 * as even numbers due to dma script limitation.
 +			 */
 +			ssi_private->dma_params_tx.maxburst &= ~0x1;
 +			ssi_private->dma_params_rx.maxburst &= ~0x1;
 +		}
- 	} else if (ssi_private->use_dma) {
+ 	}
+ 
+ 	/*
+ 	 * Enable interrupts only for MCP8610 and MX51. The other MXs have
+ 	 * different writeable interrupt status registers.
+ 	 */
+ 	if (ssi_private->use_dma) {
  		/* The 'name' should not have any slashes in it. */
  		ret = devm_request_irq(&pdev->dev, ssi_private->irq,
  					fsl_ssi_isr, 0, ssi_private->name,

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2014-01-13  1:44 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-13  1:43 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-12-20  2:14 Stephen Rothwell
2013-12-03  0:38 Stephen Rothwell
2013-12-03 16:48 ` Mark Brown
2012-03-05  2:59 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140113124352.70e2580496aa2ce8aff535a8@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=Guangyu.Chen@freescale.com \
    --cc=b42378@freescale.com \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=vinod.koul@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®