1 files changed, 14 insertions, 8 deletions

diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c
index 5afa070d7dc..c061a88f2b0 100644
--- a/drivers/usb/musb/tusb6010_omap.c
+++ b/drivers/usb/musb/tusb6010_omap.c
@@ -39,7 +39,7 @@ struct tusb_omap_dma_ch {
 
         struct tusb_omap_dma    *tusb_dma;
 
-        void __iomem            *dma_addr;
+        dma_addr_t              dma_addr;
 
         u32                     len;
         u16                     packet_sz;
@@ -126,6 +126,7 @@ static void tusb_omap_dma_cb(int lch, u16 ch_status, void *data)
         struct tusb_omap_dma_ch *chdat = to_chdat(channel);
         struct tusb_omap_dma    *tusb_dma = chdat->tusb_dma;
         struct musb             *musb = chdat->musb;
+        struct device           *dev = musb->controller;
         struct musb_hw_ep       *hw_ep = chdat->hw_ep;
         void __iomem            *ep_conf = hw_ep->conf;
         void __iomem            *mbase = musb->mregs;
@@ -173,13 +174,15 @@ 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) {
-                        dma_cache_maint(phys_to_virt((u32)chdat->dma_addr),
-                                        chdat->transfer_len, DMA_TO_DEVICE);
+                        dma_unmap_single(dev, chdat->dma_addr,
+                                                chdat->transfer_len,
+                                                DMA_TO_DEVICE);
                         musb_write_fifo(hw_ep, pio, buf);
                 } else {
+                        dma_unmap_single(dev, chdat->dma_addr,
+                                                chdat->transfer_len,
+                                                DMA_FROM_DEVICE);
                         musb_read_fifo(hw_ep, pio, buf);
-                        dma_cache_maint(phys_to_virt((u32)chdat->dma_addr),
-                                        chdat->transfer_len, DMA_FROM_DEVICE);
                 }
                 channel->actual_len += pio;
         }
@@ -224,6 +227,7 @@ static int tusb_omap_dma_program(struct dma_channel *channel, u16 packet_sz,
         struct tusb_omap_dma_ch         *chdat = to_chdat(channel);
         struct tusb_omap_dma            *tusb_dma = chdat->tusb_dma;
         struct musb                     *musb = chdat->musb;
+        struct device                   *dev = musb->controller;
         struct musb_hw_ep               *hw_ep = chdat->hw_ep;
         void __iomem                    *mbase = musb->mregs;
         void __iomem                    *ep_conf = hw_ep->conf;
@@ -299,14 +303,16 @@ static int tusb_omap_dma_program(struct dma_channel *channel, u16 packet_sz,
         chdat->packet_sz = packet_sz;
         chdat->len = len;
         channel->actual_len = 0;
-        chdat->dma_addr = (void __iomem *)dma_addr;
+        chdat->dma_addr = dma_addr;
         channel->status = MUSB_DMA_STATUS_BUSY;
 
         /* Since we're recycling dma areas, we need to clean or invalidate */
         if (chdat->tx)
-                dma_cache_maint(phys_to_virt(dma_addr), len, DMA_TO_DEVICE);
+                dma_map_single(dev, phys_to_virt(dma_addr), len,
+                                DMA_TO_DEVICE);
         else
-                dma_cache_maint(phys_to_virt(dma_addr), len, DMA_FROM_DEVICE);
+                dma_map_single(dev, 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) {