Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 240a16e2 authored by Felipe Balbi's avatar Felipe Balbi
Browse files

usb: musb: tusb6010: fix compilation 



earlier commits have broken compilation of
tusb6010 glue layer, fix it.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent cf6808cb

drivers/usb/musb/musb_core.h

+8 −4
Original line number Original line Diff line number Diff line
@@ -172,7 +172,8 @@ enum musb_g_ep0_state { 
#endif

#endif





/* TUSB mapping: "flat" plus ep0 special cases */

/* TUSB mapping: "flat" plus ep0 special cases */

#if	defined(CONFIG_USB_MUSB_TUSB6010)

#if defined(CONFIG_USB_MUSB_TUSB6010) || \

	defined(CONFIG_USB_MUSB_TUSB6010_MODULE)

#define musb_ep_select(_mbase, _epnum) \

#define musb_ep_select(_mbase, _epnum) \

	musb_writeb((_mbase), MUSB_INDEX, (_epnum))

	musb_writeb((_mbase), MUSB_INDEX, (_epnum))

#define	MUSB_EP_OFFSET			MUSB_TUSB_OFFSET

#define	MUSB_EP_OFFSET			MUSB_TUSB_OFFSET
@@ -241,7 +242,8 @@ struct musb_hw_ep { 
	void __iomem		*fifo;

	void __iomem		*fifo;

	void __iomem		*regs;

	void __iomem		*regs;





#ifdef CONFIG_USB_MUSB_TUSB6010

#if defined(CONFIG_USB_MUSB_TUSB6010) || \

	defined(CONFIG_USB_MUSB_TUSB6010_MODULE)

	void __iomem		*conf;

	void __iomem		*conf;

#endif

#endif
@@ -258,7 +260,8 @@ struct musb_hw_ep { 
	struct dma_channel	*tx_channel;

	struct dma_channel	*tx_channel;

	struct dma_channel	*rx_channel;

	struct dma_channel	*rx_channel;





#ifdef CONFIG_USB_MUSB_TUSB6010

#if defined(CONFIG_USB_MUSB_TUSB6010) || \

	defined(CONFIG_USB_MUSB_TUSB6010_MODULE)

	/* TUSB has "asynchronous" and "synchronous" dma modes */

	/* TUSB has "asynchronous" and "synchronous" dma modes */

	dma_addr_t		fifo_async;

	dma_addr_t		fifo_async;

	dma_addr_t		fifo_sync;

	dma_addr_t		fifo_sync;
@@ -356,7 +359,8 @@ struct musb { 
	void __iomem		*ctrl_base;

	void __iomem		*ctrl_base;

	void __iomem		*mregs;

	void __iomem		*mregs;





#ifdef CONFIG_USB_MUSB_TUSB6010

#if defined(CONFIG_USB_MUSB_TUSB6010) || \

	defined(CONFIG_USB_MUSB_TUSB6010_MODULE)

	dma_addr_t		async;

	dma_addr_t		async;

	dma_addr_t		sync;

	dma_addr_t		sync;

	void __iomem		*sync_va;

	void __iomem		*sync_va;

drivers/usb/musb/musb_regs.h

+4 −2
Original line number Original line Diff line number Diff line
@@ -234,7 +234,8 @@ 
#define MUSB_TESTMODE		0x0F	/* 8 bit */

#define MUSB_TESTMODE		0x0F	/* 8 bit */





/* Get offset for a given FIFO from musb->mregs */

/* Get offset for a given FIFO from musb->mregs */

#ifdef	CONFIG_USB_MUSB_TUSB6010

#if defined(CONFIG_USB_MUSB_TUSB6010) ||	\

	defined(CONFIG_USB_MUSB_TUSB6010_MODULE)

#define MUSB_FIFO_OFFSET(epnum)	(0x200 + ((epnum) * 0x20))

#define MUSB_FIFO_OFFSET(epnum)	(0x200 + ((epnum) * 0x20))

#else

#else

#define MUSB_FIFO_OFFSET(epnum)	(0x20 + ((epnum) * 4))

#define MUSB_FIFO_OFFSET(epnum)	(0x20 + ((epnum) * 4))
@@ -295,7 +296,8 @@ 
#define MUSB_FLAT_OFFSET(_epnum, _offset)	\

#define MUSB_FLAT_OFFSET(_epnum, _offset)	\

	(0x100 + (0x10*(_epnum)) + (_offset))

	(0x100 + (0x10*(_epnum)) + (_offset))





#ifdef CONFIG_USB_MUSB_TUSB6010

#if defined(CONFIG_USB_MUSB_TUSB6010) ||	\

	defined(CONFIG_USB_MUSB_TUSB6010_MODULE)

/* TUSB6010 EP0 configuration register is special */

/* TUSB6010 EP0 configuration register is special */

#define MUSB_TUSB_OFFSET(_epnum, _offset)	\

#define MUSB_TUSB_OFFSET(_epnum, _offset)	\

	(0x10 + _offset)

	(0x10 + _offset)

drivers/usb/musb/tusb6010.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/errno.h>

#include <linux/errno.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/prefetch.h>

#include <linux/usb.h>

#include <linux/usb.h>

#include <linux/irq.h>

#include <linux/irq.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

drivers/usb/musb/tusb6010_omap.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <plat/mux.h>

#include <plat/mux.h>





#include "musb_core.h"

#include "musb_core.h"

#include "tusb6010.h"





#define to_chdat(c)		((struct tusb_omap_dma_ch *)(c)->private_data)

#define to_chdat(c)		((struct tusb_omap_dma_ch *)(c)->private_data)