aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2013-06-05 08:26:44 -0400
committerVinod Koul <vinod.koul@intel.com>2013-07-05 02:10:43 -0400
commit61a7649620d54a037c612f9a713abe5178cddc65 (patch)
treee573b8b24811f01c0adaa9156d7e3f2dc4ba232d /drivers/dma
parent0b95961e03ecee31d6151db79cc0826e702d1e0a (diff)
dma: move dw_dmac driver to an own directory
The dw_dmac driver is going to be split into multiple files. To make this more convenient move it to an own directory. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/Kconfig20
-rw-r--r--drivers/dma/Makefile2
-rw-r--r--drivers/dma/dw/Kconfig23
-rw-r--r--drivers/dma/dw/Makefile1
-rw-r--r--drivers/dma/dw/dw_dmac.c (renamed from drivers/dma/dw_dmac.c)2
-rw-r--r--drivers/dma/dw/dw_dmac_regs.h (renamed from drivers/dma/dw_dmac_regs.h)0
6 files changed, 27 insertions, 21 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index e9924898043a..146a1d864a71 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -79,25 +79,7 @@ config INTEL_IOP_ADMA
79 help 79 help
80 Enable support for the Intel(R) IOP Series RAID engines. 80 Enable support for the Intel(R) IOP Series RAID engines.
81 81
82config DW_DMAC 82source "drivers/dma/dw/Kconfig"
83 tristate "Synopsys DesignWare AHB DMA support"
84 depends on GENERIC_HARDIRQS
85 select DMA_ENGINE
86 default y if CPU_AT32AP7000
87 help
88 Support the Synopsys DesignWare AHB DMA controller. This
89 can be integrated in chips such as the Atmel AT32ap7000.
90
91config DW_DMAC_BIG_ENDIAN_IO
92 bool "Use big endian I/O register access"
93 default y if AVR32
94 depends on DW_DMAC
95 help
96 Say yes here to use big endian I/O access when reading and writing
97 to the DMA controller registers. This is needed on some platforms,
98 like the Atmel AVR32 architecture.
99
100 If unsure, use the default setting.
101 83
102config AT_HDMAC 84config AT_HDMAC
103 tristate "Atmel AHB DMA support" 85 tristate "Atmel AHB DMA support"
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index a2b0df591f95..ac44ca0d468a 100644
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -15,7 +15,7 @@ obj-$(CONFIG_FSL_DMA) += fsldma.o
15obj-$(CONFIG_MPC512X_DMA) += mpc512x_dma.o 15obj-$(CONFIG_MPC512X_DMA) += mpc512x_dma.o
16obj-$(CONFIG_PPC_BESTCOMM) += bestcomm/ 16obj-$(CONFIG_PPC_BESTCOMM) += bestcomm/
17obj-$(CONFIG_MV_XOR) += mv_xor.o 17obj-$(CONFIG_MV_XOR) += mv_xor.o
18obj-$(CONFIG_DW_DMAC) += dw_dmac.o 18obj-$(CONFIG_DW_DMAC) += dw/
19obj-$(CONFIG_AT_HDMAC) += at_hdmac.o 19obj-$(CONFIG_AT_HDMAC) += at_hdmac.o
20obj-$(CONFIG_MX3_IPU) += ipu/ 20obj-$(CONFIG_MX3_IPU) += ipu/
21obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o 21obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o
diff --git a/drivers/dma/dw/Kconfig b/drivers/dma/dw/Kconfig
new file mode 100644
index 000000000000..38a215af5ccc
--- /dev/null
+++ b/drivers/dma/dw/Kconfig
@@ -0,0 +1,23 @@
1#
2# DMA engine configuration for dw
3#
4
5config DW_DMAC
6 tristate "Synopsys DesignWare AHB DMA support"
7 depends on GENERIC_HARDIRQS
8 select DMA_ENGINE
9 default y if CPU_AT32AP7000
10 help
11 Support the Synopsys DesignWare AHB DMA controller. This
12 can be integrated in chips such as the Atmel AT32ap7000.
13
14config DW_DMAC_BIG_ENDIAN_IO
15 bool "Use big endian I/O register access"
16 default y if AVR32
17 depends on DW_DMAC
18 help
19 Say yes here to use big endian I/O access when reading and writing
20 to the DMA controller registers. This is needed on some platforms,
21 like the Atmel AVR32 architecture.
22
23 If unsure, use the default setting.
diff --git a/drivers/dma/dw/Makefile b/drivers/dma/dw/Makefile
new file mode 100644
index 000000000000..dd8d9936beef
--- /dev/null
+++ b/drivers/dma/dw/Makefile
@@ -0,0 +1 @@
obj-$(CONFIG_DW_DMAC) += dw_dmac.o
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw/dw_dmac.c
index 2b65ba614e60..15f3f4f79c10 100644
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw/dw_dmac.c
@@ -28,8 +28,8 @@
28#include <linux/acpi.h> 28#include <linux/acpi.h>
29#include <linux/acpi_dma.h> 29#include <linux/acpi_dma.h>
30 30
31#include "../dmaengine.h"
31#include "dw_dmac_regs.h" 32#include "dw_dmac_regs.h"
32#include "dmaengine.h"
33 33
34/* 34/*
35 * This supports the Synopsys "DesignWare AHB Central DMA Controller", 35 * This supports the Synopsys "DesignWare AHB Central DMA Controller",
diff --git a/drivers/dma/dw_dmac_regs.h b/drivers/dma/dw/dw_dmac_regs.h
index 9d417200bd57..9d417200bd57 100644
--- a/drivers/dma/dw_dmac_regs.h
+++ b/drivers/dma/dw/dw_dmac_regs.h