Merge remote-tracking branch 'linus/master' into x86/urgent

6 files changed, 15 insertions, 19 deletions

diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h
index fcbbe71a3cc1..724c69c40bb8 100644
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
@@ -16,6 +16,7 @@
 
 #include <linux/clk.h>
 #include <linux/device.h>
+#include <linux/mod_devicetable.h>
 #include <linux/err.h>
 #include <linux/resource.h>
 #include <linux/regulator/consumer.h>
@@ -35,12 +36,6 @@ struct amba_device {
         unsigned int            irq[AMBA_NR_IRQS];
 };
 
-struct amba_id {
-        unsigned int            id;
-        unsigned int            mask;
-        void                    *data;
-};
-
 struct amba_driver {
         struct device_driver    drv;
         int                     (*probe)(struct amba_device *, const struct amba_id *);
diff --git a/include/linux/amba/mmci.h b/include/linux/amba/mmci.h
index 21114810c7c0..0101e9c17fa1 100644
--- a/include/linux/amba/mmci.h
+++ b/include/linux/amba/mmci.h
@@ -30,6 +30,7 @@ struct dma_chan;
  * @cd_invert: true if the gpio_cd pin value is active low
  * @capabilities: the capabilities of the block as implemented in
  * this platform, signify anything MMC_CAP_* from mmc/host.h
+ * @capabilities2: more capabilities, MMC_CAP2_* from mmc/host.h
  * @dma_filter: function used to select an appropriate RX and TX
  * DMA channel to be used for DMA, if and only if you're deploying the
  * generic DMA engine
@@ -52,6 +53,7 @@ struct mmci_platform_data {
         int     gpio_cd;
         bool    cd_invert;
         unsigned long capabilities;
+        unsigned long capabilities2;
         bool (*dma_filter)(struct dma_chan *chan, void *filter_param);
         void *dma_rx_param;
         void *dma_tx_param;
diff --git a/include/linux/amba/pl022.h b/include/linux/amba/pl022.h
index 4ce98f54186b..572f637299c9 100644
--- a/include/linux/amba/pl022.h
+++ b/include/linux/amba/pl022.h
@@ -238,6 +238,9 @@ struct dma_chan;
  * @enable_dma: if true enables DMA driven transfers.
  * @dma_rx_param: parameter to locate an RX DMA channel.
  * @dma_tx_param: parameter to locate a TX DMA channel.
+ * @autosuspend_delay: delay in ms following transfer completion before the
+ *     runtime power management system suspends the device. A setting of 0
+ *     indicates no delay and the device will be suspended immediately.
  */
 struct pl022_ssp_controller {
         u16 bus_id;
@@ -246,6 +249,7 @@ struct pl022_ssp_controller {
         bool (*dma_filter)(struct dma_chan *chan, void *filter_param);
         void *dma_rx_param;
         void *dma_tx_param;
+        int autosuspend_delay;
 };
 
 /**
diff --git a/include/linux/amba/pl061.h b/include/linux/amba/pl061.h
index 2412af944f1f..fb83c0453489 100644
--- a/include/linux/amba/pl061.h
+++ b/include/linux/amba/pl061.h
@@ -7,7 +7,7 @@ struct pl061_platform_data {
         unsigned        gpio_base;
 
         /* number of the first IRQ.
-         * If the IRQ functionality in not desired this must be set to NO_IRQ.
+         * If the IRQ functionality in not desired this must be set to 0.
          */
         unsigned        irq_base;
 
diff --git a/include/linux/amba/pl08x.h b/include/linux/amba/pl08x.h
index 9eabffbc4e50..033f6aa670de 100644
--- a/include/linux/amba/pl08x.h
+++ b/include/linux/amba/pl08x.h
@@ -134,7 +134,7 @@ struct pl08x_txd {
         struct dma_async_tx_descriptor tx;
         struct list_head node;
         struct list_head dsg_list;
-        enum dma_data_direction direction;
+        enum dma_transfer_direction direction;
         dma_addr_t llis_bus;
         struct pl08x_lli *llis_va;
         /* Default cctl value for LLIs */
@@ -197,7 +197,7 @@ struct pl08x_dma_chan {
         dma_addr_t dst_addr;
         u32 src_cctl;
         u32 dst_cctl;
-        enum dma_data_direction runtime_direction;
+        enum dma_transfer_direction runtime_direction;
         dma_cookie_t lc;
         struct list_head pend_list;
         struct pl08x_txd *at;
diff --git a/include/linux/amba/pl330.h b/include/linux/amba/pl330.h
index d12f077a6daf..12e023c19ac1 100644
--- a/include/linux/amba/pl330.h
+++ b/include/linux/amba/pl330.h
@@ -12,17 +12,9 @@
 #ifndef __AMBA_PL330_H_
 #define __AMBA_PL330_H_
 
+#include <linux/dmaengine.h>
 #include <asm/hardware/pl330.h>
 
-struct dma_pl330_peri {
-        /*
-         * Peri_Req i/f of the DMAC that is
-         * peripheral could be reached from.
-         */
-        u8 peri_id; /* specific dma id */
-        enum pl330_reqtype rqtype;
-};
-
 struct dma_pl330_platdata {
         /*
          * Number of valid peripherals connected to DMAC.
@@ -33,9 +25,12 @@ struct dma_pl330_platdata {
          */
         u8 nr_valid_peri;
         /* Array of valid peripherals */
-        struct dma_pl330_peri *peri;
+        u8 *peri_id;
+        /* Operational capabilities */
+        dma_cap_mask_t cap_mask;
         /* Bytes to allocate for MC buffer */
         unsigned mcbuf_sz;
 };
 
+extern bool pl330_filter(struct dma_chan *chan, void *param);
 #endif  /* __AMBA_PL330_H_ */