Commit 239d2218 authored by Bin Liu's avatar Bin Liu Committed by Greg Kroah-Hartman
Browse files

usb: musb: cppi41: move struct cppi41_dma_channel to header 



Move struct cppi41_dma_channel to the header file so other modules can
use it.

Signed-off-by: default avatarBin Liu <b-liu@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 460ddbec

drivers/usb/musb/cppi_dma.h

+22 −1
Original line number Diff line number Diff line
@@ -7,9 +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"

#include "musb_dma.h"



/* CPPI RX/TX state RAM */
@@ -123,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_ */

drivers/usb/musb/musb_cppi41.c

+1 −20
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/platform_device.h>

#include <linux/of.h>



#include "cppi_dma.h"

#include "musb_core.h"



#define RNDIS_REG(x) (0x80 + ((x - 1) * 4))
@@ -22,26 +23,6 @@ 
#define USB_CTRL_AUTOREQ	0xd0

#define USB_TDOWN		0xd8



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;

};



#define MUSB_DMA_NUM_CHANNELS 15



struct cppi41_dma_controller {