diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-04-30 18:19:28 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-04-30 18:19:28 +0200 |
| commit | 0a6deb3251a68b5be640ab1b848ca67e906b75ce (patch) | |
| tree | 8bf3b48fdf66cad167186110fb6ab4f79a335a57 /drivers/usb/gadget/s3c_udc_otg.c | |
| parent | e0f6a4e8b17afead8add6e528936a505367c091c (diff) | |
| parent | 6777a3cf73f621892afe938983918d2aea7730b5 (diff) | |
| download | olio-uboot-2014.01-0a6deb3251a68b5be640ab1b848ca67e906b75ce.tar.xz olio-uboot-2014.01-0a6deb3251a68b5be640ab1b848ca67e906b75ce.zip | |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
lin_gadget: use common linux/compat.h
linux/compat.h: rename from linux/mtd/compat.h
lin_gadget: use common mdelay
gunzip: rename z{alloc, free} to gz{alloc, free}
fs/fat: align disk buffers on cache line to enable DMA and cache
part_dos: align disk buffers on cache line to enable DMA and cache
Diffstat (limited to 'drivers/usb/gadget/s3c_udc_otg.c')
| -rw-r--r-- | drivers/usb/gadget/s3c_udc_otg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/gadget/s3c_udc_otg.c b/drivers/usb/gadget/s3c_udc_otg.c index 1050a98b6..9d11aea8e 100644 --- a/drivers/usb/gadget/s3c_udc_otg.c +++ b/drivers/usb/gadget/s3c_udc_otg.c @@ -671,7 +671,7 @@ static struct usb_request *s3c_alloc_request(struct usb_ep *ep, debug("%s: %s %p\n", __func__, ep->name, ep); - req = kmalloc(sizeof *req, gfp_flags); + req = memalign(CONFIG_SYS_CACHELINE_SIZE, sizeof(*req)); if (!req) return 0; @@ -865,7 +865,8 @@ int s3c_udc_probe(struct s3c_plat_otg_data *pdata) the_controller = dev; for (i = 0; i < S3C_MAX_ENDPOINTS+1; i++) { - dev->dma_buf[i] = kmalloc(DMA_BUFFER_SIZE, GFP_KERNEL); + dev->dma_buf[i] = memalign(CONFIG_SYS_CACHELINE_SIZE, + DMA_BUFFER_SIZE); dev->dma_addr[i] = (dma_addr_t) dev->dma_buf[i]; invalidate_dcache_range((unsigned long) dev->dma_buf[i], (unsigned long) (dev->dma_buf[i] |