From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Sep 2019 02:04:40 +0000 (-0700)
Subject: Merge tag 'dmaengine-5.4-rc1' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=04cbfba6208592999d7bfe6609ec01dc3fde73f5;p=linux.git

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

Pull dmaengine updates from Vinod Koul:

 - Move Dmaengine DT bindings to YAML and convert Allwinner to schema.

 - FSL dma device_synchronize implementation

 - DW split acpi and of helpers and updates to driver and support for
   Elkhart Lake

 - Move filter fn as private for omap-dma and edma drivers and
   improvements to these drivers

 - Mark expected switch fall-through in couple of drivers

 - Renames of shdma and nbpfaxi binding document

 - Minor updates to bunch of drivers

* tag 'dmaengine-5.4-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (55 commits)
  dmaengine: ti: edma: Use bitmap_set() instead of open coded edma_set_bits()
  dmaengine: ti: edma: Only reset region0 access registers
  dmaengine: ti: edma: Do not reset reserved paRAM slots
  dmaengine: iop-adma.c: fix printk format warning
  dmaengine: stm32-dma: Use struct_size() helper
  dt-bindings: dmaengine: dma-common: Fix the dma-channel-mask property
  dmanegine: ioat/dca: Use struct_size() helper
  dmaengine: iop-adma: remove set but not used variable 'slots_per_op'
  dmaengine: dmatest: Add support for completion polling
  dmaengine: ti: omap-dma: Remove variable override in omap_dma_tx_status()
  dmaengine: ti: omap-dma: Remove 'Assignment in if condition'
  dmaengine: ti: edma: Remove 'Assignment in if condition'
  dmaengine: dw: platform: Split OF helpers to separate module
  dmaengine: dw: platform: Split ACPI helpers to separate module
  dmaengine: dw: platform: Move handle check to dw_dma_acpi_controller_register()
  dmaengine: dw: platform: Switch to acpi_dma_controller_register()
  dmaengine: dw: platform: Use devm_platform_ioremap_resource()
  dmaengine: dw: platform: Enable iDMA 32-bit on Intel Elkhart Lake
  dmaengine: dw: platform: Use struct dw_dma_chip_pdata
  dmaengine: dw: Export struct dw_dma_chip_pdata for wider use
  ...
---

04cbfba6208592999d7bfe6609ec01dc3fde73f5
diff --cc drivers/dma/Kconfig
index 413efef5fbb60,03fa0c58cef3b..7c511e3db4c8e
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@@ -294,8 -294,8 +294,8 @@@ config INTEL_IOATDM
  	  If unsure, say N.
  
  config INTEL_IOP_ADMA
 -	tristate "Intel IOP ADMA support"
 -	depends on ARCH_IOP32X || ARCH_IOP33X || ARCH_IOP13XX
 +	tristate "Intel IOP32x ADMA support"
- 	depends on ARCH_IOP32X
++	depends on ARCH_IOP32X || COMPILE_TEST
  	select DMA_ENGINE
  	select ASYNC_TX_ENABLE_CHANNEL_SWITCH
  	help
diff --cc drivers/dma/iop-adma.c
index 03f4a588cf7fa,003b753e46043..a3f942a6a946a
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@@ -116,9 -116,9 +116,9 @@@ static void __iop_adma_slot_cleanup(str
  	list_for_each_entry_safe(iter, _iter, &iop_chan->chain,
  					chain_node) {
  		pr_debug("\tcookie: %d slot: %d busy: %d "
- 			"this_desc: %#x next_desc: %#llx ack: %d\n",
 -			"this_desc: %pad next_desc: %#x ack: %d\n",
++			"this_desc: %pad next_desc: %#llx ack: %d\n",
  			iter->async_tx.cookie, iter->idx, busy,
- 			iter->async_tx.phys, (u64)iop_desc_get_next_desc(iter),
 -			&iter->async_tx.phys, iop_desc_get_next_desc(iter),
++			&iter->async_tx.phys, (u64)iop_desc_get_next_desc(iter),
  			async_tx_test_ack(&iter->async_tx));
  		prefetch(_iter);
  		prefetch(&_iter->async_tx);