Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave-dma updates from Vinod Koul:
 - new driver for BCM2835 used in R-pi
 - new driver for MOXA ART
 - dma_get_any_slave_channel API for DT based systems
 - minor fixes and updates spread acrooss driver

[ The fsl-ssi dual fifo mode support addition clashed badly with the
  other changes to fsl-ssi that came in through the sound merge.  I did
  a very rough cut at fixing up the conflict, but Nicolin Chen (author
  of both sides) will need to verify and check things ]

* 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (36 commits)
  dmaengine: mmp_pdma: fix mismerge
  dma: pl08x: Export pl08x_filter_id
  acpi-dma: align documentation with kernel-doc format
  dma: fix vchan_cookie_complete() debug print
  DMA: dmatest: extend the "device" module parameter to 32 characters
  drivers/dma: fix error return code
  dma: omap: Set debug level to debugging messages
  dmaengine: fix kernel-doc style typos for few comments
  dma: tegra: add support for Tegra148/124
  dma: dw: use %pad instead of casting dma_addr_t
  dma: dw: join split up messages
  dma: dw: fix style of multiline comment
  dmaengine: k3dma: fix sparse warnings
  dma: pl330: Use dma_get_slave_channel() in the of xlate callback
  dma: pl330: Differentiate between submitted and issued descriptors
  dmaengine: sirf: Add device_slave_caps interface
  DMA: Freescale: change BWC from 256 bytes to 1024 bytes
  dmaengine: Add MOXA ART DMA engine driver
  dmaengine: Add DMA_PRIVATE to BCM2835 driver
  dma: imx-sdma: Assign a default script number for ROM firmware cases
  ...

1 files changed, 27 insertions, 1 deletions

diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index f9090b167ad7..6404e1ef20d0 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -164,6 +164,7 @@ struct fsl_ssi_private {
         bool baudclk_locked;
         bool irq_stats;
         bool offline_config;
+        bool use_dual_fifo;
         u8 i2s_mode;
         spinlock_t baudclk_lock;
         struct clk *baudclk;
@@ -721,6 +722,12 @@ static int fsl_ssi_setup(struct fsl_ssi_private *ssi_private)
                                 CCSR_SSI_SxCCR_DC(2));
         }
 
+        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);
+        }
+
         return 0;
 }
 
@@ -752,6 +759,15 @@ static int fsl_ssi_startup(struct snd_pcm_substream *substream,
                 spin_unlock_irqrestore(&ssi_private->baudclk_lock, flags);
         }
 
+        /* When using dual fifo mode, it is safer to ensure an even period
+         * size. If appearing to an odd number while DMA always starts its
+         * task from fifo0, fifo1 would be neglected at the end of each
+         * period. But SSI would still access fifo1 with an invalid data.
+         */
+        if (ssi_private->use_dual_fifo)
+                snd_pcm_hw_constraint_step(substream->runtime, 0,
+                                SNDRV_PCM_HW_PARAM_PERIOD_SIZE, 2);
+
         return 0;
 }
 
@@ -1370,7 +1386,7 @@ static int fsl_ssi_probe(struct platform_device *pdev)
 
         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);
@@ -1426,6 +1442,16 @@ static int fsl_ssi_probe(struct platform_device *pdev)
                                 goto error_clk;
                         }
                 }
+                /* Should this be merge with the above? */
+                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;
+                }
 
                 shared = of_device_is_compatible(of_get_parent(np),
                             "fsl,spba-bus");