These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / usb / musb / davinci.c

diff --git a/kernel/drivers/usb/musb/davinci.c b/kernel/drivers/usb/musb/davinci.c
index 3c1d9b2..cee61a5 100644 (file)
--- a/kernel/drivers/usb/musb/davinci.c
+++ b/kernel/drivers/usb/musb/davinci.c
@@ -284,7 +284,7 @@ static irqreturn_t davinci_musb_interrupt(int irq, void *__hci)
         * mask, state, "vector", and EOI registers.
         */
        cppi = container_of(musb->dma_controller, struct cppi, controller);
-       if (is_cppi_enabled() && musb->dma_controller && !cppi->irq)
+       if (is_cppi_enabled(musb) && musb->dma_controller && !cppi->irq)
                retval = cppi_interrupt(irq, __hci);
 
        /* ack and handle non-CPPI interrupts */
@@ -491,9 +491,14 @@ static int davinci_musb_exit(struct musb *musb)
 }
 
 static const struct musb_platform_ops davinci_ops = {
+       .quirks         = MUSB_DMA_CPPI,
        .init           = davinci_musb_init,
        .exit           = davinci_musb_exit,
 
+#ifdef CONFIG_USB_TI_CPPI_DMA
+       .dma_init       = cppi_dma_controller_create,
+       .dma_exit       = cppi_dma_controller_destroy,
+#endif
        .enable         = davinci_musb_enable,
        .disable        = davinci_musb_disable,