From c4aeae3e38d6d1f46aff2e753d4ba6fc308e1b53 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Wed, 31 Oct 2007 02:05:21 -0700 Subject: [PATCH] musb_hdrc: Trivial compile fixes for gadget after updating kernel Host fixes to follow. Signed-off-by: Tony Lindgren --- drivers/usb/musb/musb_core.h | 2 +- drivers/usb/musb/tusb6010_omap.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h index 332d39dca18..ea9a8b3b37b 100644 --- a/drivers/usb/musb/musb_core.h +++ b/drivers/usb/musb/musb_core.h @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c index 0c951fe6ce5..a09711f9351 100644 --- 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) { -- 2.41.1