Merge tag 'mac80211-next-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / include / linux / spi / pxa2xx_spi.h

diff --git a/include/linux/spi/pxa2xx_spi.h b/include/linux/spi/pxa2xx_spi.h
index 82d5111..d5a3165 100644 (file)
--- a/include/linux/spi/pxa2xx_spi.h
+++ b/include/linux/spi/pxa2xx_spi.h
@@ -23,6 +23,8 @@
 #define PXA2XX_CS_ASSERT (0x01)
 #define PXA2XX_CS_DEASSERT (0x02)
 
+struct dma_chan;
+
 /* device.platform_data for SSP controller devices */
 struct pxa2xx_spi_master {
        u32 clock_enable;
@@ -30,10 +32,9 @@ struct pxa2xx_spi_master {
        u8 enable_dma;
 
        /* DMA engine specific config */
-       int rx_chan_id;
-       int tx_chan_id;
-       int rx_slave_id;
-       int tx_slave_id;
+       bool (*dma_filter)(struct dma_chan *chan, void *param);
+       void *tx_param;
+       void *rx_param;
 
        /* For non-PXA arches */
        struct ssp_device ssp;