summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThirupathi Chippakurthy <thirupathi.chippakurthy@stericsson.com>2011-09-13 13:58:25 +0530
committerUlf Hansson <ulf.hansson@stericsson.com>2011-09-19 16:07:33 +0200
commit31759bb9011a79603280afd195ee1e48083ff94e (patch)
treec9b8b7371c4ed607777cc3df6338b0e84912194c
parent366c6d0c0f2f8d1e65212d22dab4a312e92b20dd (diff)
usb:musb:ux500:set dma config for both src and dst
The dma driver requires both src and dst to be set. This fix is needed in order to run gadget mass storage. Patch is verified on snowball. ST-Ericsson ID: 352334 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I28001a4f5d00fff71d8d39b3cb7144affedb2766 Signed-off-by:<thirupathi.chippakurthy@stericsson.com> Signed-off-by:<Per Forlin <per.forlin@...> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30772 Reviewed-by: Praveena NADAHALLY <praveen.nadahally@stericsson.com>
-rw-r--r--drivers/usb/musb/ux500_dma.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c
index 90a26263efd..1e2fe3198f1 100644
--- a/drivers/usb/musb/ux500_dma.c
+++ b/drivers/usb/musb/ux500_dma.c
@@ -163,15 +163,14 @@ static bool ux500_configure_channel(struct dma_channel *channel,
DMA_SLAVE_BUSWIDTH_4_BYTES;
slave_conf.direction = direction;
- if (direction == DMA_FROM_DEVICE) {
- slave_conf.src_addr = usb_fifo_addr;
- slave_conf.src_addr_width = addr_width;
- slave_conf.src_maxburst = 16;
- } else {
- slave_conf.dst_addr = usb_fifo_addr;
- slave_conf.dst_addr_width = addr_width;
- slave_conf.dst_maxburst = 16;
- }
+
+ slave_conf.src_addr = usb_fifo_addr;
+ slave_conf.src_addr_width = addr_width;
+ slave_conf.src_maxburst = 16;
+ slave_conf.dst_addr = usb_fifo_addr;
+ slave_conf.dst_addr_width = addr_width;
+ slave_conf.dst_maxburst = 16;
+
dma_chan->device->device_control(dma_chan, DMA_SLAVE_CONFIG,
(unsigned long) &slave_conf);