Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

[karo-tx-linux.git] / drivers / rapidio / devices / tsi721.h

diff --git a/drivers/rapidio/devices/tsi721.h b/drivers/rapidio/devices/tsi721.h
index 7061ac0ad4287c0d84edb39058ef6abc295e43ce..a7b42680a06a2f2ebfd539e5832a2d22552b9ac2 100644 (file)
--- a/drivers/rapidio/devices/tsi721.h
+++ b/drivers/rapidio/devices/tsi721.h
@@ -644,23 +644,26 @@ enum tsi721_smsg_int_flag {
 
 #ifdef CONFIG_RAPIDIO_DMA_ENGINE
 
+#define TSI721_BDMA_MAX_BCOUNT (TSI721_DMAD_BCOUNT1 + 1)
+
 struct tsi721_tx_desc {
        struct dma_async_tx_descriptor  txd;
-       struct tsi721_dma_desc          *hw_desc;
        u16                             destid;
        /* low 64-bits of 66-bit RIO address */
        u64                             rio_addr;
        /* upper 2-bits of 66-bit RIO address */
        u8                              rio_addr_u;
-       bool                            interrupt;
+       enum dma_rtype                  rtype;
        struct list_head                desc_node;
-       struct list_head                tx_list;
+       struct scatterlist              *sg;
+       unsigned int                    sg_len;
+       enum dma_status                 status;
 };
 
 struct tsi721_bdma_chan {
        int             id;
        void __iomem    *regs;
-       int             bd_num;         /* number of buffer descriptors */
+       int             bd_num;         /* number of HW buffer descriptors */
        void            *bd_base;       /* start of DMA descriptors */
        dma_addr_t      bd_phys;
        void            *sts_base;      /* start of DMA BD status FIFO */
@@ -676,7 +679,6 @@ struct tsi721_bdma_chan {
        struct list_head        active_list;
        struct list_head        queue;
        struct list_head        free_list;
-       dma_cookie_t            completed_cookie;
        struct tasklet_struct   tasklet;
        bool                    active;
 };