Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[pandora-kernel.git] / arch / mips / txx9 / generic / setup_tx4927.c

diff --git a/arch/mips/txx9/generic/setup_tx4927.c b/arch/mips/txx9/generic/setup_tx4927.c
index 1093549..3418b2a 100644 (file)
--- a/arch/mips/txx9/generic/setup_tx4927.c
+++ b/arch/mips/txx9/generic/setup_tx4927.c
@@ -22,6 +22,7 @@
 #include <asm/txx9tmr.h>
 #include <asm/txx9pio.h>
 #include <asm/txx9/generic.h>
+#include <asm/txx9/dmac.h>
 #include <asm/txx9/tx4927.h>
 
 static void __init tx4927_wdr_init(void)
@@ -253,6 +254,60 @@ void __init tx4927_mtd_init(int ch)
        txx9_physmap_flash_init(ch, start, size, &pdata);
 }
 
+void __init tx4927_dmac_init(int memcpy_chan)
+{
+       struct txx9dmac_platform_data plat_data = {
+               .memcpy_chan = memcpy_chan,
+               .have_64bit_regs = true,
+       };
+
+       txx9_dmac_init(0, TX4927_DMA_REG & 0xfffffffffULL,
+                      TXX9_IRQ_BASE + TX4927_IR_DMA(0), &plat_data);
+}
+
+void __init tx4927_aclc_init(unsigned int dma_chan_out,
+                            unsigned int dma_chan_in)
+{
+       u64 pcfg = __raw_readq(&tx4927_ccfgptr->pcfg);
+       __u64 dmasel_mask = 0, dmasel = 0;
+       unsigned long flags;
+
+       if (!(pcfg & TX4927_PCFG_SEL2))
+               return;
+       /* setup DMASEL (playback:ACLC ch0, capture:ACLC ch1) */
+       switch (dma_chan_out) {
+       case 0:
+               dmasel_mask |= TX4927_PCFG_DMASEL0_MASK;
+               dmasel |= TX4927_PCFG_DMASEL0_ACL0;
+               break;
+       case 2:
+               dmasel_mask |= TX4927_PCFG_DMASEL2_MASK;
+               dmasel |= TX4927_PCFG_DMASEL2_ACL0;
+               break;
+       default:
+               return;
+       }
+       switch (dma_chan_in) {
+       case 1:
+               dmasel_mask |= TX4927_PCFG_DMASEL1_MASK;
+               dmasel |= TX4927_PCFG_DMASEL1_ACL1;
+               break;
+       case 3:
+               dmasel_mask |= TX4927_PCFG_DMASEL3_MASK;
+               dmasel |= TX4927_PCFG_DMASEL3_ACL1;
+               break;
+       default:
+               return;
+       }
+       local_irq_save(flags);
+       txx9_clear64(&tx4927_ccfgptr->pcfg, dmasel_mask);
+       txx9_set64(&tx4927_ccfgptr->pcfg, dmasel);
+       local_irq_restore(flags);
+       txx9_aclc_init(TX4927_ACLC_REG & 0xfffffffffULL,
+                      TXX9_IRQ_BASE + TX4927_IR_ACLC,
+                      0, dma_chan_out, dma_chan_in);
+}
+
 static void __init tx4927_stop_unused_modules(void)
 {
        __u64 pcfg, rst = 0, ckd = 0;