MX28: DMA: Prolong the DMA timeout

[karo-tx-uboot.git] / drivers / dma / MCD_dmaApi.c

diff --git a/drivers/dma/MCD_dmaApi.c b/drivers/dma/MCD_dmaApi.c
index b0062b77329618ad3401240d41321cc102891fd0..0dd38168f337b58fa01a4a734c8e5cde263b4b8a 100644 (file)
--- a/drivers/dma/MCD_dmaApi.c
+++ b/drivers/dma/MCD_dmaApi.c
@@ -24,8 +24,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_FSLDMAFEC
-
 #include <MCD_dma.h>
 #include <MCD_tasksInit.h>
 #include <MCD_progCheck.h>
@@ -488,7 +486,8 @@ int MCD_startDma(int channel, s8 * srcAddr, s16 srcIncr, s8 * destAddr,
                    MCD_modelTaskTable[TASK_FECTX].TDTstart;
                MCD_taskTable[channel].TDTend =
                    MCD_modelTaskTable[TASK_FECTX].TDTend;
-               MCD_startDmaENetXmit(srcAddr, srcAddr, destAddr, MCD_taskTable,
+               MCD_startDmaENetXmit((char *)srcAddr, (char *)srcAddr,
+                                    (char *)destAddr, MCD_taskTable,
                                     channel);
        } else if (flags & MCD_FECRX_DMA) {
                /* TDTStart and TDTEnd */
@@ -496,7 +495,8 @@ int MCD_startDma(int channel, s8 * srcAddr, s16 srcIncr, s8 * destAddr,
                    MCD_modelTaskTable[TASK_FECRX].TDTstart;
                MCD_taskTable[channel].TDTend =
                    MCD_modelTaskTable[TASK_FECRX].TDTend;
-               MCD_startDmaENetRcv(srcAddr, srcAddr, destAddr, MCD_taskTable,
+               MCD_startDmaENetRcv((char *)srcAddr, (char *)srcAddr,
+                                   (char *)destAddr, MCD_taskTable,
                                    channel);
        } else if (flags & MCD_SINGLE_DMA) {
                /* this buffer descriptor is used for storing off initial
@@ -534,8 +534,9 @@ int MCD_startDma(int channel, s8 * srcAddr, s16 srcIncr, s8 * destAddr,
                            MCD_modelTaskTable[TASK_SINGLENOEU].TDTstart;
                        MCD_taskTable[channel].TDTend =
                            MCD_modelTaskTable[TASK_SINGLENOEU].TDTend;
-                       MCD_startDmaSingleNoEu(srcAddr, srcIncr, destAddr,
-                                              destIncr, dmaSize, xferSizeIncr,
+                       MCD_startDmaSingleNoEu((char *)srcAddr, srcIncr,
+                                              (char *)destAddr, destIncr,
+                                              (int)dmaSize, xferSizeIncr,
                                               flags, (int *)
                                               &(MCD_relocBuffDesc[channel]),
                                               cSave, MCD_taskTable, channel);
@@ -545,8 +546,9 @@ int MCD_startDma(int channel, s8 * srcAddr, s16 srcIncr, s8 * destAddr,
                            MCD_modelTaskTable[TASK_SINGLEEU].TDTstart;
                        MCD_taskTable[channel].TDTend =
                            MCD_modelTaskTable[TASK_SINGLEEU].TDTend;
-                       MCD_startDmaSingleEu(srcAddr, srcIncr, destAddr,
-                                            destIncr, dmaSize, xferSizeIncr,
+                       MCD_startDmaSingleEu((char *)srcAddr, srcIncr,
+                                            (char *)destAddr, destIncr,
+                                            (int)dmaSize, xferSizeIncr,
                                             flags, (int *)
                                             &(MCD_relocBuffDesc[channel]),
                                             cSave, MCD_taskTable, channel);
@@ -1023,4 +1025,3 @@ static void MCD_memcpy(int *dest, int *src, u32 size)
        for (i = 0; i < size; i += sizeof(int), dest++, src++)
                *dest = *src;
 }
-#endif                         /* CONFIG_FSLDMAFEC */