From 65e61491c9d1ba73b16603608f25156ca2896bfb Mon Sep 17 00:00:00 2001 From: Giuseppe GORGOGLIONE Date: Tue, 24 Feb 2009 15:27:34 -0800 Subject: [PATCH] --- yaml --- r: 133535 b: refs/heads/master c: 322337168f22e8245aae7f38e84c5711cd4c1265 h: refs/heads/master i: 133533: ae16178839955eca25b35aa8621dab23bd99d160 133531: 11d161066c664e57123c13aefcf4152fc496f501 133527: 2a05886cfc0632662bb0195e5f82783118a32b75 133519: 8f1052d982803cda034af5d8d2f9e33122a2d118 133503: fcfbd483008cf548bae1c3ef368c1005c850333f v: v3 --- [refs] | 2 +- trunk/drivers/usb/musb/musb_core.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3b79b7e3f70c..9007f1d26b2d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e0320f0d46022d12ddc84516cbdb8865e8cd744 +refs/heads/master: 322337168f22e8245aae7f38e84c5711cd4c1265 diff --git a/trunk/drivers/usb/musb/musb_core.h b/trunk/drivers/usb/musb/musb_core.h index adf1806007ff..efb39b5e55b5 100644 --- a/trunk/drivers/usb/musb/musb_core.h +++ b/trunk/drivers/usb/musb/musb_core.h @@ -478,10 +478,11 @@ static inline void musb_configure_ep0(struct musb *musb) static inline int musb_read_fifosize(struct musb *musb, struct musb_hw_ep *hw_ep, u8 epnum) { + void *mbase = musb->mregs; u8 reg = 0; /* read from core using indexed model */ - reg = musb_readb(hw_ep->regs, 0x10 + MUSB_FIFOSIZE); + reg = musb_readb(mbase, MUSB_EP_OFFSET(epnum, MUSB_FIFOSIZE)); /* 0's returned when no more endpoints */ if (!reg) return -ENODEV; @@ -508,6 +509,7 @@ static inline void musb_configure_ep0(struct musb *musb) { musb->endpoints[0].max_packet_sz_tx = MUSB_EP0_FIFOSIZE; musb->endpoints[0].max_packet_sz_rx = MUSB_EP0_FIFOSIZE; + musb->endpoints[0].is_shared_fifo = true; } #endif /* CONFIG_BLACKFIN */