diff options
| author | barge <sylvain.barge@stericsson.com> | 2011-10-18 14:08:26 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:07:03 +0200 |
| commit | febb8c01c1b0702a3eab3ab41a0369844153e49c (patch) | |
| tree | b2929989cef47e358dc8215894430c11664ef144 | |
| parent | c6458fb663047d93f8b8453eef114d90e324ca39 (diff) | |
ux500: nmf cm: Manage the dma lcla in esram
Manage the dma lcla in esram instead of ddr
Depends-On: I4bc5b72f6d198f26c7b48572cb3843d18c6b8553,
I590751f732021c5f2f4da9b7d51ae5dc10087be7,
If5d86036b8b9ef72863c447f0e400bb4e51b2ab3
ST-Ericsson ID: 364165
ST-Ericsson FOSS-OUT ID: Trivial:
ST-Ericsson Linux next: NA
Change-Id: Ic9ac2971bd9f3bf267e04de37b698ff968033ebc
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34369
Reviewed-by: Sylvain BARGE <sylvain.barge@stericsson.com>
Reviewed-by: Thierry STRUDEL <thierry.strudel@stericsson.com>
Tested-by: Sylvain BARGE <sylvain.barge@stericsson.com>
| -rw-r--r-- | drivers/staging/nmf-cm/cm_dma.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/nmf-cm/cm_dma.c b/drivers/staging/nmf-cm/cm_dma.c index d1c99d6af9a..652b504324c 100644 --- a/drivers/staging/nmf-cm/cm_dma.c +++ b/drivers/staging/nmf-cm/cm_dma.c @@ -94,8 +94,6 @@ int cmdma_setup_relink_area( unsigned int mem_addr, relink[3] = (((dst_addr >> 16) & 0xFFFFUL) << 16 ) | 0x8201UL | ((LOS+1) << 1) | (burst_size<<10); - - (void) dma_map_single(NULL, relink, 16, DMA_TO_DEVICE); } static void cmdma_write_relink_params_per2mem ( @@ -117,8 +115,6 @@ static void cmdma_write_relink_params_per2mem ( relink[3] = (((dst_addr >> 16) & 0xFFFFUL) << 16 ) | 0x1200UL | ((LOS+1) << 1) | (burst_size<<10); - - (void) dma_map_single(NULL, relink, 16, DMA_TO_DEVICE); } static int cmdma_write_cyclic_list_mem2per( @@ -134,7 +130,7 @@ static int cmdma_write_cyclic_list_mem2per( j = LOS; for ( i = 0; i < segments; i++) { - relink = phys_to_virt (cmdma_getlcla() + 1024 * CMDMA_LIDX + 8 * j); + relink = ioremap_nocache (cmdma_getlcla() + 1024 * CMDMA_LIDX + 8 * j, 4 * sizeof(int)); if (i == (segments-1)) j = LOS; @@ -149,6 +145,8 @@ static int cmdma_write_cyclic_list_mem2per( to_addr, 0x2); + iounmap(relink); + from_addr += segmentsize; } @@ -167,7 +165,7 @@ static int cmdma_write_cyclic_list_per2mem( j = LOS; for ( i = 0; i < segments; i++) { - relink = phys_to_virt (cmdma_getlcla() + 1024 * CMDMA_LIDX + 8 * j); + relink = ioremap_nocache (cmdma_getlcla() + 1024 * CMDMA_LIDX + 8 * j, 4 * sizeof(int)); if (i == (segments-1)) j = LOS; @@ -182,6 +180,8 @@ static int cmdma_write_cyclic_list_per2mem( to_addr, 0x2); + iounmap(relink); + to_addr += segmentsize; } |