1 files changed, 16 insertions, 5 deletions

diff --git a/arch/mips/txx9/generic/setup_tx4938.c b/arch/mips/txx9/generic/setup_tx4938.c
index 3925219b897..b2b85293cd4 100644
--- a/arch/mips/txx9/generic/setup_tx4938.c
+++ b/arch/mips/txx9/generic/setup_tx4938.c
@@ -24,6 +24,7 @@
 #include <asm/txx9pio.h>
 #include <asm/txx9/generic.h>
 #include <asm/txx9/ndfmc.h>
+#include <asm/txx9/dmac.h>
 #include <asm/txx9/tx4938.h>
 
 static void __init tx4938_wdr_init(void)
@@ -239,11 +240,6 @@ void __init tx4938_setup(void)
         for (i = 0; i < TX4938_NR_TMR; i++)
                 txx9_tmr_init(TX4938_TMR_REG(i) & 0xfffffffffULL);
 
-        /* DMA */
-        for (i = 0; i < 2; i++)
-                ____raw_writeq(TX4938_DMA_MCR_MSTEN,
-                               (void __iomem *)(TX4938_DMA_REG(i) + 0x50));
-
         /* PIO */
         txx9_gpio_init(TX4938_PIO_REG & 0xfffffffffULL, 0, TX4938_NUM_PIO);
         __raw_writel(0, &tx4938_pioptr->maskcpu);
@@ -403,6 +399,21 @@ void __init tx4938_ndfmc_init(unsigned int hold, unsigned int spw)
                 txx9_ndfmc_init(baseaddr, &plat_data);
 }
 
+void __init tx4938_dmac_init(int memcpy_chan0, int memcpy_chan1)
+{
+        struct txx9dmac_platform_data plat_data = {
+                .have_64bit_regs = true,
+        };
+        int i;
+
+        for (i = 0; i < 2; i++) {
+                plat_data.memcpy_chan = i ? memcpy_chan1 : memcpy_chan0;
+                txx9_dmac_init(i, TX4938_DMA_REG(i) & 0xfffffffffULL,
+                               TXX9_IRQ_BASE + TX4938_IR_DMA(i, 0),
+                               &plat_data);
+        }
+}
+
 static void __init tx4938_stop_unused_modules(void)
 {
         __u64 pcfg, rst = 0, ckd = 0;