Commit e4e8e37f authored by Andrzej Zaborowski's avatar Andrzej Zaborowski Committed by Tony Lindgren

MUSB: misc clean-up.

Correct the interrupt mask in TUSB6010 and other nit-picking from my tree.
Signed-off-by: default avatarAndrzej Zaborowski <balrog@zabor.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent a301a3ae
...@@ -1203,7 +1203,7 @@ void musb_host_tx(struct musb *musb, u8 epnum) ...@@ -1203,7 +1203,7 @@ void musb_host_tx(struct musb *musb, u8 epnum)
* we have a candidate... NAKing is *NOT* an error * we have a candidate... NAKing is *NOT* an error
*/ */
musb_ep_select(mbase, epnum); musb_ep_select(mbase, epnum);
musb_writew(epio, MUSB_CSR0, musb_writew(epio, MUSB_TXCSR,
MUSB_TXCSR_H_WZC_BITS MUSB_TXCSR_H_WZC_BITS
| MUSB_TXCSR_TXPKTRDY); | MUSB_TXCSR_TXPKTRDY);
goto finish; goto finish;
......
...@@ -453,7 +453,7 @@ dump_end_info(struct musb *musb, u8 epnum, char *aBuffer, unsigned max) ...@@ -453,7 +453,7 @@ dump_end_info(struct musb *musb, u8 epnum, char *aBuffer, unsigned max)
/* Dump the current status and compile options. /* Dump the current status and compile options.
* @param musb 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 to hold the
* result otherwise "BAD THINGS HAPPENS(TM)". * result otherwise "BAD THINGS HAPPENS(TM)".
*/ */
static int dump_header_stats(struct musb *musb, char *buffer) static int dump_header_stats(struct musb *musb, char *buffer)
......
...@@ -740,7 +740,7 @@ tusb_otg_ints(struct musb *musb, u32 int_src, void __iomem *tbase) ...@@ -740,7 +740,7 @@ tusb_otg_ints(struct musb *musb, u32 int_src, void __iomem *tbase)
break; break;
case OTG_STATE_A_WAIT_VFALL: case OTG_STATE_A_WAIT_VFALL:
/* REVISIT this irq triggers during short /* REVISIT this irq triggers during short
* spikes causet by enumeration ... * spikes caused by enumeration ...
*/ */
if (musb->vbuserr_retry) { if (musb->vbuserr_retry) {
musb->vbuserr_retry--; musb->vbuserr_retry--;
...@@ -888,7 +888,7 @@ static irqreturn_t tusb_interrupt(int irq, void *__hci) ...@@ -888,7 +888,7 @@ static irqreturn_t tusb_interrupt(int irq, void *__hci)
musb_writel(tbase, TUSB_DMA_INT_CLEAR, dma_src); musb_writel(tbase, TUSB_DMA_INT_CLEAR, dma_src);
} }
/* EP interrupts. In OCP mode tusb6010 mirrors the MUSB * interrupts */ /* EP interrupts. In OCP mode tusb6010 mirrors the MUSB interrupts */
if (int_src & (TUSB_INT_SRC_USB_IP_TX | TUSB_INT_SRC_USB_IP_RX)) { if (int_src & (TUSB_INT_SRC_USB_IP_TX | TUSB_INT_SRC_USB_IP_RX)) {
u32 musb_src = musb_readl(tbase, TUSB_USBIP_INT_SRC); u32 musb_src = musb_readl(tbase, TUSB_USBIP_INT_SRC);
...@@ -972,7 +972,7 @@ void musb_platform_disable(struct musb *musb) ...@@ -972,7 +972,7 @@ void musb_platform_disable(struct musb *musb)
/* disable all IRQs */ /* disable all IRQs */
musb_writel(tbase, TUSB_INT_MASK, ~TUSB_INT_MASK_RESERVED_BITS); musb_writel(tbase, TUSB_INT_MASK, ~TUSB_INT_MASK_RESERVED_BITS);
musb_writel(tbase, TUSB_USBIP_INT_MASK, 0); musb_writel(tbase, TUSB_USBIP_INT_MASK, 0x7fffffff);
musb_writel(tbase, TUSB_DMA_INT_MASK, 0x7fffffff); musb_writel(tbase, TUSB_DMA_INT_MASK, 0x7fffffff);
musb_writel(tbase, TUSB_GPIO_INT_MASK, 0x1ff); musb_writel(tbase, TUSB_GPIO_INT_MASK, 0x1ff);
......
...@@ -188,7 +188,7 @@ static void tusb_omap_dma_cb(int lch, u16 ch_status, void *data) ...@@ -188,7 +188,7 @@ static void tusb_omap_dma_cb(int lch, u16 ch_status, void *data)
channel->status = MUSB_DMA_STATUS_FREE; channel->status = MUSB_DMA_STATUS_FREE;
/* Handle only RX callbacks here. TX callbacks musb be handled based /* Handle only RX callbacks here. TX callbacks must be handled based
* on the TUSB DMA status interrupt. * on the TUSB DMA status interrupt.
* REVISIT: Use both TUSB DMA status interrupt and OMAP DMA callback * REVISIT: Use both TUSB DMA status interrupt and OMAP DMA callback
* interrupt for RX and TX. * interrupt for RX and TX.
......
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