dma: dw: split driver to library part and platform code

To simplify the driver development let's split driver to library and platform
code parts. It helps us to add PCI driver in future.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
[Fixed compile error and few checkpatch issues]
Signed-off-by: Vinod Koul <vinod.koul@intel.com>

7 files changed, 436 insertions, 279 deletions

diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index ac44ca0d468a..6e2a521fbbe3 100644
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -15,7 +15,7 @@ obj-$(CONFIG_FSL_DMA) += fsldma.o
 obj-$(CONFIG_MPC512X_DMA) += mpc512x_dma.o
 obj-$(CONFIG_PPC_BESTCOMM) += bestcomm/
 obj-$(CONFIG_MV_XOR) += mv_xor.o
-obj-$(CONFIG_DW_DMAC) += dw/
+obj-$(CONFIG_DW_DMAC_CORE) += dw/
 obj-$(CONFIG_AT_HDMAC) += at_hdmac.o
 obj-$(CONFIG_MX3_IPU) += ipu/
 obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o
diff --git a/drivers/dma/dw/Kconfig b/drivers/dma/dw/Kconfig
index 38a215af5ccc..efd9e02a58eb 100644
--- a/drivers/dma/dw/Kconfig
+++ b/drivers/dma/dw/Kconfig
@@ -2,10 +2,14 @@
 # DMA engine configuration for dw
 #
 
-config DW_DMAC
+config DW_DMAC_CORE
         tristate "Synopsys DesignWare AHB DMA support"
         depends on GENERIC_HARDIRQS
         select DMA_ENGINE
+
+config DW_DMAC
+        tristate "Synopsys DesignWare AHB DMA platform driver"
+        select DW_DMAC_CORE
         default y if CPU_AT32AP7000
         help
           Support the Synopsys DesignWare AHB DMA controller. This
@@ -14,7 +18,7 @@ config DW_DMAC
 config DW_DMAC_BIG_ENDIAN_IO
         bool "Use big endian I/O register access"
         default y if AVR32
-        depends on DW_DMAC
+        depends on DW_DMAC_CORE
         help
           Say yes here to use big endian I/O access when reading and writing
           to the DMA controller registers. This is needed on some platforms,
diff --git a/drivers/dma/dw/Makefile b/drivers/dma/dw/Makefile
index dd8d9936beef..47f36746c559 100644
--- a/drivers/dma/dw/Makefile
+++ b/drivers/dma/dw/Makefile
@@ -1 +1,5 @@
-obj-$(CONFIG_DW_DMAC) += dw_dmac.o
+obj-$(CONFIG_DW_DMAC_CORE)      += dw_dmac_core.o
+dw_dmac_core-objs       := core.o
+
+obj-$(CONFIG_DW_DMAC)           += dw_dmac.o
+dw_dmac-objs            := platform.o
diff --git a/drivers/dma/dw/dw_dmac.c b/drivers/dma/dw/core.c
index 15f3f4f79c10..eea479c12173 100644
--- a/drivers/dma/dw/dw_dmac.c
+++ b/drivers/dma/dw/core.c
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2007-2008 Atmel Corporation
  * Copyright (C) 2010-2011 ST Microelectronics
+ * Copyright (C) 2013 Intel Corporation
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -19,17 +20,12 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
-#include <linux/of.h>
-#include <linux/of_dma.h>
 #include <linux/mm.h>
 #include <linux/module.h>
-#include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <linux/acpi.h>
-#include <linux/acpi_dma.h>
 
 #include "../dmaengine.h"
-#include "dw_dmac_regs.h"
+#include "internal.h"
 
 /*
  * This supports the Synopsys "DesignWare AHB Central DMA Controller",
@@ -41,16 +37,6 @@
  * which does not support descriptor writeback.
  */
 
-static inline unsigned int dwc_get_dms(struct dw_dma_slave *slave)
-{
-        return slave ? slave->dst_master : 0;
-}
-
-static inline unsigned int dwc_get_sms(struct dw_dma_slave *slave)
-{
-        return slave ? slave->src_master : 1;
-}
-
 static inline void dwc_set_masters(struct dw_dma_chan *dwc)
 {
         struct dw_dma *dw = to_dw_dma(dwc->chan.device);
@@ -1225,99 +1211,6 @@ static void dwc_free_chan_resources(struct dma_chan *chan)
         dev_vdbg(chan2dev(chan), "%s: done\n", __func__);
 }
 
-/*----------------------------------------------------------------------*/
-
-struct dw_dma_of_filter_args {
-        struct dw_dma *dw;
-        unsigned int req;
-        unsigned int src;
-        unsigned int dst;
-};
-
-static bool dw_dma_of_filter(struct dma_chan *chan, void *param)
-{
-        struct dw_dma_chan *dwc = to_dw_dma_chan(chan);
-        struct dw_dma_of_filter_args *fargs = param;
-
-        /* Ensure the device matches our channel */
-        if (chan->device != &fargs->dw->dma)
-                return false;
-
-        dwc->request_line = fargs->req;
-        dwc->src_master = fargs->src;
-        dwc->dst_master = fargs->dst;
-
-        return true;
-}
-
-static struct dma_chan *dw_dma_of_xlate(struct of_phandle_args *dma_spec,
-                                        struct of_dma *ofdma)
-{
-        struct dw_dma *dw = ofdma->of_dma_data;
-        struct dw_dma_of_filter_args fargs = {
-                .dw = dw,
-        };
-        dma_cap_mask_t cap;
-
-        if (dma_spec->args_count != 3)
-                return NULL;
-
-        fargs.req = dma_spec->args[0];
-        fargs.src = dma_spec->args[1];
-        fargs.dst = dma_spec->args[2];
-
-        if (WARN_ON(fargs.req >= DW_DMA_MAX_NR_REQUESTS ||
-                    fargs.src >= dw->nr_masters ||
-                    fargs.dst >= dw->nr_masters))
-                return NULL;
-
-        dma_cap_zero(cap);
-        dma_cap_set(DMA_SLAVE, cap);
-
-        /* TODO: there should be a simpler way to do this */
-        return dma_request_channel(cap, dw_dma_of_filter, &fargs);
-}
-
-#ifdef CONFIG_ACPI
-static bool dw_dma_acpi_filter(struct dma_chan *chan, void *param)
-{
-        struct dw_dma_chan *dwc = to_dw_dma_chan(chan);
-        struct acpi_dma_spec *dma_spec = param;
-
-        if (chan->device->dev != dma_spec->dev ||
-            chan->chan_id != dma_spec->chan_id)
-                return false;
-
-        dwc->request_line = dma_spec->slave_id;
-        dwc->src_master = dwc_get_sms(NULL);
-        dwc->dst_master = dwc_get_dms(NULL);
-
-        return true;
-}
-
-static void dw_dma_acpi_controller_register(struct dw_dma *dw)
-{
-        struct device *dev = dw->dma.dev;
-        struct acpi_dma_filter_info *info;
-        int ret;
-