From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Jan 2009 19:52:14 +0000 (-0800)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
X-Git-Tag: firefly_0821_release~15939
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d9e8a3a5b8298a3c814ed37ac5756e6f67b6be41;p=firefly-linux-kernel-4.4.55.git

Merge branch 'next' of git://git./linux/kernel/git/djbw/async_tx

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (22 commits)
  ioat: fix self test for multi-channel case
  dmaengine: bump initcall level to arch_initcall
  dmaengine: advertise all channels on a device to dma_filter_fn
  dmaengine: use idr for registering dma device numbers
  dmaengine: add a release for dma class devices and dependent infrastructure
  ioat: do not perform removal actions at shutdown
  iop-adma: enable module removal
  iop-adma: kill debug BUG_ON
  iop-adma: let devm do its job, don't duplicate free
  dmaengine: kill enum dma_state_client
  dmaengine: remove 'bigref' infrastructure
  dmaengine: kill struct dma_client and supporting infrastructure
  dmaengine: replace dma_async_client_register with dmaengine_get
  atmel-mci: convert to dma_request_channel and down-level dma_slave
  dmatest: convert to dma_request_channel
  dmaengine: introduce dma_request_channel and private channels
  net_dma: convert to dma_find_channel
  dmaengine: provide a common 'issue_pending_all' implementation
  dmaengine: centralize channel allocation, introduce dma_find_channel
  dmaengine: up-level reference counting to the module level
  ...
---

d9e8a3a5b8298a3c814ed37ac5756e6f67b6be41
diff --cc include/linux/atmel-mci.h
index 2a2213eefd85,000000000000..2f1f95737acb
mode 100644,000000..100644
--- a/include/linux/atmel-mci.h
+++ b/include/linux/atmel-mci.h
@@@ -1,39 -1,0 +1,39 @@@
 +#ifndef __LINUX_ATMEL_MCI_H
 +#define __LINUX_ATMEL_MCI_H
 +
 +#define ATMEL_MCI_MAX_NR_SLOTS	2
 +
- struct dma_slave;
++#include <linux/dw_dmac.h>
 +
 +/**
 + * struct mci_slot_pdata - board-specific per-slot configuration
 + * @bus_width: Number of data lines wired up the slot
 + * @detect_pin: GPIO pin wired to the card detect switch
 + * @wp_pin: GPIO pin wired to the write protect sensor
 + *
 + * If a given slot is not present on the board, @bus_width should be
 + * set to 0. The other fields are ignored in this case.
 + *
 + * Any pins that aren't available should be set to a negative value.
 + *
 + * Note that support for multiple slots is experimental -- some cards
 + * might get upset if we don't get the clock management exactly right.
 + * But in most cases, it should work just fine.
 + */
 +struct mci_slot_pdata {
 +	unsigned int		bus_width;
 +	int			detect_pin;
 +	int			wp_pin;
 +};
 +
 +/**
 + * struct mci_platform_data - board-specific MMC/SDcard configuration
-  * @dma_slave: DMA slave interface to use in data transfers, or NULL.
++ * @dma_slave: DMA slave interface to use in data transfers.
 + * @slot: Per-slot configuration data.
 + */
 +struct mci_platform_data {
- 	struct dma_slave	*dma_slave;
++	struct dw_dma_slave	dma_slave;
 +	struct mci_slot_pdata	slot[ATMEL_MCI_MAX_NR_SLOTS];
 +};
 +
 +#endif /* __LINUX_ATMEL_MCI_H */