Merge branches 'pm-opp', 'pm-cpufreq' and 'pm-tools'

[pandora-kernel.git] / drivers / dma / fsldma.c

diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index d5d6885..994bcb2 100644 (file)
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -36,7 +36,7 @@
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
-
+#include <linux/fsldma.h>
 #include "dmaengine.h"
 #include "fsldma.h"
 
@@ -367,6 +367,20 @@ static void fsl_chan_toggle_ext_start(struct fsldma_chan *chan, int enable)
                chan->feature &= ~FSL_DMA_CHAN_START_EXT;
 }
 
+int fsl_dma_external_start(struct dma_chan *dchan, int enable)
+{
+       struct fsldma_chan *chan;
+
+       if (!dchan)
+               return -EINVAL;
+
+       chan = to_fsl_chan(dchan);
+
+       fsl_chan_toggle_ext_start(chan, enable);
+       return 0;
+}
+EXPORT_SYMBOL_GPL(fsl_dma_external_start);
+
 static void append_ld_queue(struct fsldma_chan *chan, struct fsl_desc_sw *desc)
 {
        struct fsl_desc_sw *tail = to_fsl_desc(chan->ld_pending.prev);
@@ -998,15 +1012,6 @@ static int fsl_dma_device_control(struct dma_chan *dchan,
                chan->set_request_count(chan, size);
                return 0;
 
-       case FSLDMA_EXTERNAL_START:
-
-               /* make sure the channel supports external start */
-               if (!chan->toggle_ext_start)
-                       return -ENXIO;
-
-               chan->toggle_ext_start(chan, arg);
-               return 0;
-
        default:
                return -ENXIO;
        }