Merge branch 'linus' into x86/microcode, to pick up merge window changes

[cascardo/linux.git] / drivers / usb / musb / cppi_dma.h

diff --git a/drivers/usb/musb/cppi_dma.h b/drivers/usb/musb/cppi_dma.h
index 59bf949..7fdfb71 100644 (file)
--- a/drivers/usb/musb/cppi_dma.h
+++ b/drivers/usb/musb/cppi_dma.h
@@ -7,17 +7,10 @@
 #include <linux/list.h>
 #include <linux/errno.h>
 #include <linux/dmapool.h>
+#include <linux/dmaengine.h>
 
-#include "musb_dma.h"
 #include "musb_core.h"
-
-
-/* FIXME fully isolate CPPI from DaVinci ... the "CPPI generic" registers
- * would seem to be shared with the TUSB6020 (over VLYNQ).
- */
-
-#include "davinci.h"
-
+#include "musb_dma.h"
 
 /* CPPI RX/TX state RAM */
 
@@ -131,4 +124,24 @@ struct cppi {
 /* CPPI IRQ handler */
 extern irqreturn_t cppi_interrupt(int, void *);
 
+struct cppi41_dma_channel {
+       struct dma_channel channel;
+       struct cppi41_dma_controller *controller;
+       struct musb_hw_ep *hw_ep;
+       struct dma_chan *dc;
+       dma_cookie_t cookie;
+       u8 port_num;
+       u8 is_tx;
+       u8 is_allocated;
+       u8 usb_toggle;
+
+       dma_addr_t buf_addr;
+       u32 total_len;
+       u32 prog_len;
+       u32 transferred;
+       u32 packet_sz;
+       struct list_head tx_check;
+       int tx_zlp;
+};
+
 #endif                         /* end of ifndef _CPPI_DMA_H_ */