Merge tag 'dmaengine-4.14-rc1' of git://git.infradead.org/users/vkoul/slave-dma

Pull dmaengine updates from Vinod Koul:
 "This one features the usual updates to the drivers and one good part
  of removing DA_SG from core as it has no users.

  Summary:

   - Remove DMA_SG support as we have no users for this feature
   - New driver for Altera / Intel mSGDMA IP core
   - Support for memset in dmatest and qcom_hidma driver
   - Update for non cyclic mode in k3dma, bunch of update in bam_dma,
     bcm sba-raid
   - Constify device ids across drivers"

* tag 'dmaengine-4.14-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (52 commits)
  dmaengine: sun6i: support V3s SoC variant
  dmaengine: sun6i: make gate bit in sun8i's DMA engines a common quirk
  dmaengine: rcar-dmac: document R8A77970 bindings
  dmaengine: xilinx_dma: Fix error code format specifier
  dmaengine: altera: Use macros instead of structs to describe the registers
  dmaengine: ti-dma-crossbar: Fix dra7 reserve function
  dmaengine: pl330: constify amba_id
  dmaengine: pl08x: constify amba_id
  dmaengine: bcm-sba-raid: Remove redundant SBA_REQUEST_STATE_COMPLETED
  dmaengine: bcm-sba-raid: Explicitly ACK mailbox message after sending
  dmaengine: bcm-sba-raid: Add debugfs support
  dmaengine: bcm-sba-raid: Remove redundant SBA_REQUEST_STATE_RECEIVED
  dmaengine: bcm-sba-raid: Re-factor sba_process_deferred_requests()
  dmaengine: bcm-sba-raid: Pre-ack async tx descriptor
  dmaengine: bcm-sba-raid: Peek mbox when we have no free requests
  dmaengine: bcm-sba-raid: Alloc resources before registering DMA device
  dmaengine: bcm-sba-raid: Improve sba_issue_pending() run duration
  dmaengine: bcm-sba-raid: Increase number of free sba_request
  dmaengine: bcm-sba-raid: Allow arbitrary number free sba_request
  dmaengine: bcm-sba-raid: Remove reqs_free_count from sba_device
  ...

diff --combined drivers/crypto/ccp/ccp-dmaengine.c
index 901343dd513ebcd73f8a158306807c6a1b6835a0,3f7d54f4728cbf64a7246c94e1d130afdefecba1..d608043c02804502b9b5ba05beb17ffb999d9918
--- 1/drivers/crypto/ccp/ccp-dmaengine.c
--- 2/drivers/crypto/ccp/ccp-dmaengine.c
+++ b/drivers/crypto/ccp/ccp-dmaengine.c
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * AMD Cryptographic Coprocessor (CCP) driver
   *
 - * Copyright (C) 2016 Advanced Micro Devices, Inc.
 + * Copyright (C) 2016,2017 Advanced Micro Devices, Inc.
   *
   * Author: Gary R Hook <gary.hook@amd.com>
   *
@@@ -502,27 -502,6 +502,6 @@@ static struct dma_async_tx_descriptor *
        return &desc->tx_desc;
  }
  
- static struct dma_async_tx_descriptor *ccp_prep_dma_sg(
-       struct dma_chan *dma_chan, struct scatterlist *dst_sg,
-       unsigned int dst_nents, struct scatterlist *src_sg,
-       unsigned int src_nents, unsigned long flags)
- {
-       struct ccp_dma_chan *chan = container_of(dma_chan, struct ccp_dma_chan,
-                                                dma_chan);
-       struct ccp_dma_desc *desc;
- 
-       dev_dbg(chan->ccp->dev,
-               "%s - src=%p, src_nents=%u dst=%p, dst_nents=%u, flags=%#lx\n",
-               __func__, src_sg, src_nents, dst_sg, dst_nents, flags);
- 
-       desc = ccp_create_desc(dma_chan, dst_sg, dst_nents, src_sg, src_nents,
-                              flags);
-       if (!desc)
-               return NULL;
- 
-       return &desc->tx_desc;
- }
- 
  static struct dma_async_tx_descriptor *ccp_prep_dma_interrupt(
        struct dma_chan *dma_chan, unsigned long flags)
  {
@@@ -704,7 -683,6 +683,6 @@@ int ccp_dmaengine_register(struct ccp_d
        dma_dev->directions = DMA_MEM_TO_MEM;
        dma_dev->residue_granularity = DMA_RESIDUE_GRANULARITY_DESCRIPTOR;
        dma_cap_set(DMA_MEMCPY, dma_dev->cap_mask);
-       dma_cap_set(DMA_SG, dma_dev->cap_mask);
        dma_cap_set(DMA_INTERRUPT, dma_dev->cap_mask);
  
        /* The DMA channels for this device can be set to public or private,
@@@ -740,7 -718,6 +718,6 @@@
  
        dma_dev->device_free_chan_resources = ccp_free_chan_resources;
        dma_dev->device_prep_dma_memcpy = ccp_prep_dma_memcpy;
-       dma_dev->device_prep_dma_sg = ccp_prep_dma_sg;
        dma_dev->device_prep_dma_interrupt = ccp_prep_dma_interrupt;
        dma_dev->device_issue_pending = ccp_issue_pending;
        dma_dev->device_tx_status = ccp_tx_status;