aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorDavid Brownell <dbrownell@users.sourceforge.net>2008-08-31 18:04:27 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-09-23 13:58:07 -0700
commitc3e3208e4b0cf4ed69cbcaa5e059e5cf64437c9a (patch)
tree7999eda67f38be72a98cbc76841a234aef402ba9 /drivers/usb
parent697e04db5678fadf96d437806b676403ebee806d (diff)
downloadkernel_samsung_crespo-c3e3208e4b0cf4ed69cbcaa5e059e5cf64437c9a.zip
kernel_samsung_crespo-c3e3208e4b0cf4ed69cbcaa5e059e5cf64437c9a.tar.gz
kernel_samsung_crespo-c3e3208e4b0cf4ed69cbcaa5e059e5cf64437c9a.tar.bz2
usb gadget: fix omap_udc DMA regression
This resolves another regression caused by the "use omap_read/write instead of __REG" patch: the hardware address used for DMA to/from the UDC became wrong. Bug noted by Russell King. Reported-by: Russell King <rmk@arm.linux.org.uk> Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Acked-by: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/omap_udc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 574c538..bb54cca 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -787,7 +787,7 @@ static void dma_channel_claim(struct omap_ep *ep, unsigned channel)
omap_set_dma_dest_params(ep->lch,
OMAP_DMA_PORT_TIPB,
OMAP_DMA_AMODE_CONSTANT,
- (unsigned long) io_v2p(UDC_DATA_DMA),
+ UDC_DATA_DMA,
0, 0);
}
} else {
@@ -804,7 +804,7 @@ static void dma_channel_claim(struct omap_ep *ep, unsigned channel)
omap_set_dma_src_params(ep->lch,
OMAP_DMA_PORT_TIPB,
OMAP_DMA_AMODE_CONSTANT,
- (unsigned long) io_v2p(UDC_DATA_DMA),
+ UDC_DATA_DMA,
0, 0);
/* EMIFF or SDRC */
omap_set_dma_dest_burst_mode(ep->lch,