usb: musb: musb_host: Enable ISOCH IN handling for AM335x host
authorGeorge Cherian <george.cherian@ti.com>
Mon, 27 Jan 2014 09:37:24 +0000 (15:07 +0530)
committerFelipe Balbi <balbi@ti.com>
Tue, 18 Feb 2014 15:25:55 +0000 (09:25 -0600)
Enable the isochrounous IN handling for AM335x HOST.
Reprogram CPPI to receive consecutive ISOCH frames in the same URB.

Signed-off-by: George Cherian <george.cherian@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/musb/musb_host.c

index ed45572..79b7510 100644 (file)
@@ -1691,7 +1691,8 @@ void musb_host_rx(struct musb *musb, u8 epnum)
                        | MUSB_RXCSR_RXPKTRDY);
                musb_writew(hw_ep->regs, MUSB_RXCSR, val);
 
-#if defined(CONFIG_USB_INVENTRA_DMA) || defined(CONFIG_USB_UX500_DMA)
+#if defined(CONFIG_USB_INVENTRA_DMA) || defined(CONFIG_USB_UX500_DMA) || \
+       defined(CONFIG_USB_TI_CPPI41_DMA)
                if (usb_pipeisoc(pipe)) {
                        struct usb_iso_packet_descriptor *d;
 
@@ -1704,10 +1705,30 @@ void musb_host_rx(struct musb *musb, u8 epnum)
                        if (d->status != -EILSEQ && d->status != -EOVERFLOW)
                                d->status = 0;
 
-                       if (++qh->iso_idx >= urb->number_of_packets)
+                       if (++qh->iso_idx >= urb->number_of_packets) {
                                done = true;
-                       else
+                       } else {
+#if defined(CONFIG_USB_TI_CPPI41_DMA)
+                               struct dma_controller   *c;
+                               dma_addr_t *buf;
+                               u32 length, ret;
+
+                               c = musb->dma_controller;
+                               buf = (void *)
+                                       urb->iso_frame_desc[qh->iso_idx].offset
+                                       + (u32)urb->transfer_dma;
+
+                               length =
+                                       urb->iso_frame_desc[qh->iso_idx].length;
+
+                               val |= MUSB_RXCSR_DMAENAB;
+                               musb_writew(hw_ep->regs, MUSB_RXCSR, val);
+
+                               ret = c->channel_program(dma, qh->maxpacket,
+                                               0, (u32) buf, length);
+#endif
                                done = false;
+                       }
 
                } else  {
                /* done if urb buffer is full or short packet is recd */
@@ -1747,7 +1768,8 @@ void musb_host_rx(struct musb *musb, u8 epnum)
                }
 
                /* we are expecting IN packets */
-#if defined(CONFIG_USB_INVENTRA_DMA) || defined(CONFIG_USB_UX500_DMA)
+#if defined(CONFIG_USB_INVENTRA_DMA) || defined(CONFIG_USB_UX500_DMA) || \
+       defined(CONFIG_USB_TI_CPPI41_DMA)
                if (dma) {
                        struct dma_controller   *c;
                        u16                     rx_count;