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

Commit d026e9c7 authored by Tony Lindgren's avatar Tony Lindgren Committed by Felipe Balbi
Browse files

usb: musb: Change end point selection to use new IO access 



This allows the endpoints to work when multiple MUSB glue
layers are built in.

Cc: Fabio Baltieri <fabio.baltieri@linaro.org>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarApelete Seketeli <apelete@seketeli.net>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 1b40fc57

drivers/usb/musb/am35x.c

+1 −0
Original line number Diff line number Diff line
@@ -438,6 +438,7 @@ static void am35x_read_fifo(struct musb_hw_ep *hw_ep, u16 len, u8 *dst) 
}



static const struct musb_platform_ops am35x_ops = {

	.quirks		= MUSB_INDEXED_EP,

	.init		= am35x_musb_init,

	.exit		= am35x_musb_exit,

drivers/usb/musb/da8xx.c

+1 −0
Original line number Diff line number Diff line
@@ -458,6 +458,7 @@ static int da8xx_musb_exit(struct musb *musb) 
}



static const struct musb_platform_ops da8xx_ops = {

	.quirks		= MUSB_INDEXED_EP,

	.init		= da8xx_musb_init,

	.exit		= da8xx_musb_exit,

drivers/usb/musb/jz4740.c

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ static int jz4740_musb_exit(struct musb *musb) 
}



static const struct musb_platform_ops jz4740_musb_ops = {

	.quirks		= MUSB_INDEXED_EP,

	.init		= jz4740_musb_init,

	.exit		= jz4740_musb_exit,

};

drivers/usb/musb/musb_core.c

+37 −1
Original line number Diff line number Diff line
@@ -229,6 +229,27 @@ static u32 musb_default_fifo_offset(u8 epnum) 
	return 0x20 + (epnum * 4);

}



/* "flat" mapping: each endpoint has its own i/o address */

static void musb_flat_ep_select(void __iomem *mbase, u8 epnum)

{

}



static u32 musb_flat_ep_offset(u8 epnum, u16 offset)

{

	return 0x100 + (0x10 * epnum) + offset;

}



/* "indexed" mapping: INDEX register controls register bank select */

static void musb_indexed_ep_select(void __iomem *mbase, u8 epnum)

{

	musb_writeb(mbase, MUSB_INDEX, epnum);

}



static u32 musb_indexed_ep_offset(u8 epnum, u16 offset)

{

	return 0x10 + offset;

}



static u8 musb_default_readb(const void __iomem *addr, unsigned offset)

{

	return __raw_readb(addr + offset);
@@ -1537,7 +1558,7 @@ static int musb_core_init(u16 musb_type, struct musb *musb) 
		}

#endif



		hw_ep->regs = MUSB_EP_OFFSET(i, 0) + mbase;

		hw_ep->regs = musb->io.ep_offset(i, 0) + mbase;

		hw_ep->target_regs = musb_read_target_reg_base(i, mbase);

		hw_ep->rx_reinit = 1;

		hw_ep->tx_reinit = 1;
@@ -2007,6 +2028,21 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) 
	if (musb->ops->quirks)

		musb->io.quirks = musb->ops->quirks;



	/* At least tusb6010 has it's own offsets.. */

	if (musb->ops->ep_offset)

		musb->io.ep_offset = musb->ops->ep_offset;

	if (musb->ops->ep_select)

		musb->io.ep_select = musb->ops->ep_select;



	/* ..and some devices use indexed offset or flat offset */

	if (musb->io.quirks & MUSB_INDEXED_EP) {

		musb->io.ep_offset = musb_indexed_ep_offset;

		musb->io.ep_select = musb_indexed_ep_select;

	} else {

		musb->io.ep_offset = musb_flat_ep_offset;

		musb->io.ep_select = musb_flat_ep_select;

	}



	if (musb->ops->fifo_offset)

		musb->io.fifo_offset = musb->ops->fifo_offset;

	else

drivers/usb/musb/musb_core.h

+1 −36
Original line number Diff line number Diff line
@@ -124,41 +124,6 @@ enum musb_g_ep0_state { 
#define OTG_TIME_A_AIDL_BDIS	200		/* min 200 msec */

#define OTG_TIME_B_ASE0_BRST	100		/* min 3.125 ms */





/*************************** REGISTER ACCESS ********************************/



/* Endpoint registers (other than dynfifo setup) can be accessed either

 * directly with the "flat" model, or after setting up an index register.

 */



#if defined(CONFIG_ARCH_DAVINCI) || defined(CONFIG_SOC_OMAP2430) \

		|| defined(CONFIG_SOC_OMAP3430) || defined(CONFIG_BLACKFIN) \

		|| defined(CONFIG_ARCH_OMAP4)

/* REVISIT indexed access seemed to

 * misbehave (on DaVinci) for at least peripheral IN ...

 */

#define	MUSB_FLAT_REG

#endif



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

#if defined(CONFIG_USB_MUSB_TUSB6010) || \

	defined(CONFIG_USB_MUSB_TUSB6010_MODULE)

#define musb_ep_select(_mbase, _epnum) \

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

#define	MUSB_EP_OFFSET			MUSB_TUSB_OFFSET



/* "flat" mapping: each endpoint has its own i/o address */

#elif	defined(MUSB_FLAT_REG)

#define musb_ep_select(_mbase, _epnum)	(((void)(_mbase)), ((void)(_epnum)))

#define	MUSB_EP_OFFSET			MUSB_FLAT_OFFSET



/* "indexed" mapping: INDEX register controls register bank select */

#else

#define musb_ep_select(_mbase, _epnum) \

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

#define	MUSB_EP_OFFSET			MUSB_INDEXED_OFFSET

#endif



/****************************** FUNCTIONS ********************************/



#define MUSB_HST_MODE(_musb)\
@@ -515,7 +480,7 @@ static inline int musb_read_fifosize(struct musb *musb, 
	u8 reg = 0;



	/* read from core using indexed model */

	reg = musb_readb(mbase, MUSB_EP_OFFSET(epnum, MUSB_FIFOSIZE));

	reg = musb_readb(mbase, musb->io.ep_offset(epnum, MUSB_FIFOSIZE));

	/* 0's returned when no more endpoints */

	if (!reg)

		return -ENODEV;