Skip to content

L
linux-davinci
Commit 04d2e6bd authored by Tony Lindgren's avatar Tony Lindgren
Browse files
Options

musb_hdrc: Search and replace pThis with musb 

Search and replace pThis with musb
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 98a008d9
Show whitespace changes
Inline Side-by-side
Showing with 309 additions and 309 deletions
drivers/usb/musb/cppi_dma.c
View file @ 04d2e6bd
...@@ -1134,7 +1134,7 @@ static int cppi_rx_scan(struct cppi *cppi, unsigned ch) ...@@ -1134,7 +1134,7 @@ static int cppi_rx_scan(struct cppi *cppi, unsigned ch)
return completed; return completed;
} }
void cppi_completion(struct musb *pThis, u32 rx, u32 tx) void cppi_completion(struct musb *musb, u32 rx, u32 tx)
{ {
void *__iomem regBase; void *__iomem regBase;
int i, chanNum, numCompleted; int i, chanNum, numCompleted;
...@@ -1143,9 +1143,9 @@ void cppi_completion(struct musb *pThis, u32 rx, u32 tx) ...@@ -1143,9 +1143,9 @@ void cppi_completion(struct musb *pThis, u32 rx, u32 tx)
struct cppi_descriptor *bdPtr; struct cppi_descriptor *bdPtr;
struct musb_hw_ep *pEnd = NULL; struct musb_hw_ep *pEnd = NULL;
cppi = container_of(pThis->pDmaController, struct cppi, Controller); cppi = container_of(musb->pDmaController, struct cppi, Controller);
regBase = pThis->ctrl_base; regBase = musb->ctrl_base;
chanNum = 0; chanNum = 0;
/* process TX channels */ /* process TX channels */
...@@ -1253,13 +1253,13 @@ void cppi_completion(struct musb *pThis, u32 rx, u32 tx) ...@@ -1253,13 +1253,13 @@ void cppi_completion(struct musb *pThis, u32 rx, u32 tx)
} }
if (bReqComplete) if (bReqComplete)
musb_dma_completion( musb_dma_completion(
pThis, chanNum + 1, 1); musb, chanNum + 1, 1);
} else { } else {
/* Bigger transfer than we could fit in /* Bigger transfer than we could fit in
* that first batch of descriptors... * that first batch of descriptors...
*/ */
cppi_next_tx_segment(pThis, txChannel); cppi_next_tx_segment(musb, txChannel);
} }
} else } else
txChannel->activeQueueHead = bdPtr; txChannel->activeQueueHead = bdPtr;
...@@ -1283,7 +1283,7 @@ void cppi_completion(struct musb *pThis, u32 rx, u32 tx) ...@@ -1283,7 +1283,7 @@ void cppi_completion(struct musb *pThis, u32 rx, u32 tx)
if (rxChannel->actualLen != rxChannel->transferSize if (rxChannel->actualLen != rxChannel->transferSize
&& rxChannel->actualLen && rxChannel->actualLen
== rxChannel->currOffset) { == rxChannel->currOffset) {
cppi_next_rx_segment(pThis, rxChannel, 1); cppi_next_rx_segment(musb, rxChannel, 1);
continue; continue;
} }
...@@ -1295,7 +1295,7 @@ void cppi_completion(struct musb *pThis, u32 rx, u32 tx) ...@@ -1295,7 +1295,7 @@ void cppi_completion(struct musb *pThis, u32 rx, u32 tx)
rxChannel->Channel.dwActualLength = rxChannel->Channel.dwActualLength =
rxChannel->actualLen; rxChannel->actualLen;
core_rxirq_disable(regBase, chanNum + 1); core_rxirq_disable(regBase, chanNum + 1);
musb_dma_completion(pThis, chanNum + 1, 0); musb_dma_completion(musb, chanNum + 1, 0);
} }
} }
......
drivers/usb/musb/g_ep0.c
View file @ 04d2e6bd
...@@ -828,7 +828,7 @@ musb_g_ep0_queue(struct usb_ep *e, struct usb_request *r, gfp_t gfp_flags) ...@@ -828,7 +828,7 @@ musb_g_ep0_queue(struct usb_ep *e, struct usb_request *r, gfp_t gfp_flags)
return -EINVAL; return -EINVAL;
ep = to_musb_ep(e); ep = to_musb_ep(e);
musb = ep->pThis; musb = ep->musb;
regs = musb->control_ep->regs; regs = musb->control_ep->regs;
req = to_musb_request(r); req = to_musb_request(r);
...@@ -879,7 +879,7 @@ musb_g_ep0_queue(struct usb_ep *e, struct usb_request *r, gfp_t gfp_flags) ...@@ -879,7 +879,7 @@ musb_g_ep0_queue(struct usb_ep *e, struct usb_request *r, gfp_t gfp_flags)
musb_writew(regs, MGC_O_HDRC_CSR0, musb_writew(regs, MGC_O_HDRC_CSR0,
musb->ackpend | MGC_M_CSR0_P_DATAEND); musb->ackpend | MGC_M_CSR0_P_DATAEND);
musb->ackpend = 0; musb->ackpend = 0;
musb_g_ep0_giveback(ep->pThis, r); musb_g_ep0_giveback(ep->musb, r);
} }
/* else for sequence #2 (OUT), caller provides a buffer /* else for sequence #2 (OUT), caller provides a buffer
...@@ -916,7 +916,7 @@ static int musb_g_ep0_halt(struct usb_ep *e, int value) ...@@ -916,7 +916,7 @@ static int musb_g_ep0_halt(struct usb_ep *e, int value)
return -EINVAL; return -EINVAL;
ep = to_musb_ep(e); ep = to_musb_ep(e);
musb = ep->pThis; musb = ep->musb;
base = musb->pRegs; base = musb->pRegs;
regs = musb->control_ep->regs; regs = musb->control_ep->regs;
......
drivers/usb/musb/musb_gadget.c
View file @ 04d2e6bd
...@@ -159,12 +159,12 @@ __acquires(ep->musb->Lock) ...@@ -159,12 +159,12 @@ __acquires(ep->musb->Lock)
static void nuke(struct musb_ep *ep, const int status) static void nuke(struct musb_ep *ep, const int status)
{ {
struct musb_request *req = NULL; struct musb_request *req = NULL;
void __iomem *epio = ep->pThis->aLocalEnd[ep->bEndNumber].regs; void __iomem *epio = ep->musb->aLocalEnd[ep->bEndNumber].regs;
ep->busy = 1; ep->busy = 1;
if (is_dma_capable() && ep->dma) { if (is_dma_capable() && ep->dma) {
struct dma_controller *c = ep->pThis->pDmaController; struct dma_controller *c = ep->musb->pDmaController;
int value; int value;
if (ep->is_in) { if (ep->is_in) {
musb_writew(epio, MGC_O_HDRC_TXCSR, musb_writew(epio, MGC_O_HDRC_TXCSR,
...@@ -867,7 +867,7 @@ static int musb_gadget_enable(struct usb_ep *ep, ...@@ -867,7 +867,7 @@ static int musb_gadget_enable(struct usb_ep *ep,
pEnd = to_musb_ep(ep); pEnd = to_musb_ep(ep);
hw_ep = pEnd->hw_ep; hw_ep = pEnd->hw_ep;
regs = hw_ep->regs; regs = hw_ep->regs;
musb = pEnd->pThis; musb = pEnd->musb;
pBase = musb->pRegs; pBase = musb->pRegs;
bEnd = pEnd->bEndNumber; bEnd = pEnd->bEndNumber;
...@@ -1005,7 +1005,7 @@ static int musb_gadget_disable(struct usb_ep *ep) ...@@ -1005,7 +1005,7 @@ static int musb_gadget_disable(struct usb_ep *ep)
int status = 0; int status = 0;
pEnd = to_musb_ep(ep); pEnd = to_musb_ep(ep);
musb = pEnd->pThis; musb = pEnd->musb;
bEnd = pEnd->bEndNumber; bEnd = pEnd->bEndNumber;
epio = musb->aLocalEnd[bEnd].regs; epio = musb->aLocalEnd[bEnd].regs;
...@@ -1108,7 +1108,7 @@ static int musb_gadget_queue(struct usb_ep *ep, struct usb_request *req, ...@@ -1108,7 +1108,7 @@ static int musb_gadget_queue(struct usb_ep *ep, struct usb_request *req,
return -ENODATA; return -ENODATA;
pEnd = to_musb_ep(ep); pEnd = to_musb_ep(ep);
musb = pEnd->pThis; musb = pEnd->musb;
pRequest = to_musb_request(req); pRequest = to_musb_request(req);
pRequest->musb = musb; pRequest->musb = musb;
...@@ -1176,7 +1176,7 @@ static int musb_gadget_dequeue(struct usb_ep *ep, struct usb_request *pRequest) ...@@ -1176,7 +1176,7 @@ static int musb_gadget_dequeue(struct usb_ep *ep, struct usb_request *pRequest)
struct usb_request *r; struct usb_request *r;
unsigned long flags; unsigned long flags;
int status = 0; int status = 0;
struct musb *musb = pEnd->pThis; struct musb *musb = pEnd->musb;
if (!ep || !pRequest || to_musb_request(pRequest)->ep != pEnd) if (!ep || !pRequest || to_musb_request(pRequest)->ep != pEnd)
return -EINVAL; return -EINVAL;
...@@ -1230,7 +1230,7 @@ int musb_gadget_set_halt(struct usb_ep *ep, int value) ...@@ -1230,7 +1230,7 @@ int musb_gadget_set_halt(struct usb_ep *ep, int value)
{ {
struct musb_ep *pEnd = to_musb_ep(ep); struct musb_ep *pEnd = to_musb_ep(ep);
u8 bEnd = pEnd->bEndNumber; u8 bEnd = pEnd->bEndNumber;
struct musb *musb = pEnd->pThis; struct musb *musb = pEnd->musb;
void __iomem *epio = musb->aLocalEnd[bEnd].regs; void __iomem *epio = musb->aLocalEnd[bEnd].regs;
void __iomem *pBase; void __iomem *pBase;
unsigned long flags; unsigned long flags;
...@@ -1310,7 +1310,7 @@ static int musb_gadget_fifo_status(struct usb_ep *ep) ...@@ -1310,7 +1310,7 @@ static int musb_gadget_fifo_status(struct usb_ep *ep)
int retval = -EINVAL; int retval = -EINVAL;
if (musb_ep->desc && !musb_ep->is_in) { if (musb_ep->desc && !musb_ep->is_in) {
struct musb *musb = musb_ep->pThis; struct musb *musb = musb_ep->musb;
int bEnd = musb_ep->bEndNumber; int bEnd = musb_ep->bEndNumber;
void __iomem *mbase = musb->pRegs; void __iomem *mbase = musb->pRegs;
unsigned long flags; unsigned long flags;
...@@ -1329,7 +1329,7 @@ static int musb_gadget_fifo_status(struct usb_ep *ep) ...@@ -1329,7 +1329,7 @@ static int musb_gadget_fifo_status(struct usb_ep *ep)
static void musb_gadget_fifo_flush(struct usb_ep *ep) static void musb_gadget_fifo_flush(struct usb_ep *ep)
{ {
struct musb_ep *musb_ep = to_musb_ep(ep); struct musb_ep *musb_ep = to_musb_ep(ep);
struct musb *musb = musb_ep->pThis; struct musb *musb = musb_ep->musb;
u8 nEnd = musb_ep->bEndNumber; u8 nEnd = musb_ep->bEndNumber;
void __iomem *epio = musb->aLocalEnd[nEnd].regs; void __iomem *epio = musb->aLocalEnd[nEnd].regs;
void __iomem *mbase; void __iomem *mbase;
...@@ -1562,7 +1562,7 @@ init_peripheral_ep(struct musb *musb, struct musb_ep *ep, u8 bEnd, int is_in) ...@@ -1562,7 +1562,7 @@ init_peripheral_ep(struct musb *musb, struct musb_ep *ep, u8 bEnd, int is_in)
memset(ep, 0, sizeof *ep); memset(ep, 0, sizeof *ep);
ep->bEndNumber = bEnd; ep->bEndNumber = bEnd;
ep->pThis = musb; ep->musb = musb;
ep->hw_ep = hw_ep; ep->hw_ep = hw_ep;
ep->is_in = is_in; ep->is_in = is_in;
......
drivers/usb/musb/musb_gadget.h
View file @ 04d2e6bd
...@@ -61,7 +61,7 @@ struct musb_ep { ...@@ -61,7 +61,7 @@ struct musb_ep {
struct usb_ep end_point; struct usb_ep end_point;
char name[12]; char name[12];
struct musb_hw_ep *hw_ep; struct musb_hw_ep *hw_ep;
struct musb *pThis; struct musb *musb;
u8 bEndNumber; u8 bEndNumber;
/* ... when enabled/disabled ... */ /* ... when enabled/disabled ... */
...@@ -92,8 +92,8 @@ static inline struct usb_request *next_request(struct musb_ep *ep) ...@@ -92,8 +92,8 @@ static inline struct usb_request *next_request(struct musb_ep *ep)
return container_of(queue->next, struct usb_request, list); return container_of(queue->next, struct usb_request, list);
} }
extern void musb_g_tx(struct musb *pThis, u8 bEnd); extern void musb_g_tx(struct musb *musb, u8 bEnd);
extern void musb_g_rx(struct musb *pThis, u8 bEnd); extern void musb_g_rx(struct musb *musb, u8 bEnd);
extern const struct usb_ep_ops musb_g_ep0_ops; extern const struct usb_ep_ops musb_g_ep0_ops;
......
drivers/usb/musb/musb_host.c
View file @ 04d2e6bd
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
/*************************** Forwards ***************************/ /*************************** Forwards ***************************/
static void musb_ep_program(struct musb *pThis, u8 bEnd, static void musb_ep_program(struct musb *musb, u8 bEnd,
struct urb *pUrb, unsigned int nOut, struct urb *pUrb, unsigned int nOut,
u8 * pBuffer, u32 dwLength); u8 * pBuffer, u32 dwLength);
...@@ -132,7 +132,7 @@ static inline void musb_h_tx_flush_fifo(struct musb_hw_ep *ep) ...@@ -132,7 +132,7 @@ static inline void musb_h_tx_flush_fifo(struct musb_hw_ep *ep)
/* /*
* Start transmit. Caller is responsible for locking shared resources. * Start transmit. Caller is responsible for locking shared resources.
* pThis must be locked. * musb must be locked.
*/ */
static inline void musb_h_tx_start(struct musb_hw_ep *ep) static inline void musb_h_tx_start(struct musb_hw_ep *ep)
{ {
...@@ -424,7 +424,7 @@ musb_giveback(struct musb_qh *qh, struct urb *urb, int status) ...@@ -424,7 +424,7 @@ musb_giveback(struct musb_qh *qh, struct urb *urb, int status)
* Context: caller owns controller lock, irqs are blocked * Context: caller owns controller lock, irqs are blocked
*/ */
static void static void
musb_advance_schedule(struct musb *pThis, struct urb *urb, musb_advance_schedule(struct musb *musb, struct urb *urb,
struct musb_hw_ep *pEnd, int is_in) struct musb_hw_ep *pEnd, int is_in)
{ {
struct musb_qh *qh; struct musb_qh *qh;
...@@ -439,7 +439,7 @@ musb_advance_schedule(struct musb *pThis, struct urb *urb, ...@@ -439,7 +439,7 @@ musb_advance_schedule(struct musb *pThis, struct urb *urb,
DBG(4, "... next ep%d %cX urb %p\n", DBG(4, "... next ep%d %cX urb %p\n",
pEnd->bLocalEnd, is_in ? 'R' : 'T', pEnd->bLocalEnd, is_in ? 'R' : 'T',
next_urb(qh)); next_urb(qh));
musb_start_urb(pThis, is_in, qh); musb_start_urb(musb, is_in, qh);
} }
} }
...@@ -466,7 +466,7 @@ static inline u16 musb_h_flush_rxfifo(struct musb_hw_ep *hw_ep, u16 csr) ...@@ -466,7 +466,7 @@ static inline u16 musb_h_flush_rxfifo(struct musb_hw_ep *hw_ep, u16 csr)
/* /*
* PIO RX for a packet (or part of it). * PIO RX for a packet (or part of it).
*/ */
static u8 musb_host_packet_rx(struct musb *pThis, struct urb *pUrb, static u8 musb_host_packet_rx(struct musb *musb, struct urb *pUrb,
u8 bEnd, u8 bIsochError) u8 bEnd, u8 bIsochError)
{ {
u16 wRxCount; u16 wRxCount;
...@@ -475,7 +475,7 @@ static u8 musb_host_packet_rx(struct musb *pThis, struct urb *pUrb, ...@@ -475,7 +475,7 @@ static u8 musb_host_packet_rx(struct musb *pThis, struct urb *pUrb,
u8 bDone = FALSE; u8 bDone = FALSE;
u32 length; u32 length;
int do_flush = 0; int do_flush = 0;
struct musb_hw_ep *pEnd = pThis->aLocalEnd + bEnd; struct musb_hw_ep *pEnd = musb->aLocalEnd + bEnd;
void __iomem *epio = pEnd->regs; void __iomem *epio = pEnd->regs;
struct musb_qh *qh = pEnd->in_qh; struct musb_qh *qh = pEnd->in_qh;
int nPipe = pUrb->pipe; int nPipe = pUrb->pipe;
...@@ -623,15 +623,15 @@ musb_rx_reinit(struct musb *musb, struct musb_qh *qh, struct musb_hw_ep *ep) ...@@ -623,15 +623,15 @@ musb_rx_reinit(struct musb *musb, struct musb_qh *qh, struct musb_hw_ep *ep)
* Program an HDRC endpoint as per the given URB * Program an HDRC endpoint as per the given URB
* Context: irqs blocked, controller lock held * Context: irqs blocked, controller lock held
*/ */
static void musb_ep_program(struct musb *pThis, u8 bEnd, static void musb_ep_program(struct musb *musb, u8 bEnd,
struct urb *pUrb, unsigned int is_out, struct urb *pUrb, unsigned int is_out,
u8 * pBuffer, u32 dwLength) u8 * pBuffer, u32 dwLength)
{ {
struct dma_controller *pDmaController; struct dma_controller *pDmaController;
struct dma_channel *pDmaChannel; struct dma_channel *pDmaChannel;
u8 bDmaOk; u8 bDmaOk;
void __iomem *pBase = pThis->pRegs; void __iomem *pBase = musb->pRegs;
struct musb_hw_ep *pEnd = pThis->aLocalEnd + bEnd; struct musb_hw_ep *pEnd = musb->aLocalEnd + bEnd;
void __iomem *epio = pEnd->regs; void __iomem *epio = pEnd->regs;
struct musb_qh *qh; struct musb_qh *qh;
u16 wPacketSize; u16 wPacketSize;
...@@ -654,7 +654,7 @@ static void musb_ep_program(struct musb *pThis, u8 bEnd, ...@@ -654,7 +654,7 @@ static void musb_ep_program(struct musb *pThis, u8 bEnd,
MGC_SelectEnd(pBase, bEnd); MGC_SelectEnd(pBase, bEnd);
/* candidate for DMA? */ /* candidate for DMA? */
pDmaController = pThis->pDmaController; pDmaController = musb->pDmaController;
if (is_dma_capable() && bEnd && pDmaController) { if (is_dma_capable() && bEnd && pDmaController) {
pDmaChannel = is_out ? pEnd->tx_channel : pEnd->rx_channel; pDmaChannel = is_out ? pEnd->tx_channel : pEnd->rx_channel;
if (!pDmaChannel) { if (!pDmaChannel) {
...@@ -720,7 +720,7 @@ static void musb_ep_program(struct musb *pThis, u8 bEnd, ...@@ -720,7 +720,7 @@ static void musb_ep_program(struct musb *pThis, u8 bEnd,
} }
/* target addr and (for multipoint) hub addr/port */ /* target addr and (for multipoint) hub addr/port */
if (pThis->bIsMultipoint) { if (musb->bIsMultipoint) {
musb_writeb(pBase, musb_writeb(pBase,
MGC_BUSCTL_OFFSET(bEnd, MGC_O_HDRC_TXFUNCADDR), MGC_BUSCTL_OFFSET(bEnd, MGC_O_HDRC_TXFUNCADDR),
qh->addr_reg); qh->addr_reg);
...@@ -737,7 +737,7 @@ static void musb_ep_program(struct musb *pThis, u8 bEnd, ...@@ -737,7 +737,7 @@ static void musb_ep_program(struct musb *pThis, u8 bEnd,
/* protocol/endpoint/interval/NAKlimit */ /* protocol/endpoint/interval/NAKlimit */
if (bEnd) { if (bEnd) {
musb_writeb(epio, MGC_O_HDRC_TXTYPE, qh->type_reg); musb_writeb(epio, MGC_O_HDRC_TXTYPE, qh->type_reg);
if (can_bulk_split(pThis, qh->type)) if (can_bulk_split(musb, qh->type))
musb_writew(epio, MGC_O_HDRC_TXMAXP, musb_writew(epio, MGC_O_HDRC_TXMAXP,
wPacketSize wPacketSize
| ((pEnd->wMaxPacketSizeTx / | ((pEnd->wMaxPacketSizeTx /
...@@ -748,12 +748,12 @@ static void musb_ep_program(struct musb *pThis, u8 bEnd, ...@@ -748,12 +748,12 @@ static void musb_ep_program(struct musb *pThis, u8 bEnd,
musb_writeb(epio, MGC_O_HDRC_TXINTERVAL, qh->intv_reg); musb_writeb(epio, MGC_O_HDRC_TXINTERVAL, qh->intv_reg);
} else { } else {
musb_writeb(epio, MGC_O_HDRC_NAKLIMIT0, qh->intv_reg); musb_writeb(epio, MGC_O_HDRC_NAKLIMIT0, qh->intv_reg);
if (pThis->bIsMultipoint) if (musb->bIsMultipoint)
musb_writeb(epio, MGC_O_HDRC_TYPE0, musb_writeb(epio, MGC_O_HDRC_TYPE0,
qh->type_reg); qh->type_reg);
} }
if (can_bulk_split(pThis, qh->type)) if (can_bulk_split(musb, qh->type))
wLoadCount = min((u32) pEnd->wMaxPacketSizeTx, wLoadCount = min((u32) pEnd->wMaxPacketSizeTx,
dwLength); dwLength);
else else
...@@ -875,7 +875,7 @@ static void musb_ep_program(struct musb *pThis, u8 bEnd, ...@@ -875,7 +875,7 @@ static void musb_ep_program(struct musb *pThis, u8 bEnd,
u16 csr; u16 csr;
if (pEnd->rx_reinit) { if (pEnd->rx_reinit) {
musb_rx_reinit(pThis, qh, pEnd); musb_rx_reinit(musb, qh, pEnd);
/* init new state: toggle and NYET, maybe DMA later */ /* init new state: toggle and NYET, maybe DMA later */
if (usb_gettoggle(pUrb->dev, qh->epnum, 0)) if (usb_gettoggle(pUrb->dev, qh->epnum, 0))
...@@ -942,17 +942,17 @@ static void musb_ep_program(struct musb *pThis, u8 bEnd, ...@@ -942,17 +942,17 @@ static void musb_ep_program(struct musb *pThis, u8 bEnd,
* Service the default endpoint (ep0) as host. * Service the default endpoint (ep0) as host.
* Return TRUE until it's time to start the status stage. * Return TRUE until it's time to start the status stage.
*/ */
static int musb_h_ep0_continue(struct musb *pThis, static int musb_h_ep0_continue(struct musb *musb,
u16 wCount, struct urb *pUrb) u16 wCount, struct urb *pUrb)
{ {
int bMore = FALSE; int bMore = FALSE;
u8 *pFifoDest = NULL; u8 *pFifoDest = NULL;
u16 wFifoCount = 0; u16 wFifoCount = 0;
struct musb_hw_ep *pEnd = pThis->control_ep; struct musb_hw_ep *pEnd = musb->control_ep;
struct musb_qh *qh = pEnd->in_qh; struct musb_qh *qh = pEnd->in_qh;
struct usb_ctrlrequest *pRequest; struct usb_ctrlrequest *pRequest;
switch (pThis->bEnd0Stage) { switch (musb->bEnd0Stage) {
case MGC_END0_IN: case MGC_END0_IN:
pFifoDest = pUrb->transfer_buffer + pUrb->actual_length; pFifoDest = pUrb->transfer_buffer + pUrb->actual_length;
wFifoCount = min(wCount, ((u16) (pUrb->transfer_buffer_length wFifoCount = min(wCount, ((u16) (pUrb->transfer_buffer_length
...@@ -979,12 +979,12 @@ static int musb_h_ep0_continue(struct musb *pThis, ...@@ -979,12 +979,12 @@ static int musb_h_ep0_continue(struct musb *pThis,
break; break;
} else if (pRequest->bRequestType & USB_DIR_IN) { } else if (pRequest->bRequestType & USB_DIR_IN) {
DBG(4, "start IN-DATA\n"); DBG(4, "start IN-DATA\n");
pThis->bEnd0Stage = MGC_END0_IN; musb->bEnd0Stage = MGC_END0_IN;
bMore = TRUE; bMore = TRUE;
break; break;
} else { } else {
DBG(4, "start OUT-DATA\n"); DBG(4, "start OUT-DATA\n");
pThis->bEnd0Stage = MGC_END0_OUT; musb->bEnd0Stage = MGC_END0_OUT;
bMore = TRUE; bMore = TRUE;
} }
/* FALLTHROUGH */ /* FALLTHROUGH */
...@@ -1005,7 +1005,7 @@ static int musb_h_ep0_continue(struct musb *pThis, ...@@ -1005,7 +1005,7 @@ static int musb_h_ep0_continue(struct musb *pThis,
} }
break; break;
default: default:
ERR("bogus ep0 stage %d\n", pThis->bEnd0Stage); ERR("bogus ep0 stage %d\n", musb->bEnd0Stage);
break; break;
} }
...@@ -1018,13 +1018,13 @@ static int musb_h_ep0_continue(struct musb *pThis, ...@@ -1018,13 +1018,13 @@ static int musb_h_ep0_continue(struct musb *pThis,
* *
* called with controller irqlocked * called with controller irqlocked
*/ */
irqreturn_t musb_h_ep0_irq(struct musb *pThis) irqreturn_t musb_h_ep0_irq(struct musb *musb)
{ {
struct urb *pUrb; struct urb *pUrb;
u16 wCsrVal, wCount; u16 wCsrVal, wCount;
int status = 0; int status = 0;
void __iomem *pBase = pThis->pRegs; void __iomem *pBase = musb->pRegs;
struct musb_hw_ep *pEnd = pThis->control_ep; struct musb_hw_ep *pEnd = musb->control_ep;
void __iomem *epio = pEnd->regs; void __iomem *epio = pEnd->regs;
struct musb_qh *qh = pEnd->in_qh; struct musb_qh *qh = pEnd->in_qh;
u8 bComplete = FALSE; u8 bComplete = FALSE;
...@@ -1040,10 +1040,10 @@ irqreturn_t musb_h_ep0_irq(struct musb *pThis) ...@@ -1040,10 +1040,10 @@ irqreturn_t musb_h_ep0_irq(struct musb *pThis)
: 0; : 0;
DBG(4, "<== csr0 %04x, qh %p, count %d, urb %p, stage %d\n", DBG(4, "<== csr0 %04x, qh %p, count %d, urb %p, stage %d\n",
wCsrVal, qh, wCount, pUrb, pThis->bEnd0Stage); wCsrVal, qh, wCount, pUrb, musb->bEnd0Stage);
/* if we just did status stage, we are done */ /* if we just did status stage, we are done */
if (MGC_END0_STATUS == pThis->bEnd0Stage) { if (MGC_END0_STATUS == musb->bEnd0Stage) {
retval = IRQ_HANDLED; retval = IRQ_HANDLED;
bComplete = TRUE; bComplete = TRUE;
} }
...@@ -1112,9 +1112,9 @@ irqreturn_t musb_h_ep0_irq(struct musb *pThis) ...@@ -1112,9 +1112,9 @@ irqreturn_t musb_h_ep0_irq(struct musb *pThis)
if (!bComplete) { if (!bComplete) {
/* call common logic and prepare response */ /* call common logic and prepare response */
if (musb_h_ep0_continue(pThis, wCount, pUrb)) { if (musb_h_ep0_continue(musb, wCount, pUrb)) {
/* more packets required */ /* more packets required */
wCsrVal = (MGC_END0_IN == pThis->bEnd0Stage) wCsrVal = (MGC_END0_IN == musb->bEnd0Stage)
? MGC_M_CSR0_H_REQPKT : MGC_M_CSR0_TXPKTRDY; ? MGC_M_CSR0_H_REQPKT : MGC_M_CSR0_TXPKTRDY;
} else { } else {
/* data transfer complete; perform status phase */ /* data transfer complete; perform status phase */
...@@ -1127,7 +1127,7 @@ irqreturn_t musb_h_ep0_irq(struct musb *pThis) ...@@ -1127,7 +1127,7 @@ irqreturn_t musb_h_ep0_irq(struct musb *pThis)
| MGC_M_CSR0_TXPKTRDY; | MGC_M_CSR0_TXPKTRDY;
/* flag status stage */ /* flag status stage */
pThis->bEnd0Stage = MGC_END0_STATUS; musb->bEnd0Stage = MGC_END0_STATUS;
DBG(5, "ep0 STATUS, csr %04x\n", wCsrVal); DBG(5, "ep0 STATUS, csr %04x\n", wCsrVal);
...@@ -1135,11 +1135,11 @@ irqreturn_t musb_h_ep0_irq(struct musb *pThis) ...@@ -1135,11 +1135,11 @@ irqreturn_t musb_h_ep0_irq(struct musb *pThis)
musb_writew(epio, MGC_O_HDRC_CSR0, wCsrVal); musb_writew(epio, MGC_O_HDRC_CSR0, wCsrVal);
retval = IRQ_HANDLED; retval = IRQ_HANDLED;
} else } else
pThis->bEnd0Stage = MGC_END0_IDLE; musb->bEnd0Stage = MGC_END0_IDLE;
/* call completion handler if done */ /* call completion handler if done */
if (bComplete) if (bComplete)
musb_advance_schedule(pThis, pUrb, pEnd, 1); musb_advance_schedule(musb, pUrb, pEnd, 1);
done: done:
return retval; return retval;
} }
...@@ -1162,7 +1162,7 @@ done: ...@@ -1162,7 +1162,7 @@ done:
#endif #endif
/* Service a Tx-Available or dma completion irq for the endpoint */ /* Service a Tx-Available or dma completion irq for the endpoint */
void musb_host_tx(struct musb *pThis, u8 bEnd) void musb_host_tx(struct musb *musb, u8 bEnd)
{ {
int nPipe; int nPipe;
u8 bDone = FALSE; u8 bDone = FALSE;
...@@ -1170,11 +1170,11 @@ void musb_host_tx(struct musb *pThis, u8 bEnd) ...@@ -1170,11 +1170,11 @@ void musb_host_tx(struct musb *pThis, u8 bEnd)
size_t wLength = 0; size_t wLength = 0;
u8 *pBuffer = NULL; u8 *pBuffer = NULL;
struct urb *pUrb; struct urb *pUrb;
struct musb_hw_ep *pEnd = pThis->aLocalEnd + bEnd; struct musb_hw_ep *pEnd = musb->aLocalEnd + bEnd;
void __iomem *epio = pEnd->regs; void __iomem *epio = pEnd->regs;
struct musb_qh *qh = pEnd->out_qh; struct musb_qh *qh = pEnd->out_qh;
u32 status = 0; u32 status = 0;
void __iomem *pBase = pThis->pRegs; void __iomem *pBase = musb->pRegs;
struct dma_channel *dma; struct dma_channel *dma;
pUrb = next_urb(qh); pUrb = next_urb(qh);
...@@ -1227,7 +1227,7 @@ void musb_host_tx(struct musb *pThis, u8 bEnd) ...@@ -1227,7 +1227,7 @@ void musb_host_tx(struct musb *pThis, u8 bEnd)
if (status) { if (status) {
if (dma_channel_status(dma) == MGC_DMA_STATUS_BUSY) { if (dma_channel_status(dma) == MGC_DMA_STATUS_BUSY) {
dma->bStatus = MGC_DMA_STATUS_CORE_ABORT; dma->bStatus = MGC_DMA_STATUS_CORE_ABORT;
(void) pThis->pDmaController->channel_abort(dma); (void) musb->pDmaController->channel_abort(dma);
} }
/* do the proper sequence to abort the transfer in the /* do the proper sequence to abort the transfer in the
...@@ -1309,7 +1309,7 @@ void musb_host_tx(struct musb *pThis, u8 bEnd) ...@@ -1309,7 +1309,7 @@ void musb_host_tx(struct musb *pThis, u8 bEnd)
/* set status */ /* set status */
pUrb->status = status; pUrb->status = status;
pUrb->actual_length = qh->offset; pUrb->actual_length = qh->offset;
musb_advance_schedule(pThis, pUrb, pEnd, USB_DIR_OUT); musb_advance_schedule(musb, pUrb, pEnd, USB_DIR_OUT);
} else if (!(wTxCsrVal & MGC_M_TXCSR_DMAENAB)) { } else if (!(wTxCsrVal & MGC_M_TXCSR_DMAENAB)) {
// WARN_ON(!pBuffer); // WARN_ON(!pBuffer);
...@@ -1377,14 +1377,14 @@ finish: ...@@ -1377,14 +1377,14 @@ finish:
* Service an RX interrupt for the given IN endpoint; docs cover bulk, iso, * Service an RX interrupt for the given IN endpoint; docs cover bulk, iso,
* and high-bandwidth IN transfer cases. * and high-bandwidth IN transfer cases.
*/ */
void musb_host_rx(struct musb *pThis, u8 bEnd) void musb_host_rx(struct musb *musb, u8 bEnd)
{ {
struct urb *pUrb; struct urb *pUrb;
struct musb_hw_ep *pEnd = pThis->aLocalEnd + bEnd; struct musb_hw_ep *pEnd = musb->aLocalEnd + bEnd;
void __iomem *epio = pEnd->regs; void __iomem *epio = pEnd->regs;
struct musb_qh *qh = pEnd->in_qh; struct musb_qh *qh = pEnd->in_qh;
size_t xfer_len; size_t xfer_len;
void __iomem *pBase = pThis->pRegs; void __iomem *pBase = musb->pRegs;
int nPipe; int nPipe;
u16 wRxCsrVal, wVal; u16 wRxCsrVal, wVal;
u8 bIsochError = FALSE; u8 bIsochError = FALSE;
...@@ -1461,7 +1461,7 @@ void musb_host_rx(struct musb *pThis, u8 bEnd) ...@@ -1461,7 +1461,7 @@ void musb_host_rx(struct musb *pThis, u8 bEnd)
/* clean up dma and collect transfer count */ /* clean up dma and collect transfer count */
if (dma_channel_status(dma) == MGC_DMA_STATUS_BUSY) { if (dma_channel_status(dma) == MGC_DMA_STATUS_BUSY) {
dma->bStatus = MGC_DMA_STATUS_CORE_ABORT; dma->bStatus = MGC_DMA_STATUS_CORE_ABORT;
(void) pThis->pDmaController->channel_abort(dma); (void) musb->pDmaController->channel_abort(dma);
xfer_len = dma->dwActualLength; xfer_len = dma->dwActualLength;
} }
musb_h_flush_rxfifo(pEnd, 0); musb_h_flush_rxfifo(pEnd, 0);
...@@ -1492,7 +1492,7 @@ void musb_host_rx(struct musb *pThis, u8 bEnd) ...@@ -1492,7 +1492,7 @@ void musb_host_rx(struct musb *pThis, u8 bEnd)
*/ */
if (dma_channel_status(dma) == MGC_DMA_STATUS_BUSY) { if (dma_channel_status(dma) == MGC_DMA_STATUS_BUSY) {
dma->bStatus = MGC_DMA_STATUS_CORE_ABORT; dma->bStatus = MGC_DMA_STATUS_CORE_ABORT;
(void) pThis->pDmaController->channel_abort(dma); (void) musb->pDmaController->channel_abort(dma);
xfer_len = dma->dwActualLength; xfer_len = dma->dwActualLength;
bDone = TRUE; bDone = TRUE;
} }
...@@ -1567,7 +1567,7 @@ void musb_host_rx(struct musb *pThis, u8 bEnd) ...@@ -1567,7 +1567,7 @@ void musb_host_rx(struct musb *pThis, u8 bEnd)
qh->offset, qh->offset,
pUrb->transfer_buffer_length); pUrb->transfer_buffer_length);
c = pThis->pDmaController; c = musb->pDmaController;
dma->bDesiredMode = 0; dma->bDesiredMode = 0;
#ifdef USE_MODE1 #ifdef USE_MODE1
...@@ -1633,7 +1633,7 @@ void musb_host_rx(struct musb *pThis, u8 bEnd) ...@@ -1633,7 +1633,7 @@ void musb_host_rx(struct musb *pThis, u8 bEnd)
#endif /* Mentor DMA */ #endif /* Mentor DMA */
if (!dma) { if (!dma) {
bDone = musb_host_packet_rx(pThis, pUrb, bDone = musb_host_packet_rx(musb, pUrb,
bEnd, bIsochError); bEnd, bIsochError);
DBG(6, "read %spacket\n", bDone ? "last " : ""); DBG(6, "read %spacket\n", bDone ? "last " : "");
} }
...@@ -1645,7 +1645,7 @@ finish: ...@@ -1645,7 +1645,7 @@ finish:
if (bDone) { if (bDone) {
if (pUrb->status == -EINPROGRESS) if (pUrb->status == -EINPROGRESS)
pUrb->status = status; pUrb->status = status;
musb_advance_schedule(pThis, pUrb, pEnd, USB_DIR_IN); musb_advance_schedule(musb, pUrb, pEnd, USB_DIR_IN);
} }
} }
......
drivers/usb/musb/musb_procfs.c
View file @ 04d2e6bd
...@@ -171,7 +171,7 @@ static int dump_ep(struct musb_ep *ep, char *buffer, unsigned max) ...@@ -171,7 +171,7 @@ static int dump_ep(struct musb_ep *ep, char *buffer, unsigned max)
if (is_cppi_enabled() && ep->bEndNumber) { if (is_cppi_enabled() && ep->bEndNumber) {
unsigned cppi = ep->bEndNumber - 1; unsigned cppi = ep->bEndNumber - 1;
void __iomem *base = ep->pThis->ctrl_base; void __iomem *base = ep->musb->ctrl_base;
unsigned off1 = cppi << 2; unsigned off1 = cppi << 2;
void __iomem *ram = base; void __iomem *ram = base;
char tmp[16]; char tmp[16];
...@@ -233,16 +233,16 @@ static int dump_ep(struct musb_ep *ep, char *buffer, unsigned max) ...@@ -233,16 +233,16 @@ static int dump_ep(struct musb_ep *ep, char *buffer, unsigned max)
#endif #endif
static int static int
dump_end_info(struct musb *pThis, u8 bEnd, char *aBuffer, unsigned max) dump_end_info(struct musb *musb, u8 bEnd, char *aBuffer, unsigned max)
{ {
int code = 0; int code = 0;
char *buf = aBuffer; char *buf = aBuffer;
struct musb_hw_ep *pEnd = &pThis->aLocalEnd[bEnd]; struct musb_hw_ep *pEnd = &musb->aLocalEnd[bEnd];
do { do {
MGC_SelectEnd(pThis->pRegs, bEnd); MGC_SelectEnd(musb->pRegs, bEnd);
#ifdef CONFIG_USB_MUSB_HDRC_HCD #ifdef CONFIG_USB_MUSB_HDRC_HCD
if (is_host_active(pThis)) { if (is_host_active(musb)) {
int dump_rx, dump_tx; int dump_rx, dump_tx;
void __iomem *regs = pEnd->regs; void __iomem *regs = pEnd->regs;
...@@ -253,15 +253,15 @@ dump_end_info(struct musb *pThis, u8 bEnd, char *aBuffer, unsigned max) ...@@ -253,15 +253,15 @@ dump_end_info(struct musb *pThis, u8 bEnd, char *aBuffer, unsigned max)
/* control is shared, uses RX queue /* control is shared, uses RX queue
* but (mostly) shadowed tx registers * but (mostly) shadowed tx registers
*/ */
dump_tx = !list_empty(&pThis->control); dump_tx = !list_empty(&musb->control);
dump_rx = 0; dump_rx = 0;
} else if (pEnd == pThis->bulk_ep) { } else if (pEnd == musb->bulk_ep) {
dump_tx = !list_empty(&pThis->out_bulk); dump_tx = !list_empty(&musb->out_bulk);
dump_rx = !list_empty(&pThis->in_bulk); dump_rx = !list_empty(&musb->in_bulk);
} else if (pThis->periodic[bEnd]) { } else if (musb->periodic[bEnd]) {
struct usb_host_endpoint *hep; struct usb_host_endpoint *hep;
hep = pThis->periodic[bEnd]->hep; hep = musb->periodic[bEnd]->hep;
dump_rx = hep->desc.bEndpointAddress dump_rx = hep->desc.bEndpointAddress
& USB_ENDPOINT_DIR_MASK; & USB_ENDPOINT_DIR_MASK;
dump_tx = !dump_rx; dump_tx = !dump_rx;
...@@ -284,13 +284,13 @@ dump_end_info(struct musb *pThis, u8 bEnd, char *aBuffer, unsigned max) ...@@ -284,13 +284,13 @@ dump_end_info(struct musb *pThis, u8 bEnd, char *aBuffer, unsigned max)
musb_readw(regs, MGC_O_HDRC_RXMAXP), musb_readw(regs, MGC_O_HDRC_RXMAXP),
musb_readb(regs, MGC_O_HDRC_RXTYPE), musb_readb(regs, MGC_O_HDRC_RXTYPE),
/* FIXME: assumes multipoint */ /* FIXME: assumes multipoint */
musb_readb(pThis->pRegs, musb_readb(musb->pRegs,
MGC_BUSCTL_OFFSET(bEnd, MGC_BUSCTL_OFFSET(bEnd,
MGC_O_HDRC_RXFUNCADDR)), MGC_O_HDRC_RXFUNCADDR)),
musb_readb(pThis->pRegs, musb_readb(musb->pRegs,
MGC_BUSCTL_OFFSET(bEnd, MGC_BUSCTL_OFFSET(bEnd,
MGC_O_HDRC_RXHUBADDR)), MGC_O_HDRC_RXHUBADDR)),
musb_readb(pThis->pRegs, musb_readb(musb->pRegs,
MGC_BUSCTL_OFFSET(bEnd, MGC_BUSCTL_OFFSET(bEnd,
MGC_O_HDRC_RXHUBPORT)) MGC_O_HDRC_RXHUBPORT))
); );
...@@ -309,7 +309,7 @@ dump_end_info(struct musb *pThis, u8 bEnd, char *aBuffer, unsigned max) ...@@ -309,7 +309,7 @@ dump_end_info(struct musb *pThis, u8 bEnd, char *aBuffer, unsigned max)
void __iomem *ram; void __iomem *ram;
char tmp[16]; char tmp[16];
base = pThis->ctrl_base; base = musb->ctrl_base;
ram = DAVINCI_RXCPPI_STATERAM_OFFSET( ram = DAVINCI_RXCPPI_STATERAM_OFFSET(
cppi) + base; cppi) + base;
snprintf(tmp, sizeof tmp, "%d left, ", snprintf(tmp, sizeof tmp, "%d left, ",
...@@ -337,18 +337,18 @@ dump_end_info(struct musb *pThis, u8 bEnd, char *aBuffer, unsigned max) ...@@ -337,18 +337,18 @@ dump_end_info(struct musb *pThis, u8 bEnd, char *aBuffer, unsigned max)
max -= code; max -= code;
} }
if (pEnd == pThis->bulk_ep if (pEnd == musb->bulk_ep
&& !list_empty( && !list_empty(
&pThis->in_bulk)) { &musb->in_bulk)) {
code = dump_queue(&pThis->in_bulk, code = dump_queue(&musb->in_bulk,
buf, max); buf, max);
if (code <= 0) if (code <= 0)
break; break;
code = min(code, (int) max); code = min(code, (int) max);
buf += code; buf += code;
max -= code; max -= code;
} else if (pThis->periodic[bEnd]) { } else if (musb->periodic[bEnd]) {
code = dump_qh(pThis->periodic[bEnd], code = dump_qh(musb->periodic[bEnd],
buf, max); buf, max);
if (code <= 0) if (code <= 0)
break; break;
...@@ -372,13 +372,13 @@ dump_end_info(struct musb *pThis, u8 bEnd, char *aBuffer, unsigned max) ...@@ -372,13 +372,13 @@ dump_end_info(struct musb *pThis, u8 bEnd, char *aBuffer, unsigned max)
musb_readw(regs, MGC_O_HDRC_TXMAXP), musb_readw(regs, MGC_O_HDRC_TXMAXP),
musb_readb(regs, MGC_O_HDRC_TXTYPE), musb_readb(regs, MGC_O_HDRC_TXTYPE),
/* FIXME: assumes multipoint */ /* FIXME: assumes multipoint */
musb_readb(pThis->pRegs, musb_readb(musb->pRegs,
MGC_BUSCTL_OFFSET(bEnd, MGC_BUSCTL_OFFSET(bEnd,
MGC_O_HDRC_TXFUNCADDR)), MGC_O_HDRC_TXFUNCADDR)),
musb_readb(pThis->pRegs, musb_readb(musb->pRegs,
MGC_BUSCTL_OFFSET(bEnd, MGC_BUSCTL_OFFSET(bEnd,
MGC_O_HDRC_TXHUBADDR)), MGC_O_HDRC_TXHUBADDR)),
musb_readb(pThis->pRegs, musb_readb(musb->pRegs,
MGC_BUSCTL_OFFSET(bEnd, MGC_BUSCTL_OFFSET(bEnd,
MGC_O_HDRC_TXHUBPORT)) MGC_O_HDRC_TXHUBPORT))
); );
...@@ -395,7 +395,7 @@ dump_end_info(struct musb *pThis, u8 bEnd, char *aBuffer, unsigned max) ...@@ -395,7 +395,7 @@ dump_end_info(struct musb *pThis, u8 bEnd, char *aBuffer, unsigned max)
void __iomem *base; void __iomem *base;
void __iomem *ram; void __iomem *ram;
base = pThis->ctrl_base; base = musb->ctrl_base;
ram = DAVINCI_RXCPPI_STATERAM_OFFSET( ram = DAVINCI_RXCPPI_STATERAM_OFFSET(
cppi) + base; cppi) + base;
code = snprintf(buf, max, code = snprintf(buf, max,
...@@ -418,28 +418,28 @@ dump_end_info(struct musb *pThis, u8 bEnd, char *aBuffer, unsigned max) ...@@ -418,28 +418,28 @@ dump_end_info(struct musb *pThis, u8 bEnd, char *aBuffer, unsigned max)
max -= code; max -= code;
} }
if (pEnd == pThis->control_ep if (pEnd == musb->control_ep
&& !list_empty( && !list_empty(
&pThis->control)) { &musb->control)) {
code = dump_queue(&pThis->control, code = dump_queue(&musb->control,
buf, max); buf, max);
if (code <= 0) if (code <= 0)
break; break;
code = min(code, (int) max); code = min(code, (int) max);
buf += code; buf += code;
max -= code; max -= code;
} else if (pEnd == pThis->bulk_ep } else if (pEnd == musb->bulk_ep
&& !list_empty( && !list_empty(
&pThis->out_bulk)) { &musb->out_bulk)) {
code = dump_queue(&pThis->out_bulk, code = dump_queue(&musb->out_bulk,
buf, max); buf, max);
if (code <= 0) if (code <= 0)
break; break;
code = min(code, (int) max); code = min(code, (int) max);
buf += code; buf += code;
max -= code; max -= code;
} else if (pThis->periodic[bEnd]) { } else if (musb->periodic[bEnd]) {
code = dump_qh(pThis->periodic[bEnd], code = dump_qh(musb->periodic[bEnd],
buf, max); buf, max);
if (code <= 0) if (code <= 0)
break; break;
...@@ -451,7 +451,7 @@ dump_end_info(struct musb *pThis, u8 bEnd, char *aBuffer, unsigned max) ...@@ -451,7 +451,7 @@ dump_end_info(struct musb *pThis, u8 bEnd, char *aBuffer, unsigned max)
} }
#endif #endif
#ifdef CONFIG_USB_GADGET_MUSB_HDRC #ifdef CONFIG_USB_GADGET_MUSB_HDRC
if (is_peripheral_active(pThis)) { if (is_peripheral_active(musb)) {
code = 0; code = 0;
if (pEnd->ep_in.desc || !bEnd) { if (pEnd->ep_in.desc || !bEnd) {
...@@ -478,19 +478,19 @@ dump_end_info(struct musb *pThis, u8 bEnd, char *aBuffer, unsigned max) ...@@ -478,19 +478,19 @@ dump_end_info(struct musb *pThis, u8 bEnd, char *aBuffer, unsigned max)
} }
/** Dump the current status and compile options. /** Dump the current status and compile options.
* @param pThis the device driver instance * @param musb the device driver instance
* @param buffer where to dump the status; it must be big enough hold the * @param buffer where to dump the status; it must be big enough hold the
* result otherwise "BAD THINGS HAPPENS(TM)". * result otherwise "BAD THINGS HAPPENS(TM)".
*/ */
static int dump_header_stats(struct musb *pThis, char *buffer) static int dump_header_stats(struct musb *musb, char *buffer)
{ {
int code, count = 0; int code, count = 0;
const void __iomem *pBase = pThis->pRegs; const void __iomem *pBase = musb->pRegs;
*buffer = 0; *buffer = 0;
count = sprintf(buffer, "Status: %sHDRC, Mode=%s " count = sprintf(buffer, "Status: %sHDRC, Mode=%s "
"(Power=%02x, DevCtl=%02x)\n", "(Power=%02x, DevCtl=%02x)\n",
(pThis->bIsMultipoint ? "M" : ""), MUSB_MODE(pThis), (musb->bIsMultipoint ? "M" : ""), MUSB_MODE(musb),
musb_readb(pBase, MGC_O_HDRC_POWER), musb_readb(pBase, MGC_O_HDRC_POWER),
musb_readb(pBase, MGC_O_HDRC_DEVCTL)); musb_readb(pBase, MGC_O_HDRC_DEVCTL));
if (count <= 0) if (count <= 0)
...@@ -498,8 +498,8 @@ static int dump_header_stats(struct musb *pThis, char *buffer) ...@@ -498,8 +498,8 @@ static int dump_header_stats(struct musb *pThis, char *buffer)
buffer += count; buffer += count;
code = sprintf(buffer, "OTG state: %s; %sactive\n", code = sprintf(buffer, "OTG state: %s; %sactive\n",
otg_state_string(pThis), otg_state_string(musb),
pThis->is_active ? "" : "in"); musb->is_active ? "" : "in");
if (code <= 0) if (code <= 0)
goto done; goto done;
buffer += code; buffer += code;
...@@ -528,7 +528,7 @@ static int dump_header_stats(struct musb *pThis, char *buffer) ...@@ -528,7 +528,7 @@ static int dump_header_stats(struct musb *pThis, char *buffer)
#endif #endif
", debug=%d [eps=%d]\n", ", debug=%d [eps=%d]\n",
debug, debug,
pThis->bEndCount); musb->bEndCount);
if (code <= 0) if (code <= 0)
goto done; goto done;
count += code; count += code;
...@@ -536,7 +536,7 @@ static int dump_header_stats(struct musb *pThis, char *buffer) ...@@ -536,7 +536,7 @@ static int dump_header_stats(struct musb *pThis, char *buffer)
#ifdef CONFIG_USB_GADGET_MUSB_HDRC #ifdef CONFIG_USB_GADGET_MUSB_HDRC
code = sprintf(buffer, "Peripheral address: %02x\n", code = sprintf(buffer, "Peripheral address: %02x\n",
musb_readb(pThis, MGC_O_HDRC_FADDR)); musb_readb(musb, MGC_O_HDRC_FADDR));
if (code <= 0) if (code <= 0)
goto done; goto done;
buffer += code; buffer += code;
...@@ -545,7 +545,7 @@ static int dump_header_stats(struct musb *pThis, char *buffer) ...@@ -545,7 +545,7 @@ static int dump_header_stats(struct musb *pThis, char *buffer)
#ifdef CONFIG_USB_MUSB_HDRC_HCD #ifdef CONFIG_USB_MUSB_HDRC_HCD
code = sprintf(buffer, "Root port status: %08x\n", code = sprintf(buffer, "Root port status: %08x\n",
pThis->port1_status); musb->port1_status);
if (code <= 0) if (code <= 0)
goto done; goto done;
buffer += code; buffer += code;
...@@ -557,14 +557,14 @@ static int dump_header_stats(struct musb *pThis, char *buffer) ...@@ -557,14 +557,14 @@ static int dump_header_stats(struct musb *pThis, char *buffer)
"DaVinci: ctrl=%02x stat=%1x phy=%03x\n" "DaVinci: ctrl=%02x stat=%1x phy=%03x\n"
"\trndis=%05x auto=%04x intsrc=%08x intmsk=%08x" "\trndis=%05x auto=%04x intsrc=%08x intmsk=%08x"
"\n", "\n",
musb_readl(pThis->ctrl_base, DAVINCI_USB_CTRL_REG), musb_readl(musb->ctrl_base, DAVINCI_USB_CTRL_REG),
musb_readl(pThis->ctrl_base, DAVINCI_USB_STAT_REG), musb_readl(musb->ctrl_base, DAVINCI_USB_STAT_REG),
__raw_readl(IO_ADDRESS(USBPHY_CTL_PADDR)), __raw_readl(IO_ADDRESS(USBPHY_CTL_PADDR)),
musb_readl(pThis->ctrl_base, DAVINCI_RNDIS_REG), musb_readl(musb->ctrl_base, DAVINCI_RNDIS_REG),
musb_readl(pThis->ctrl_base, DAVINCI_AUTOREQ_REG), musb_readl(musb->ctrl_base, DAVINCI_AUTOREQ_REG),
musb_readl(pThis->ctrl_base, musb_readl(musb->ctrl_base,
DAVINCI_USB_INT_SOURCE_REG), DAVINCI_USB_INT_SOURCE_REG),
musb_readl(pThis->ctrl_base, musb_readl(musb->ctrl_base,
DAVINCI_USB_INT_MASK_REG)); DAVINCI_USB_INT_MASK_REG));
if (code <= 0) if (code <= 0)
goto done; goto done;
...@@ -578,37 +578,37 @@ static int dump_header_stats(struct musb *pThis, char *buffer) ...@@ -578,37 +578,37 @@ static int dump_header_stats(struct musb *pThis, char *buffer)
"\n\totg %03x timer %08x" "\n\totg %03x timer %08x"
"\n\tprcm conf %08x mgmt %08x; int src %08x mask %08x" "\n\tprcm conf %08x mgmt %08x; int src %08x mask %08x"
"\n", "\n",
musb_readl(pThis->ctrl_base, TUSB_DEV_CONF), musb_readl(musb->ctrl_base, TUSB_DEV_CONF),
musb_readl(pThis->ctrl_base, TUSB_PHY_OTG_CTRL_ENABLE), musb_readl(musb->ctrl_base, TUSB_PHY_OTG_CTRL_ENABLE),
musb_readl(pThis->ctrl_base, TUSB_PHY_OTG_CTRL), musb_readl(musb->ctrl_base, TUSB_PHY_OTG_CTRL),
musb_readl(pThis->ctrl_base, TUSB_DEV_OTG_STAT), musb_readl(musb->ctrl_base, TUSB_DEV_OTG_STAT),
musb_readl(pThis->ctrl_base, TUSB_DEV_OTG_TIMER), musb_readl(musb->ctrl_base, TUSB_DEV_OTG_TIMER),
musb_readl(pThis->ctrl_base, TUSB_PRCM_CONF), musb_readl(musb->ctrl_base, TUSB_PRCM_CONF),
musb_readl(pThis->ctrl_base, TUSB_PRCM_MNGMT), musb_readl(musb->ctrl_base, TUSB_PRCM_MNGMT),
musb_readl(pThis->ctrl_base, TUSB_INT_SRC), musb_readl(musb->ctrl_base, TUSB_INT_SRC),
musb_readl(pThis->ctrl_base, TUSB_INT_MASK)); musb_readl(musb->ctrl_base, TUSB_INT_MASK));
if (code <= 0) if (code <= 0)
goto done; goto done;
count += code; count += code;
buffer += code; buffer += code;
#endif /* DAVINCI */ #endif /* DAVINCI */
if (is_cppi_enabled() && pThis->pDmaController) { if (is_cppi_enabled() && musb->pDmaController) {
code = sprintf(buffer, code = sprintf(buffer,
"CPPI: txcr=%d txsrc=%01x txena=%01x; " "CPPI: txcr=%d txsrc=%01x txena=%01x; "
"rxcr=%d rxsrc=%01x rxena=%01x " "rxcr=%d rxsrc=%01x rxena=%01x "
"\n", "\n",
musb_readl(pThis->ctrl_base, musb_readl(musb->ctrl_base,
DAVINCI_TXCPPI_CTRL_REG), DAVINCI_TXCPPI_CTRL_REG),
musb_readl(pThis->ctrl_base, musb_readl(musb->ctrl_base,
DAVINCI_TXCPPI_RAW_REG), DAVINCI_TXCPPI_RAW_REG),
musb_readl(pThis->ctrl_base, musb_readl(musb->ctrl_base,
DAVINCI_TXCPPI_INTENAB_REG), DAVINCI_TXCPPI_INTENAB_REG),
musb_readl(pThis->ctrl_base, musb_readl(musb->ctrl_base,
DAVINCI_RXCPPI_CTRL_REG), DAVINCI_RXCPPI_CTRL_REG),
musb_readl(pThis->ctrl_base, musb_readl(musb->ctrl_base,
DAVINCI_RXCPPI_RAW_REG), DAVINCI_RXCPPI_RAW_REG),
musb_readl(pThis->ctrl_base, musb_readl(musb->ctrl_base,
DAVINCI_RXCPPI_INTENAB_REG)); DAVINCI_RXCPPI_INTENAB_REG));
if (code <= 0) if (code <= 0)
goto done; goto done;
...@@ -617,10 +617,10 @@ static int dump_header_stats(struct musb *pThis, char *buffer) ...@@ -617,10 +617,10 @@ static int dump_header_stats(struct musb *pThis, char *buffer)
} }
#ifdef CONFIG_USB_GADGET_MUSB_HDRC #ifdef CONFIG_USB_GADGET_MUSB_HDRC
if (is_peripheral_enabled(pThis)) { if (is_peripheral_enabled(musb)) {
code = sprintf(buffer, "Gadget driver: %s\n", code = sprintf(buffer, "Gadget driver: %s\n",
pThis->pGadgetDriver musb->pGadgetDriver
? pThis->pGadgetDriver->driver.name ? musb->pGadgetDriver->driver.name
: "(none)"); : "(none)");
if (code <= 0) if (code <= 0)
goto done; goto done;
...@@ -784,7 +784,7 @@ static int musb_proc_read(char *page, char **start, ...@@ -784,7 +784,7 @@ static int musb_proc_read(char *page, char **start,
char *buffer = page; char *buffer = page;
int code = 0; int code = 0;
unsigned long flags; unsigned long flags;
struct musb *pThis = data; struct musb *musb = data;
unsigned bEnd; unsigned bEnd;
count -= off; count -= off;
...@@ -792,9 +792,9 @@ static int musb_proc_read(char *page, char **start, ...@@ -792,9 +792,9 @@ static int musb_proc_read(char *page, char **start,
if (count <= 0) if (count <= 0)
return -EINVAL; return -EINVAL;
spin_lock_irqsave(&pThis->Lock, flags); spin_lock_irqsave(&musb->Lock, flags);
code = dump_header_stats(pThis, buffer); code = dump_header_stats(musb, buffer);
if (code > 0) { if (code > 0) {
buffer += code; buffer += code;
count -= code; count -= code;
...@@ -802,18 +802,18 @@ static int musb_proc_read(char *page, char **start, ...@@ -802,18 +802,18 @@ static int musb_proc_read(char *page, char **start,
/* generate the report for the end points */ /* generate the report for the end points */
// REVISIT ... not unless something's connected! // REVISIT ... not unless something's connected!
for (bEnd = 0; count >= 0 && bEnd < pThis->bEndCount; for (bEnd = 0; count >= 0 && bEnd < musb->bEndCount;
bEnd++) { bEnd++) {
code = dump_end_info(pThis, bEnd, buffer, count); code = dump_end_info(musb, bEnd, buffer, count);
if (code > 0) { if (code > 0) {
buffer += code; buffer += code;
count -= code; count -= code;
} }
} }
musb_platform_try_idle(pThis, 0); musb_platform_try_idle(musb, 0);
spin_unlock_irqrestore(&pThis->Lock, flags); spin_unlock_irqrestore(&musb->Lock, flags);
*eof = 1; *eof = 1;
return buffer - page; return buffer - page;
......
drivers/usb/musb/musbdefs.h
View file @ 04d2e6bd
...@@ -496,8 +496,8 @@ static inline struct musb *gadget_to_musb(struct usb_gadget *g) ...@@ -496,8 +496,8 @@ static inline struct musb *gadget_to_musb(struct usb_gadget *g)
extern const char musb_driver_name[]; extern const char musb_driver_name[];
extern void musb_start(struct musb *pThis); extern void musb_start(struct musb *musb);
extern void musb_stop(struct musb *pThis); extern void musb_stop(struct musb *musb);
extern void musb_write_fifo(struct musb_hw_ep *ep, extern void musb_write_fifo(struct musb_hw_ep *ep,
u16 wCount, const u8 * pSource); u16 wCount, const u8 * pSource);
......
drivers/usb/musb/musbhsdma.c
View file @ 04d2e6bd
...@@ -104,12 +104,12 @@ static int dma_controller_stop(struct dma_controller *c) ...@@ -104,12 +104,12 @@ static int dma_controller_stop(struct dma_controller *c)
{ {
struct musb_dma_controller *pController = struct musb_dma_controller *pController =
container_of(c, struct musb_dma_controller, Controller); container_of(c, struct musb_dma_controller, Controller);
struct musb *pThis = (struct musb *) pController->pDmaPrivate; struct musb *musb = (struct musb *) pController->pDmaPrivate;
struct dma_channel *pChannel; struct dma_channel *pChannel;
u8 bBit; u8 bBit;
if (pController->bmUsedChannels != 0) { if (pController->bmUsedChannels != 0) {
dev_err(pThis->controller, dev_err(musb->controller,
"Stopping DMA controller while channel active\n"); "Stopping DMA controller while channel active\n");
for (bBit = 0; bBit < MGC_HSDMA_CHANNELS; bBit++) { for (bBit = 0; bBit < MGC_HSDMA_CHANNELS; bBit++) {
...@@ -387,10 +387,10 @@ void dma_controller_destroy(struct dma_controller *c) ...@@ -387,10 +387,10 @@ void dma_controller_destroy(struct dma_controller *c)
} }
struct dma_controller *__init struct dma_controller *__init
dma_controller_create(struct musb *pThis, void __iomem *pCoreBase) dma_controller_create(struct musb *musb, void __iomem *pCoreBase)
{ {
struct musb_dma_controller *pController; struct musb_dma_controller *pController;
struct device *dev = pThis->controller; struct device *dev = musb->controller;
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
int irq = platform_get_irq(pdev, 1); int irq = platform_get_irq(pdev, 1);
...@@ -404,7 +404,7 @@ dma_controller_create(struct musb *pThis, void __iomem *pCoreBase) ...@@ -404,7 +404,7 @@ dma_controller_create(struct musb *pThis, void __iomem *pCoreBase)
return NULL; return NULL;
pController->bChannelCount = MGC_HSDMA_CHANNELS; pController->bChannelCount = MGC_HSDMA_CHANNELS;
pController->pDmaPrivate = pThis; pController->pDmaPrivate = musb;
pController->pCoreBase = pCoreBase; pController->pCoreBase = pCoreBase;
pController->Controller.pPrivateData = pController; pController->Controller.pPrivateData = pController;
...@@ -416,7 +416,7 @@ dma_controller_create(struct musb *pThis, void __iomem *pCoreBase) ...@@ -416,7 +416,7 @@ dma_controller_create(struct musb *pThis, void __iomem *pCoreBase)
pController->Controller.channel_abort = dma_channel_abort; pController->Controller.channel_abort = dma_channel_abort;
if (request_irq(irq, dma_controller_irq, IRQF_DISABLED, if (request_irq(irq, dma_controller_irq, IRQF_DISABLED,
pThis->controller->bus_id, &pController->Controller)) { musb->controller->bus_id, &pController->Controller)) {
dev_err(dev, "request_irq %d failed!\n", irq); dev_err(dev, "request_irq %d failed!\n", irq);
dma_controller_destroy(&pController->Controller); dma_controller_destroy(&pController->Controller);
return NULL; return NULL;
......
drivers/usb/musb/plat_uds.c
View file @ 04d2e6bd
...@@ -350,7 +350,7 @@ void musb_hnp_stop(struct musb *musb) ...@@ -350,7 +350,7 @@ void musb_hnp_stop(struct musb *musb)
* paramount importance, it seems OK to check them individually; * paramount importance, it seems OK to check them individually;
* the order of the tests is specified in the manual * the order of the tests is specified in the manual
* *
* @param pThis instance pointer * @param musb instance pointer
* @param bIntrUSB register contents * @param bIntrUSB register contents
* @param devctl * @param devctl
* @param power * @param power
...@@ -360,12 +360,12 @@ void musb_hnp_stop(struct musb *musb) ...@@ -360,12 +360,12 @@ void musb_hnp_stop(struct musb *musb)
| MGC_M_INTR_VBUSERROR | MGC_M_INTR_CONNECT \ | MGC_M_INTR_VBUSERROR | MGC_M_INTR_CONNECT \
| MGC_M_INTR_RESET ) | MGC_M_INTR_RESET )
static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB, static irqreturn_t musb_stage0_irq(struct musb * musb, u8 bIntrUSB,
u8 devctl, u8 power) u8 devctl, u8 power)
{ {
irqreturn_t handled = IRQ_NONE; irqreturn_t handled = IRQ_NONE;
#ifdef CONFIG_USB_MUSB_HDRC_HCD #ifdef CONFIG_USB_MUSB_HDRC_HCD
void __iomem *pBase = pThis->pRegs; void __iomem *pBase = musb->pRegs;
#endif #endif
DBG(3, "<== Power=%02x, DevCtl=%02x, bIntrUSB=0x%x\n", power, devctl, DBG(3, "<== Power=%02x, DevCtl=%02x, bIntrUSB=0x%x\n", power, devctl,
...@@ -377,11 +377,11 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB, ...@@ -377,11 +377,11 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB,
*/ */
if (bIntrUSB & MGC_M_INTR_RESUME) { if (bIntrUSB & MGC_M_INTR_RESUME) {
handled = IRQ_HANDLED; handled = IRQ_HANDLED;
DBG(3, "RESUME (%s)\n", otg_state_string(pThis)); DBG(3, "RESUME (%s)\n", otg_state_string(musb));
if (devctl & MGC_M_DEVCTL_HM) { if (devctl & MGC_M_DEVCTL_HM) {
#ifdef CONFIG_USB_MUSB_HDRC_HCD #ifdef CONFIG_USB_MUSB_HDRC_HCD
switch (pThis->xceiv.state) { switch (musb->xceiv.state) {
case OTG_STATE_A_SUSPEND: case OTG_STATE_A_SUSPEND:
/* remote wakeup? later, GetPortStatus /* remote wakeup? later, GetPortStatus
* will stop RESUME signaling * will stop RESUME signaling
...@@ -389,7 +389,7 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB, ...@@ -389,7 +389,7 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB,
if (power & MGC_M_POWER_SUSPENDM) { if (power & MGC_M_POWER_SUSPENDM) {
/* spurious */ /* spurious */
pThis->int_usb &= ~MGC_M_INTR_SUSPEND; musb->int_usb &= ~MGC_M_INTR_SUSPEND;
DBG(2, "Spurious SUSPENDM\n"); DBG(2, "Spurious SUSPENDM\n");
break; break;
} }
...@@ -398,34 +398,34 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB, ...@@ -398,34 +398,34 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB,
musb_writeb(pBase, MGC_O_HDRC_POWER, musb_writeb(pBase, MGC_O_HDRC_POWER,
power | MGC_M_POWER_RESUME); power | MGC_M_POWER_RESUME);
pThis->port1_status |= musb->port1_status |=
(USB_PORT_STAT_C_SUSPEND << 16) (USB_PORT_STAT_C_SUSPEND << 16)
| MUSB_PORT_STAT_RESUME; | MUSB_PORT_STAT_RESUME;
pThis->rh_timer = jiffies musb->rh_timer = jiffies
+ msecs_to_jiffies(20); + msecs_to_jiffies(20);
pThis->xceiv.state = OTG_STATE_A_HOST; musb->xceiv.state = OTG_STATE_A_HOST;
pThis->is_active = 1; musb->is_active = 1;
usb_hcd_resume_root_hub(musb_to_hcd(pThis)); usb_hcd_resume_root_hub(musb_to_hcd(musb));
break; break;
case OTG_STATE_B_WAIT_ACON: case OTG_STATE_B_WAIT_ACON:
pThis->xceiv.state = OTG_STATE_B_PERIPHERAL; musb->xceiv.state = OTG_STATE_B_PERIPHERAL;
pThis->is_active = 1; musb->is_active = 1;
MUSB_DEV_MODE(pThis); MUSB_DEV_MODE(musb);
break; break;
default: default:
WARN("bogus %s RESUME (%s)\n", WARN("bogus %s RESUME (%s)\n",
"host", "host",
otg_state_string(pThis)); otg_state_string(musb));
} }
#endif #endif
} else { } else {
switch (pThis->xceiv.state) { switch (musb->xceiv.state) {
#ifdef CONFIG_USB_MUSB_HDRC_HCD #ifdef CONFIG_USB_MUSB_HDRC_HCD
case OTG_STATE_A_SUSPEND: case OTG_STATE_A_SUSPEND:
/* possibly DISCONNECT is upcoming */ /* possibly DISCONNECT is upcoming */
pThis->xceiv.state = OTG_STATE_A_HOST; musb->xceiv.state = OTG_STATE_A_HOST;
usb_hcd_resume_root_hub(musb_to_hcd(pThis)); usb_hcd_resume_root_hub(musb_to_hcd(musb));
break; break;
#endif #endif
#ifdef CONFIG_USB_GADGET_MUSB_HDRC #ifdef CONFIG_USB_GADGET_MUSB_HDRC
...@@ -436,20 +436,20 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB, ...@@ -436,20 +436,20 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB,
*/ */
if ((devctl & MGC_M_DEVCTL_VBUS) if ((devctl & MGC_M_DEVCTL_VBUS)
!= (3 << MGC_S_DEVCTL_VBUS)) { != (3 << MGC_S_DEVCTL_VBUS)) {
pThis->int_usb |= MGC_M_INTR_DISCONNECT; musb->int_usb |= MGC_M_INTR_DISCONNECT;
pThis->int_usb &= ~MGC_M_INTR_SUSPEND; musb->int_usb &= ~MGC_M_INTR_SUSPEND;
break; break;
} }
musb_g_resume(pThis); musb_g_resume(musb);
break; break;
case OTG_STATE_B_IDLE: case OTG_STATE_B_IDLE:
pThis->int_usb &= ~MGC_M_INTR_SUSPEND; musb->int_usb &= ~MGC_M_INTR_SUSPEND;
break; break;
#endif #endif
default: default:
WARN("bogus %s RESUME (%s)\n", WARN("bogus %s RESUME (%s)\n",
"peripheral", "peripheral",
otg_state_string(pThis)); otg_state_string(musb));
} }
} }
} }
...@@ -457,7 +457,7 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB, ...@@ -457,7 +457,7 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB,
#ifdef CONFIG_USB_MUSB_HDRC_HCD #ifdef CONFIG_USB_MUSB_HDRC_HCD
/* see manual for the order of the tests */ /* see manual for the order of the tests */
if (bIntrUSB & MGC_M_INTR_SESSREQ) { if (bIntrUSB & MGC_M_INTR_SESSREQ) {
DBG(1, "SESSION_REQUEST (%s)\n", otg_state_string(pThis)); DBG(1, "SESSION_REQUEST (%s)\n", otg_state_string(musb));
/* IRQ arrives from ID pin sense or (later, if VBUS power /* IRQ arrives from ID pin sense or (later, if VBUS power
* is removed) SRP. responses are time critical: * is removed) SRP. responses are time critical:
...@@ -467,10 +467,10 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB, ...@@ -467,10 +467,10 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB,
* a_wait_vrise_tmout triggers VBUS_ERROR transitions * a_wait_vrise_tmout triggers VBUS_ERROR transitions
*/ */
musb_writeb(pBase, MGC_O_HDRC_DEVCTL, MGC_M_DEVCTL_SESSION); musb_writeb(pBase, MGC_O_HDRC_DEVCTL, MGC_M_DEVCTL_SESSION);
pThis->bEnd0Stage = MGC_END0_START; musb->bEnd0Stage = MGC_END0_START;
pThis->xceiv.state = OTG_STATE_A_IDLE; musb->xceiv.state = OTG_STATE_A_IDLE;
MUSB_HST_MODE(pThis); MUSB_HST_MODE(musb);
musb_set_vbus(pThis, 1); musb_set_vbus(musb, 1);
handled = IRQ_HANDLED; handled = IRQ_HANDLED;
} }
...@@ -494,7 +494,7 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB, ...@@ -494,7 +494,7 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB,
* REVISIT: do delays from lots of DEBUG_KERNEL checks * REVISIT: do delays from lots of DEBUG_KERNEL checks
* make trouble here, keeping VBUS < 4.4V ? * make trouble here, keeping VBUS < 4.4V ?
*/ */
switch (pThis->xceiv.state) { switch (musb->xceiv.state) {
case OTG_STATE_A_HOST: case OTG_STATE_A_HOST:
/* recovery is dicey once we've gotten past the /* recovery is dicey once we've gotten past the
* initial stages of enumeration, but if VBUS * initial stages of enumeration, but if VBUS
...@@ -504,13 +504,13 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB, ...@@ -504,13 +504,13 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB,
*/ */
case OTG_STATE_A_WAIT_BCON: case OTG_STATE_A_WAIT_BCON:
case OTG_STATE_A_WAIT_VRISE: case OTG_STATE_A_WAIT_VRISE:
if (pThis->vbuserr_retry) { if (musb->vbuserr_retry) {
pThis->vbuserr_retry--; musb->vbuserr_retry--;
ignore = 1; ignore = 1;
devctl |= MGC_M_DEVCTL_SESSION; devctl |= MGC_M_DEVCTL_SESSION;
musb_writeb(pBase, MGC_O_HDRC_DEVCTL, devctl); musb_writeb(pBase, MGC_O_HDRC_DEVCTL, devctl);
} else { } else {
pThis->port1_status |= musb->port1_status |=
(1 << USB_PORT_FEAT_OVER_CURRENT) (1 << USB_PORT_FEAT_OVER_CURRENT)
| (1 << USB_PORT_FEAT_C_OVER_CURRENT); | (1 << USB_PORT_FEAT_C_OVER_CURRENT);
} }
...@@ -520,7 +520,7 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB, ...@@ -520,7 +520,7 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB,
} }
DBG(1, "VBUS_ERROR in %s (%02x, %s), retry #%d, port1 %08x\n", DBG(1, "VBUS_ERROR in %s (%02x, %s), retry #%d, port1 %08x\n",
otg_state_string(pThis), otg_state_string(musb),
devctl, devctl,
({ char *s; ({ char *s;
switch (devctl & MGC_M_DEVCTL_VBUS) { switch (devctl & MGC_M_DEVCTL_VBUS) {
...@@ -534,69 +534,69 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB, ...@@ -534,69 +534,69 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB,
default: default:
s = "VALID"; break; s = "VALID"; break;
}; s; }), }; s; }),
VBUSERR_RETRY_COUNT - pThis->vbuserr_retry, VBUSERR_RETRY_COUNT - musb->vbuserr_retry,
pThis->port1_status); musb->port1_status);
/* go through A_WAIT_VFALL then start a new session */ /* go through A_WAIT_VFALL then start a new session */
if (!ignore) if (!ignore)
musb_set_vbus(pThis, 0); musb_set_vbus(musb, 0);
handled = IRQ_HANDLED; handled = IRQ_HANDLED;
} }
if (bIntrUSB & MGC_M_INTR_CONNECT) { if (bIntrUSB & MGC_M_INTR_CONNECT) {
struct usb_hcd *hcd = musb_to_hcd(pThis); struct usb_hcd *hcd = musb_to_hcd(musb);
handled = IRQ_HANDLED; handled = IRQ_HANDLED;
pThis->is_active = 1; musb->is_active = 1;
set_bit(HCD_FLAG_SAW_IRQ, &hcd->flags); set_bit(HCD_FLAG_SAW_IRQ, &hcd->flags);
pThis->bEnd0Stage = MGC_END0_START; musb->bEnd0Stage = MGC_END0_START;
#ifdef CONFIG_USB_MUSB_OTG #ifdef CONFIG_USB_MUSB_OTG
/* flush endpoints when transitioning from Device Mode */ /* flush endpoints when transitioning from Device Mode */
if (is_peripheral_active(pThis)) { if (is_peripheral_active(musb)) {
// REVISIT HNP; just force disconnect // REVISIT HNP; just force disconnect
} }
pThis->bDelayPortPowerOff = FALSE; musb->bDelayPortPowerOff = FALSE;
musb_writew(pBase, MGC_O_HDRC_INTRTXE, pThis->wEndMask); musb_writew(pBase, MGC_O_HDRC_INTRTXE, musb->wEndMask);
musb_writew(pBase, MGC_O_HDRC_INTRRXE, pThis->wEndMask & 0xfffe); musb_writew(pBase, MGC_O_HDRC_INTRRXE, musb->wEndMask & 0xfffe);
musb_writeb(pBase, MGC_O_HDRC_INTRUSBE, 0xf7); musb_writeb(pBase, MGC_O_HDRC_INTRUSBE, 0xf7);
#endif #endif
pThis->port1_status &= ~(USB_PORT_STAT_LOW_SPEED musb->port1_status &= ~(USB_PORT_STAT_LOW_SPEED
|USB_PORT_STAT_HIGH_SPEED |USB_PORT_STAT_HIGH_SPEED
|USB_PORT_STAT_ENABLE |USB_PORT_STAT_ENABLE
); );
pThis->port1_status |= USB_PORT_STAT_CONNECTION musb->port1_status |= USB_PORT_STAT_CONNECTION
|(USB_PORT_STAT_C_CONNECTION << 16); |(USB_PORT_STAT_C_CONNECTION << 16);
/* high vs full speed is just a guess until after reset */ /* high vs full speed is just a guess until after reset */
if (devctl & MGC_M_DEVCTL_LSDEV) if (devctl & MGC_M_DEVCTL_LSDEV)
pThis->port1_status |= USB_PORT_STAT_LOW_SPEED; musb->port1_status |= USB_PORT_STAT_LOW_SPEED;
if (hcd->status_urb) if (hcd->status_urb)
usb_hcd_poll_rh_status(hcd); usb_hcd_poll_rh_status(hcd);
else else
usb_hcd_resume_root_hub(hcd); usb_hcd_resume_root_hub(hcd);
MUSB_HST_MODE(pThis); MUSB_HST_MODE(musb);
/* indicate new connection to OTG machine */ /* indicate new connection to OTG machine */
switch (pThis->xceiv.state) { switch (musb->xceiv.state) {
case OTG_STATE_B_WAIT_ACON: case OTG_STATE_B_WAIT_ACON:
DBG(1, "HNP: Waiting to switch to b_host state\n"); DBG(1, "HNP: Waiting to switch to b_host state\n");
pThis->xceiv.state = OTG_STATE_B_HOST; musb->xceiv.state = OTG_STATE_B_HOST;
hcd->self.is_b_host = 1; hcd->self.is_b_host = 1;
break; break;
default: default:
if ((devctl & MGC_M_DEVCTL_VBUS) if ((devctl & MGC_M_DEVCTL_VBUS)
== (3 << MGC_S_DEVCTL_VBUS)) { == (3 << MGC_S_DEVCTL_VBUS)) {
pThis->xceiv.state = OTG_STATE_A_HOST; musb->xceiv.state = OTG_STATE_A_HOST;
hcd->self.is_b_host = 0; hcd->self.is_b_host = 0;
} }
break; break;
} }
DBG(1, "CONNECT (%s) devctl %02x\n", DBG(1, "CONNECT (%s) devctl %02x\n",
otg_state_string(pThis), devctl); otg_state_string(musb), devctl);
} }
#endif /* CONFIG_USB_MUSB_HDRC_HCD */ #endif /* CONFIG_USB_MUSB_HDRC_HCD */
...@@ -621,8 +621,8 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB, ...@@ -621,8 +621,8 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB,
} else { } else {
DBG(1, "BUS RESET\n"); DBG(1, "BUS RESET\n");
musb_g_reset(pThis); musb_g_reset(musb);
schedule_work(&pThis->irq_work); schedule_work(&musb->irq_work);
} }
handled = IRQ_HANDLED; handled = IRQ_HANDLED;
...@@ -637,12 +637,12 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB, ...@@ -637,12 +637,12 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB,
* paramount importance, it seems OK to check them individually; * paramount importance, it seems OK to check them individually;
* the order of the tests is specified in the manual * the order of the tests is specified in the manual
* *
* @param pThis instance pointer * @param musb instance pointer
* @param bIntrUSB register contents * @param bIntrUSB register contents
* @param devctl * @param devctl
* @param power * @param power
*/ */
static irqreturn_t musb_stage2_irq(struct musb * pThis, u8 bIntrUSB, static irqreturn_t musb_stage2_irq(struct musb * musb, u8 bIntrUSB,
u8 devctl, u8 power) u8 devctl, u8 power)
{ {
irqreturn_t handled = IRQ_NONE; irqreturn_t handled = IRQ_NONE;
...@@ -660,7 +660,7 @@ static irqreturn_t musb_stage2_irq(struct musb * pThis, u8 bIntrUSB, ...@@ -660,7 +660,7 @@ static irqreturn_t musb_stage2_irq(struct musb * pThis, u8 bIntrUSB,
* to support ISO transfers yet. * to support ISO transfers yet.
*/ */
if (bIntrUSB & MGC_M_INTR_SOF) { if (bIntrUSB & MGC_M_INTR_SOF) {
void __iomem *pBase = pThis->pRegs; void __iomem *pBase = musb->pRegs;
struct musb_hw_ep *ep; struct musb_hw_ep *ep;
u8 bEnd; u8 bEnd;
u16 wFrame; u16 wFrame;
...@@ -670,9 +670,9 @@ static irqreturn_t musb_stage2_irq(struct musb * pThis, u8 bIntrUSB, ...@@ -670,9 +670,9 @@ static irqreturn_t musb_stage2_irq(struct musb * pThis, u8 bIntrUSB,
/* start any periodic Tx transfers waiting for current frame */ /* start any periodic Tx transfers waiting for current frame */
wFrame = musb_readw(pBase, MGC_O_HDRC_FRAME); wFrame = musb_readw(pBase, MGC_O_HDRC_FRAME);
ep = pThis->aLocalEnd; ep = musb->aLocalEnd;
for (bEnd = 1; (bEnd < pThis->bEndCount) for (bEnd = 1; (bEnd < musb->bEndCount)
&& (pThis->wEndMask >= (1 << bEnd)); && (musb->wEndMask >= (1 << bEnd));
bEnd++, ep++) { bEnd++, ep++) {
// FIXME handle framecounter wraps (12 bits) // FIXME handle framecounter wraps (12 bits)
// eliminate duplicated StartUrb logic // eliminate duplicated StartUrb logic
...@@ -682,86 +682,86 @@ static irqreturn_t musb_stage2_irq(struct musb * pThis, u8 bIntrUSB, ...@@ -682,86 +682,86 @@ static irqreturn_t musb_stage2_irq(struct musb * pThis, u8 bIntrUSB,
ep->tx_channel ? " DMA" : "", ep->tx_channel ? " DMA" : "",
bEnd); bEnd);
if (!ep->tx_channel) if (!ep->tx_channel)
musb_h_tx_start(pThis, bEnd); musb_h_tx_start(musb, bEnd);
else else
cppi_hostdma_start(pThis, bEnd); cppi_hostdma_start(musb, bEnd);
} }
} /* end of for loop */ } /* end of for loop */
} }
#endif #endif
if ((bIntrUSB & MGC_M_INTR_DISCONNECT) && !pThis->bIgnoreDisconnect) { if ((bIntrUSB & MGC_M_INTR_DISCONNECT) && !musb->bIgnoreDisconnect) {
DBG(1, "DISCONNECT (%s) as %s, devctl %02x\n", DBG(1, "DISCONNECT (%s) as %s, devctl %02x\n",
otg_state_string(pThis), otg_state_string(musb),
MUSB_MODE(pThis), devctl); MUSB_MODE(musb), devctl);
handled = IRQ_HANDLED; handled = IRQ_HANDLED;
switch (pThis->xceiv.state) { switch (musb->xceiv.state) {
#ifdef CONFIG_USB_MUSB_HDRC_HCD #ifdef CONFIG_USB_MUSB_HDRC_HCD
case OTG_STATE_A_HOST: case OTG_STATE_A_HOST:
case OTG_STATE_A_SUSPEND: case OTG_STATE_A_SUSPEND:
musb_root_disconnect(pThis); musb_root_disconnect(musb);
if (pThis->a_wait_bcon != 0) if (musb->a_wait_bcon != 0)
musb_platform_try_idle(pThis, jiffies musb_platform_try_idle(musb, jiffies
+ msecs_to_jiffies(pThis->a_wait_bcon)); + msecs_to_jiffies(musb->a_wait_bcon));
break; break;
#endif /* HOST */ #endif /* HOST */
#ifdef CONFIG_USB_MUSB_OTG #ifdef CONFIG_USB_MUSB_OTG
case OTG_STATE_B_HOST: case OTG_STATE_B_HOST:
musb_hnp_stop(pThis); musb_hnp_stop(musb);
break; break;
/* FALLTHROUGH */ /* FALLTHROUGH */
case OTG_STATE_A_PERIPHERAL: case OTG_STATE_A_PERIPHERAL:
musb_root_disconnect(pThis); musb_root_disconnect(musb);
/* FALLTHROUGH */ /* FALLTHROUGH */
case OTG_STATE_B_WAIT_ACON: case OTG_STATE_B_WAIT_ACON:
#endif /* OTG */ #endif /* OTG */
#ifdef CONFIG_USB_GADGET_MUSB_HDRC #ifdef CONFIG_USB_GADGET_MUSB_HDRC
case OTG_STATE_B_PERIPHERAL: case OTG_STATE_B_PERIPHERAL:
musb_g_disconnect(pThis); musb_g_disconnect(musb);
break; break;
#endif /* GADGET */ #endif /* GADGET */
default: default:
WARN("unhandled DISCONNECT transition (%s)\n", WARN("unhandled DISCONNECT transition (%s)\n",
otg_state_string(pThis)); otg_state_string(musb));
break; break;
} }
schedule_work(&pThis->irq_work); schedule_work(&musb->irq_work);
} }
if (bIntrUSB & MGC_M_INTR_SUSPEND) { if (bIntrUSB & MGC_M_INTR_SUSPEND) {
DBG(1, "SUSPEND (%s) devctl %02x power %02x\n", DBG(1, "SUSPEND (%s) devctl %02x power %02x\n",
otg_state_string(pThis), devctl, power); otg_state_string(musb), devctl, power);
handled = IRQ_HANDLED; handled = IRQ_HANDLED;
switch (pThis->xceiv.state) { switch (musb->xceiv.state) {
case OTG_STATE_A_PERIPHERAL: case OTG_STATE_A_PERIPHERAL:
musb_hnp_stop(pThis); musb_hnp_stop(musb);
break; break;
case OTG_STATE_B_PERIPHERAL: case OTG_STATE_B_PERIPHERAL:
musb_g_suspend(pThis); musb_g_suspend(musb);
pThis->is_active = is_otg_enabled(pThis) musb->is_active = is_otg_enabled(musb)
&& pThis->xceiv.gadget->b_hnp_enable; && musb->xceiv.gadget->b_hnp_enable;
if (pThis->is_active) { if (musb->is_active) {
pThis->xceiv.state = OTG_STATE_B_WAIT_ACON; musb->xceiv.state = OTG_STATE_B_WAIT_ACON;
#ifdef CONFIG_USB_MUSB_OTG #ifdef CONFIG_USB_MUSB_OTG
DBG(1, "HNP: Setting timer for b_ase0_brst\n"); DBG(1, "HNP: Setting timer for b_ase0_brst\n");
musb_otg_timer.data = (unsigned long)pThis; musb_otg_timer.data = (unsigned long)musb;
mod_timer(&musb_otg_timer, jiffies mod_timer(&musb_otg_timer, jiffies
+ msecs_to_jiffies(TB_ASE0_BRST)); + msecs_to_jiffies(TB_ASE0_BRST));
#endif #endif
} }
break; break;
case OTG_STATE_A_WAIT_BCON: case OTG_STATE_A_WAIT_BCON:
if (pThis->a_wait_bcon != 0) if (musb->a_wait_bcon != 0)
musb_platform_try_idle(pThis, jiffies musb_platform_try_idle(musb, jiffies
+ msecs_to_jiffies(pThis->a_wait_bcon)); + msecs_to_jiffies(musb->a_wait_bcon));
break; break;
case OTG_STATE_A_HOST: case OTG_STATE_A_HOST:
pThis->xceiv.state = OTG_STATE_A_SUSPEND; musb->xceiv.state = OTG_STATE_A_SUSPEND;
pThis->is_active = is_otg_enabled(pThis) musb->is_active = is_otg_enabled(musb)
&& pThis->xceiv.host->b_hnp_enable; && musb->xceiv.host->b_hnp_enable;
break; break;
case OTG_STATE_B_HOST: case OTG_STATE_B_HOST:
/* Transition to B_PERIPHERAL, see 6.8.2.6 p 44 */ /* Transition to B_PERIPHERAL, see 6.8.2.6 p 44 */
...@@ -769,7 +769,7 @@ static irqreturn_t musb_stage2_irq(struct musb * pThis, u8 bIntrUSB, ...@@ -769,7 +769,7 @@ static irqreturn_t musb_stage2_irq(struct musb * pThis, u8 bIntrUSB,
break; break;
default: default:
/* "should not happen" */ /* "should not happen" */
pThis->is_active = 0; musb->is_active = 0;
break; break;
} }
} }
...@@ -833,9 +833,9 @@ void musb_start(struct musb *musb) ...@@ -833,9 +833,9 @@ void musb_start(struct musb *musb)
} }
static void musb_generic_disable(struct musb *pThis) static void musb_generic_disable(struct musb *musb)
{ {
void __iomem *pBase = pThis->pRegs; void __iomem *pBase = musb->pRegs;
u16 temp; u16 temp;
/* disable interrupts */ /* disable interrupts */
...@@ -1174,7 +1174,7 @@ static int __init ep_config_from_table(struct musb *musb) ...@@ -1174,7 +1174,7 @@ static int __init ep_config_from_table(struct musb *musb)
/* /*
* ep_config_from_hw - when MUSB_C_DYNFIFO_DEF is false * ep_config_from_hw - when MUSB_C_DYNFIFO_DEF is false
* @param pThis the controller * @param musb the controller
*/ */
static int __init ep_config_from_hw(struct musb *musb) static int __init ep_config_from_hw(struct musb *musb)
{ {
...@@ -1243,7 +1243,7 @@ enum { MUSB_CONTROLLER_MHDRC, MUSB_CONTROLLER_HDRC, }; ...@@ -1243,7 +1243,7 @@ enum { MUSB_CONTROLLER_MHDRC, MUSB_CONTROLLER_HDRC, };
/* Initialize MUSB (M)HDRC part of the USB hardware subsystem; /* Initialize MUSB (M)HDRC part of the USB hardware subsystem;
* configure endpoints, or take their config from silicon * configure endpoints, or take their config from silicon
*/ */
static int __init musb_core_init(u16 wType, struct musb *pThis) static int __init musb_core_init(u16 wType, struct musb *musb)
{ {
#ifdef MUSB_AHB_ID #ifdef MUSB_AHB_ID
u32 dwData; u32 dwData;
...@@ -1252,7 +1252,7 @@ static int __init musb_core_init(u16 wType, struct musb *pThis) ...@@ -1252,7 +1252,7 @@ static int __init musb_core_init(u16 wType, struct musb *pThis)
char *type; char *type;
u16 wRelease, wRelMajor, wRelMinor; u16 wRelease, wRelMajor, wRelMinor;
char aInfo[78], aRevision[32], aDate[12]; char aInfo[78], aRevision[32], aDate[12];
void __iomem *pBase = pThis->pRegs; void __iomem *pBase = musb->pRegs;
int status = 0; int status = 0;
int i; int i;
...@@ -1267,7 +1267,7 @@ static int __init musb_core_init(u16 wType, struct musb *pThis) ...@@ -1267,7 +1267,7 @@ static int __init musb_core_init(u16 wType, struct musb *pThis)
if (reg & MGC_M_CONFIGDATA_MPRXE) { if (reg & MGC_M_CONFIGDATA_MPRXE) {
strcat(aInfo, ", bulk combine"); strcat(aInfo, ", bulk combine");
#ifdef C_MP_RX #ifdef C_MP_RX
pThis->bBulkCombine = TRUE; musb->bBulkCombine = TRUE;
#else #else
strcat(aInfo, " (X)"); /* no driver support */ strcat(aInfo, " (X)"); /* no driver support */
#endif #endif
...@@ -1275,7 +1275,7 @@ static int __init musb_core_init(u16 wType, struct musb *pThis) ...@@ -1275,7 +1275,7 @@ static int __init musb_core_init(u16 wType, struct musb *pThis)
if (reg & MGC_M_CONFIGDATA_MPTXE) { if (reg & MGC_M_CONFIGDATA_MPTXE) {
strcat(aInfo, ", bulk split"); strcat(aInfo, ", bulk split");
#ifdef C_MP_TX #ifdef C_MP_TX
pThis->bBulkSplit = TRUE; musb->bBulkSplit = TRUE;
#else #else
strcat(aInfo, " (X)"); /* no driver support */ strcat(aInfo, " (X)"); /* no driver support */
#endif #endif
...@@ -1310,10 +1310,10 @@ static int __init musb_core_init(u16 wType, struct musb *pThis) ...@@ -1310,10 +1310,10 @@ static int __init musb_core_init(u16 wType, struct musb *pThis)
aDate[0] = 0; aDate[0] = 0;
#endif #endif
if (MUSB_CONTROLLER_MHDRC == wType) { if (MUSB_CONTROLLER_MHDRC == wType) {
pThis->bIsMultipoint = 1; musb->bIsMultipoint = 1;
type = "M"; type = "M";
} else { } else {
pThis->bIsMultipoint = 0; musb->bIsMultipoint = 0;
type = ""; type = "";
#ifdef CONFIG_USB_MUSB_HDRC_HCD #ifdef CONFIG_USB_MUSB_HDRC_HCD
#ifndef CONFIG_USB_OTG_BLACKLIST_HUB #ifndef CONFIG_USB_OTG_BLACKLIST_HUB
...@@ -1334,23 +1334,23 @@ static int __init musb_core_init(u16 wType, struct musb *pThis) ...@@ -1334,23 +1334,23 @@ static int __init musb_core_init(u16 wType, struct musb *pThis)
musb_driver_name, type, aRevision, aDate); musb_driver_name, type, aRevision, aDate);
/* configure ep0 */ /* configure ep0 */
pThis->aLocalEnd[0].wMaxPacketSizeTx = MGC_END0_FIFOSIZE; musb->aLocalEnd[0].wMaxPacketSizeTx = MGC_END0_FIFOSIZE;
pThis->aLocalEnd[0].wMaxPacketSizeRx = MGC_END0_FIFOSIZE; musb->aLocalEnd[0].wMaxPacketSizeRx = MGC_END0_FIFOSIZE;
/* discover endpoint configuration */ /* discover endpoint configuration */
pThis->bEndCount = 1; musb->bEndCount = 1;
pThis->wEndMask = 1; musb->wEndMask = 1;
if (reg & MGC_M_CONFIGDATA_DYNFIFO) { if (reg & MGC_M_CONFIGDATA_DYNFIFO) {
if (can_dynfifo()) if (can_dynfifo())
status = ep_config_from_table(pThis); status = ep_config_from_table(musb);
else { else {
ERR("reconfigure software for Dynamic FIFOs\n"); ERR("reconfigure software for Dynamic FIFOs\n");
status = -ENODEV; status = -ENODEV;
} }
} else { } else {
if (!can_dynfifo()) if (!can_dynfifo())
status = ep_config_from_hw(pThis); status = ep_config_from_hw(musb);
else { else {
ERR("reconfigure software for static FIFOs\n"); ERR("reconfigure software for static FIFOs\n");
return -ENODEV; return -ENODEV;
...@@ -1361,15 +1361,15 @@ static int __init musb_core_init(u16 wType, struct musb *pThis) ...@@ -1361,15 +1361,15 @@ static int __init musb_core_init(u16 wType, struct musb *pThis)
return status; return status;
/* finish init, and print endpoint config */ /* finish init, and print endpoint config */
for (i = 0; i < pThis->bEndCount; i++) { for (i = 0; i < musb->bEndCount; i++) {
struct musb_hw_ep *hw_ep = pThis->aLocalEnd + i; struct musb_hw_ep *hw_ep = musb->aLocalEnd + i;
hw_ep->fifo = MUSB_FIFO_OFFSET(i) + pBase; hw_ep->fifo = MUSB_FIFO_OFFSET(i) + pBase;
#ifdef CONFIG_USB_TUSB6010 #ifdef CONFIG_USB_TUSB6010
hw_ep->fifo_async = pThis->async + 0x400 + MUSB_FIFO_OFFSET(i); hw_ep->fifo_async = musb->async + 0x400 + MUSB_FIFO_OFFSET(i);
hw_ep->fifo_sync = pThis->sync + 0x400 + MUSB_FIFO_OFFSET(i); hw_ep->fifo_sync = musb->sync + 0x400 + MUSB_FIFO_OFFSET(i);
hw_ep->fifo_sync_va = hw_ep->fifo_sync_va =
pThis->sync_va + 0x400 + MUSB_FIFO_OFFSET(i); musb->sync_va + 0x400 + MUSB_FIFO_OFFSET(i);
if (i == 0) if (i == 0)
hw_ep->conf = pBase - 0x400 + TUSB_EP0_CONF; hw_ep->conf = pBase - 0x400 + TUSB_EP0_CONF;
...@@ -1842,7 +1842,7 @@ static int __init ...@@ -1842,7 +1842,7 @@ static int __init
musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
{ {
int status; int status;
struct musb *pThis; struct musb *musb;
struct musb_hdrc_platform_data *plat = dev->platform_data; struct musb_hdrc_platform_data *plat = dev->platform_data;
/* The driver might handle more features than the board; OK. /* The driver might handle more features than the board; OK.
...@@ -1877,15 +1877,15 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) ...@@ -1877,15 +1877,15 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
} }
/* allocate */ /* allocate */
pThis = allocate_instance(dev, ctrl); musb = allocate_instance(dev, ctrl);
if (!pThis) if (!musb)
return -ENOMEM; return -ENOMEM;
spin_lock_init(&pThis->Lock); spin_lock_init(&musb->Lock);
pThis->board_mode = plat->mode; musb->board_mode = plat->mode;
pThis->board_set_power = plat->set_power; musb->board_set_power = plat->set_power;
pThis->set_clock = plat->set_clock; musb->set_clock = plat->set_clock;
pThis->min_power = plat->min_power; musb->min_power = plat->min_power;
/* Clock usage is chip-specific ... functional clock (DaVinci, /* Clock usage is chip-specific ... functional clock (DaVinci,
* OMAP2430), or PHY ref (some TUSB6010 boards). All this core * OMAP2430), or PHY ref (some TUSB6010 boards). All this core
...@@ -1893,25 +1893,25 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) ...@@ -1893,25 +1893,25 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
* code manages it during start/stop and suspend/resume. * code manages it during start/stop and suspend/resume.
*/ */
if (plat->clock) { if (plat->clock) {
pThis->clock = clk_get(dev, plat->clock); musb->clock = clk_get(dev, plat->clock);
if (IS_ERR(pThis->clock)) { if (IS_ERR(musb->clock)) {
status = PTR_ERR(pThis->clock); status = PTR_ERR(musb->clock);
pThis->clock = NULL; musb->clock = NULL;
goto fail; goto fail;
} }
} }
/* assume vbus is off */ /* assume vbus is off */
/* platform adjusts pThis->pRegs and pThis->isr if needed, /* platform adjusts musb->pRegs and musb->isr if needed,
* and activates clocks * and activates clocks
*/ */
pThis->isr = generic_interrupt; musb->isr = generic_interrupt;
status = musb_platform_init(pThis); status = musb_platform_init(musb);
if (status < 0) if (status < 0)
goto fail; goto fail;
if (!pThis->isr) { if (!musb->isr) {
status = -ENODEV; status = -ENODEV;
goto fail2; goto fail2;
} }
...@@ -1920,34 +1920,34 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) ...@@ -1920,34 +1920,34 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
if (use_dma && dev->dma_mask) { if (use_dma && dev->dma_mask) {
struct dma_controller *c; struct dma_controller *c;
c = dma_controller_create(pThis, pThis->pRegs); c = dma_controller_create(musb, musb->pRegs);
pThis->pDmaController = c; musb->pDmaController = c;
if (c) if (c)
(void) c->start(c->pPrivateData); (void) c->start(c->pPrivateData);
} }
#endif #endif
/* ideally this would be abstracted in platform setup */ /* ideally this would be abstracted in platform setup */
if (!is_dma_capable() || !pThis->pDmaController) if (!is_dma_capable() || !musb->pDmaController)
dev->dma_mask = NULL; dev->dma_mask = NULL;
/* be sure interrupts are disabled before connecting ISR */ /* be sure interrupts are disabled before connecting ISR */
musb_platform_disable(pThis); musb_platform_disable(musb);
musb_generic_disable(pThis); musb_generic_disable(musb);
/* setup musb parts of the core (especially endpoints) */ /* setup musb parts of the core (especially endpoints) */
status = musb_core_init(plat->multipoint status = musb_core_init(plat->multipoint
? MUSB_CONTROLLER_MHDRC ? MUSB_CONTROLLER_MHDRC
: MUSB_CONTROLLER_HDRC, pThis); : MUSB_CONTROLLER_HDRC, musb);
if (status < 0) if (status < 0)
goto fail2; goto fail2;
/* attach to the IRQ */ /* attach to the IRQ */
if (request_irq (nIrq, pThis->isr, 0, dev->bus_id, pThis)) { if (request_irq (nIrq, musb->isr, 0, dev->bus_id, musb)) {
dev_err(dev, "request_irq %d failed!\n", nIrq); dev_err(dev, "request_irq %d failed!\n", nIrq);
status = -ENODEV; status = -ENODEV;
goto fail2; goto fail2;
} }
pThis->nIrq = nIrq; musb->nIrq = nIrq;
// FIXME this handles wakeup irqs wrong // FIXME this handles wakeup irqs wrong
if (enable_irq_wake(nIrq) == 0) if (enable_irq_wake(nIrq) == 0)
device_init_wakeup(dev, 1); device_init_wakeup(dev, 1);
...@@ -1955,24 +1955,24 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) ...@@ -1955,24 +1955,24 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
pr_info("%s: USB %s mode controller at %p using %s, IRQ %d\n", pr_info("%s: USB %s mode controller at %p using %s, IRQ %d\n",
musb_driver_name, musb_driver_name,
({char *s; ({char *s;
switch (pThis->board_mode) { switch (musb->board_mode) {
case MUSB_HOST: s = "Host"; break; case MUSB_HOST: s = "Host"; break;
case MUSB_PERIPHERAL: s = "Peripheral"; break; case MUSB_PERIPHERAL: s = "Peripheral"; break;
default: s = "OTG"; break; default: s = "OTG"; break;
}; s; }), }; s; }),
ctrl, ctrl,
(is_dma_capable() && pThis->pDmaController) (is_dma_capable() && musb->pDmaController)
? "DMA" : "PIO", ? "DMA" : "PIO",
pThis->nIrq); musb->nIrq);
#ifdef CONFIG_USB_MUSB_HDRC_HCD #ifdef CONFIG_USB_MUSB_HDRC_HCD
/* host side needs more setup, except for no-host modes */ /* host side needs more setup, except for no-host modes */
if (pThis->board_mode != MUSB_PERIPHERAL) { if (musb->board_mode != MUSB_PERIPHERAL) {
struct usb_hcd *hcd = musb_to_hcd(pThis); struct usb_hcd *hcd = musb_to_hcd(musb);
if (pThis->board_mode == MUSB_OTG) if (musb->board_mode == MUSB_OTG)
hcd->self.otg_port = 1; hcd->self.otg_port = 1;
pThis->xceiv.host = &hcd->self; musb->xceiv.host = &hcd->self;
hcd->power_budget = 2 * (plat->power ? : 250); hcd->power_budget = 2 * (plat->power ? : 250);
} }
#endif /* CONFIG_USB_MUSB_HDRC_HCD */ #endif /* CONFIG_USB_MUSB_HDRC_HCD */
...@@ -1981,46 +1981,46 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) ...@@ -1981,46 +1981,46 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
* (We expect the ID pin to be forcibly grounded!!) * (We expect the ID pin to be forcibly grounded!!)
* Otherwise, wait till the gadget driver hooks up. * Otherwise, wait till the gadget driver hooks up.
*/ */
if (!is_otg_enabled(pThis) && is_host_enabled(pThis)) { if (!is_otg_enabled(musb) && is_host_enabled(musb)) {
MUSB_HST_MODE(pThis); MUSB_HST_MODE(musb);
pThis->xceiv.default_a = 1; musb->xceiv.default_a = 1;
pThis->xceiv.state = OTG_STATE_A_IDLE; musb->xceiv.state = OTG_STATE_A_IDLE;
status = usb_add_hcd(musb_to_hcd(pThis), -1, 0); status = usb_add_hcd(musb_to_hcd(musb), -1, 0);
DBG(1, "%s mode, status %d, devctl %02x %c\n", DBG(1, "%s mode, status %d, devctl %02x %c\n",
"HOST", status, "HOST", status,
musb_readb(pThis->pRegs, MGC_O_HDRC_DEVCTL), musb_readb(musb->pRegs, MGC_O_HDRC_DEVCTL),
(musb_readb(pThis->pRegs, MGC_O_HDRC_DEVCTL) (musb_readb(musb->pRegs, MGC_O_HDRC_DEVCTL)
& MGC_M_DEVCTL_BDEVICE & MGC_M_DEVCTL_BDEVICE
? 'B' : 'A')); ? 'B' : 'A'));
} else /* peripheral is enabled */ { } else /* peripheral is enabled */ {
MUSB_DEV_MODE(pThis); MUSB_DEV_MODE(musb);
pThis->xceiv.default_a = 0; musb->xceiv.default_a = 0;
pThis->xceiv.state = OTG_STATE_B_IDLE; musb->xceiv.state = OTG_STATE_B_IDLE;
status = musb_gadget_setup(pThis); status = musb_gadget_setup(musb);
DBG(1, "%s mode, status %d, dev%02x\n", DBG(1, "%s mode, status %d, dev%02x\n",
is_otg_enabled(pThis) ? "OTG" : "PERIPHERAL", is_otg_enabled(musb) ? "OTG" : "PERIPHERAL",
status, status,
musb_readb(pThis->pRegs, MGC_O_HDRC_DEVCTL)); musb_readb(musb->pRegs, MGC_O_HDRC_DEVCTL));
} }
if (status == 0) if (status == 0)
musb_debug_create("driver/musb_hdrc", pThis); musb_debug_create("driver/musb_hdrc", musb);
else { else {
fail: fail:
if (pThis->clock) if (musb->clock)
clk_put(pThis->clock); clk_put(musb->clock);
device_init_wakeup(dev, 0); device_init_wakeup(dev, 0);
musb_free(pThis); musb_free(musb);
return status; return status;
} }
INIT_WORK(&pThis->irq_work, musb_irq_work); INIT_WORK(&musb->irq_work, musb_irq_work);
#ifdef CONFIG_SYSFS #ifdef CONFIG_SYSFS
status = device_create_file(dev, &dev_attr_mode); status = device_create_file(dev, &dev_attr_mode);
...@@ -2035,7 +2035,7 @@ fail: ...@@ -2035,7 +2035,7 @@ fail:
return status; return status;
fail2: fail2:
musb_platform_exit(pThis); musb_platform_exit(musb);
goto fail; goto fail;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment