diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-04-09 14:00:43 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-05-03 15:02:03 +0200 |
| commit | ea343ab9e8b5cf653baf55d8c8bab070580d2781 (patch) | |
| tree | 793dab4abf2d7e3d9e03d2e26bf9ad0c32da0887 /drivers | |
| parent | 51b4009f3cb7fe2b65205552f4062978b3fda623 (diff) | |
| download | barebox-ea343ab9e8b5cf653baf55d8c8bab070580d2781.tar.gz barebox-ea343ab9e8b5cf653baf55d8c8bab070580d2781.tar.xz | |
fsl_udc: make it work with MMU on
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/gadget/fsl_udc.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/usb/gadget/fsl_udc.c b/drivers/usb/gadget/fsl_udc.c index 95f3bdd4f3..119afcb6c5 100644 --- a/drivers/usb/gadget/fsl_udc.c +++ b/drivers/usb/gadget/fsl_udc.c @@ -560,7 +560,7 @@ static void done(struct fsl_ep *ep, struct fsl_req *req, int status) if (j != req->dtd_count - 1) { next_td = curr_td->next_td_virt; } - free(curr_td); + dma_free_coherent(curr_td); } dma_inv_range(req->req.buf, req->req.buf + req->req.length); @@ -1112,11 +1112,11 @@ static struct ep_td_struct *fsl_build_dtd(struct fsl_req *req, unsigned *length, *length = min(req->req.length - req->req.actual, (unsigned)EP_MAX_LENGTH_TRANSFER); - dtd = memalign(32, sizeof(struct ep_td_struct)); + dtd = dma_alloc_coherent(sizeof(struct ep_td_struct)); if (dtd == NULL) return dtd; - *dma = (dma_addr_t)dtd; + *dma = (dma_addr_t)virt_to_phys(dtd); dtd->td_dma = *dma; /* Clear reserved field */ swap_temp = cpu_to_le32(dtd->size_ioc_sts); @@ -2078,13 +2078,14 @@ static int struct_udc_setup(struct fsl_udc *udc, size += QH_ALIGNMENT + 1; size &= ~(QH_ALIGNMENT - 1); } - udc->ep_qh = memalign(2048, size); + + udc->ep_qh = dma_alloc_coherent(size); if (!udc->ep_qh) { ERR("malloc QHs for udc failed\n"); kfree(udc->eps); return -1; } - udc->ep_qh_dma = (dma_addr_t)udc->ep_qh; + udc->ep_qh_dma = (dma_addr_t)virt_to_phys(udc->ep_qh); udc->ep_qh_size = size; |