musb_hdrc: Trivial compile fixes for gadget after updating kernel

Host fixes to follow.

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 332d39dca181cee35221436693715c26ce49aed6..ea9a8b3b37b108584ae0a58f1e103badd4d68c0e 100644 (file)
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -43,7 +43,7 @@
 #include <linux/clk.h>
 #include <linux/device.h>
 #include <linux/usb/ch9.h>
-#include <linux/usb_gadget.h>
+#include <linux/usb/gadget.h>
 #include <linux/usb.h>
 #include <linux/usb/otg.h>
 #include <linux/usb/musb.h>

diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c
index 0c951fe6ce5fee58572b22a12d8b140117aa871a..a09711f9351f2bdae49f2e67947bc9a4d8f5a071 100644 (file)
--- a/drivers/usb/musb/tusb6010_omap.c
+++ b/drivers/usb/musb/tusb6010_omap.c
@@ -172,12 +172,12 @@ static void tusb_omap_dma_cb(int lch, u16 ch_status, void *data)
                DBG(3, "Using PIO for remaining %lu bytes\n", pio);
                buf = phys_to_virt((u32)chdat->dma_addr) + chdat->transfer_len;
                if (chdat->tx) {
-                       consistent_sync(phys_to_virt((u32)chdat->dma_addr),
+                       dma_cache_maint(phys_to_virt((u32)chdat->dma_addr),
                                        chdat->transfer_len, DMA_TO_DEVICE);
                        musb_write_fifo(hw_ep, pio, buf);
                } else {
                        musb_read_fifo(hw_ep, pio, buf);
-                       consistent_sync(phys_to_virt((u32)chdat->dma_addr),
+                       dma_cache_maint(phys_to_virt((u32)chdat->dma_addr),
                                        chdat->transfer_len, DMA_FROM_DEVICE);
                }
                channel->actual_len += pio;
@@ -303,9 +303,9 @@ static int tusb_omap_dma_program(struct dma_channel *channel, u16 packet_sz,
 
        /* Since we're recycling dma areas, we need to clean or invalidate */
        if (chdat->tx) {
-               consistent_sync(phys_to_virt(dma_addr), len, DMA_TO_DEVICE);
+               dma_cache_maint(phys_to_virt(dma_addr), len, DMA_TO_DEVICE);
        } else
-               consistent_sync(phys_to_virt(dma_addr), len, DMA_FROM_DEVICE);
+               dma_cache_maint(phys_to_virt(dma_addr), len, DMA_FROM_DEVICE);
 
        /* Use 16-bit transfer if dma_addr is not 32-bit aligned */
        if ((dma_addr & 0x3) == 0) {