Merge branch 'omap4-i2c-init' into omap-for-linus

[pandora-kernel.git] / arch / arm / kernel / dma.c

diff --git a/arch/arm/kernel/dma.c b/arch/arm/kernel/dma.c
index c31bf00..2c4a185 100644 (file)
--- a/arch/arm/kernel/dma.c
+++ b/arch/arm/kernel/dma.c
@@ -15,6 +15,9 @@
 #include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/errno.h>
+#include <linux/scatterlist.h>
+#include <linux/seq_file.h>
+#include <linux/proc_fs.h>
 
 #include <asm/dma.h>
 
@@ -23,7 +26,28 @@
 DEFINE_SPINLOCK(dma_spin_lock);
 EXPORT_SYMBOL(dma_spin_lock);
 
-static dma_t dma_chan[MAX_DMA_CHANNELS];
+static dma_t *dma_chan[MAX_DMA_CHANNELS];
+
+static inline dma_t *dma_channel(unsigned int chan)
+{
+       if (chan >= MAX_DMA_CHANNELS)
+               return NULL;
+
+       return dma_chan[chan];
+}
+
+int __init isa_dma_add(unsigned int chan, dma_t *dma)
+{
+       if (!dma->d_ops)
+               return -EINVAL;
+
+       sg_init_table(&dma->buf, 1);
+
+       if (dma_chan[chan])
+               return -EBUSY;
+       dma_chan[chan] = dma;
+       return 0;
+}
 
 /*
  * Request DMA channel
@@ -32,10 +56,10 @@ static dma_t dma_chan[MAX_DMA_CHANNELS];
  */
 int request_dma(unsigned int chan, const char *device_id)
 {
-       dma_t *dma = dma_chan + chan;
+       dma_t *dma = dma_channel(chan);
        int ret;
 
-       if (chan >= MAX_DMA_CHANNELS || !dma->d_ops)
+       if (!dma)
                goto bad_dma;
 
        if (xchg(&dma->lock, 1) != 0)
@@ -70,9 +94,9 @@ EXPORT_SYMBOL(request_dma);
  */
 void free_dma(unsigned int chan)
 {
-       dma_t *dma = dma_chan + chan;
+       dma_t *dma = dma_channel(chan);
 
-       if (chan >= MAX_DMA_CHANNELS || !dma->d_ops)
+       if (!dma)
                goto bad_dma;
 
        if (dma->active) {
@@ -99,7 +123,7 @@ EXPORT_SYMBOL(free_dma);
  */
 void set_dma_sg (unsigned int chan, struct scatterlist *sg, int nr_sg)
 {
-       dma_t *dma = dma_chan + chan;
+       dma_t *dma = dma_channel(chan);
 
        if (dma->active)
                printk(KERN_ERR "dma%d: altering DMA SG while "
@@ -117,7 +141,7 @@ EXPORT_SYMBOL(set_dma_sg);
  */
 void __set_dma_addr (unsigned int chan, void *addr)
 {
-       dma_t *dma = dma_chan + chan;
+       dma_t *dma = dma_channel(chan);
 
        if (dma->active)
                printk(KERN_ERR "dma%d: altering DMA address while "
@@ -135,7 +159,7 @@ EXPORT_SYMBOL(__set_dma_addr);
  */
 void set_dma_count (unsigned int chan, unsigned long count)
 {
-       dma_t *dma = dma_chan + chan;
+       dma_t *dma = dma_channel(chan);
 
        if (dma->active)
                printk(KERN_ERR "dma%d: altering DMA count while "
@@ -149,9 +173,9 @@ EXPORT_SYMBOL(set_dma_count);
 
 /* Set DMA direction mode
  */
-void set_dma_mode (unsigned int chan, dmamode_t mode)
+void set_dma_mode (unsigned int chan, unsigned int mode)
 {
-       dma_t *dma = dma_chan + chan;
+       dma_t *dma = dma_channel(chan);
 
        if (dma->active)
                printk(KERN_ERR "dma%d: altering DMA mode while "
@@ -166,7 +190,7 @@ EXPORT_SYMBOL(set_dma_mode);
  */
 void enable_dma (unsigned int chan)
 {
-       dma_t *dma = dma_chan + chan;
+       dma_t *dma = dma_channel(chan);
 
        if (!dma->lock)
                goto free_dma;
@@ -187,7 +211,7 @@ EXPORT_SYMBOL(enable_dma);
  */
 void disable_dma (unsigned int chan)
 {
-       dma_t *dma = dma_chan + chan;
+       dma_t *dma = dma_channel(chan);
 
        if (!dma->lock)
                goto free_dma;
@@ -209,7 +233,8 @@ EXPORT_SYMBOL(disable_dma);
  */
 int dma_channel_active(unsigned int chan)
 {
-       return dma_chan[chan].active;
+       dma_t *dma = dma_channel(chan);
+       return dma->active;
 }
 EXPORT_SYMBOL(dma_channel_active);
 
@@ -221,7 +246,7 @@ EXPORT_SYMBOL(set_dma_page);
 
 void set_dma_speed(unsigned int chan, int cycle_ns)
 {
-       dma_t *dma = dma_chan + chan;
+       dma_t *dma = dma_channel(chan);
        int ret = 0;
 
        if (dma->d_ops->setspeed)
@@ -232,7 +257,7 @@ EXPORT_SYMBOL(set_dma_speed);
 
 int get_dma_residue(unsigned int chan)
 {
-       dma_t *dma = dma_chan + chan;
+       dma_t *dma = dma_channel(chan);
        int ret = 0;
 
        if (dma->d_ops->residue)
@@ -242,10 +267,36 @@ int get_dma_residue(unsigned int chan)
 }
 EXPORT_SYMBOL(get_dma_residue);
 
-static int __init init_dma(void)
+#ifdef CONFIG_PROC_FS
+static int proc_dma_show(struct seq_file *m, void *v)
+{
+       int i;
+
+       for (i = 0 ; i < MAX_DMA_CHANNELS ; i++) {
+               dma_t *dma = dma_channel(i);
+               if (dma && dma->lock)
+                       seq_printf(m, "%2d: %s\n", i, dma->device_id);
+       }
+       return 0;
+}
+
+static int proc_dma_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, proc_dma_show, NULL);
+}
+
+static const struct file_operations proc_dma_operations = {
+       .open           = proc_dma_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = single_release,
+};
+
+static int __init proc_dma_init(void)
 {
-       arch_dma_init(dma_chan);
+       proc_create("dma", 0, NULL, &proc_dma_operations);
        return 0;
 }
 
-core_initcall(init_dma);
+__initcall(proc_dma_init);
+#endif