summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas Stach <dev@lynxeye.de>2015-03-05 22:50:01 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2015-03-06 07:52:02 +0100
commit381f034ed607042fa171673b6c4d0150745842e8 (patch)
treed019a16eb1dde42943f07d32828e520a2715154d
parenta0c4e2203fdde7b2636eab3f1406ea66f0e0da19 (diff)
downloadbarebox-381f034ed607042fa171673b6c4d0150745842e8.tar.gz
ARM: move DMA alloc functions to dma.h
This better separates the DMA from the MMU functionality. Also move all drivers that only depends on asm/mmu.h for the alloc functions over to the common header. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/include/asm/dma.h25
-rw-r--r--arch/arm/include/asm/mmu.h26
-rw-r--r--drivers/ata/ahci.c1
-rw-r--r--drivers/dma/apbh_dma.c2
-rw-r--r--drivers/mci/dw_mmc.c1
-rw-r--r--drivers/mtd/nand/nand_mxs.c2
-rw-r--r--drivers/net/altera_tse.c1
-rw-r--r--drivers/net/arc_emac.c1
-rw-r--r--drivers/net/at91_ether.c1
-rw-r--r--drivers/net/designware.c1
-rw-r--r--drivers/net/fec_imx.c1
-rw-r--r--drivers/net/macb.c1
-rw-r--r--drivers/net/mvneta.c1
-rw-r--r--drivers/net/orion-gbe.c1
-rw-r--r--drivers/net/rtl8139.c1
-rw-r--r--drivers/net/rtl8169.c1
-rw-r--r--drivers/net/xgmac.c1
-rw-r--r--drivers/spi/mxs_spi.c1
-rw-r--r--drivers/usb/gadget/fsl_udc.c3
-rw-r--r--drivers/usb/host/ehci-hcd.c1
-rw-r--r--drivers/usb/host/ohci-hcd.c1
-rw-r--r--drivers/usb/host/xhci-hcd.c2
-rw-r--r--drivers/usb/host/xhci-hub.c1
-rw-r--r--drivers/video/atmel_hlcdfb.c1
-rw-r--r--drivers/video/atmel_lcdfb.c1
-rw-r--r--drivers/video/atmel_lcdfb_core.c2
-rw-r--r--drivers/video/imx-ipu-fb.c1
-rw-r--r--drivers/video/imx-ipu-v3/ipu-common.c1
-rw-r--r--drivers/video/imx-ipu-v3/ipufb.c2
-rw-r--r--drivers/video/omap.c1
-rw-r--r--drivers/video/pxa.c2
-rw-r--r--include/dma.h2
32 files changed, 52 insertions, 38 deletions
diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h
index cb9cd1b..48a9c6e 100644
--- a/arch/arm/include/asm/dma.h
+++ b/arch/arm/include/asm/dma.h
@@ -5,4 +5,27 @@
*
*/
-#include <asm/mmu.h>
+#include <common.h>
+
+#define dma_alloc dma_alloc
+static inline void *dma_alloc(size_t size)
+{
+ return xmemalign(64, ALIGN(size, 64));
+}
+
+#ifndef CONFIG_MMU
+static inline void *dma_alloc_coherent(size_t size, dma_addr_t *dma_handle)
+{
+ void *ret = xmemalign(4096, size);
+ if (dma_handle)
+ *dma_handle = (dma_addr_t)ret;
+
+ return ret;
+}
+
+static inline void dma_free_coherent(void *mem, dma_addr_t dma_handle,
+ size_t size)
+{
+ free(mem);
+}
+#endif
diff --git a/arch/arm/include/asm/mmu.h b/arch/arm/include/asm/mmu.h
index d0a644b..01c20bd 100644
--- a/arch/arm/include/asm/mmu.h
+++ b/arch/arm/include/asm/mmu.h
@@ -11,8 +11,6 @@
#define PMD_SECT_DEF_UNCACHED (PMD_SECT_AP_WRITE | PMD_SECT_AP_READ | PMD_TYPE_SECT)
#define PMD_SECT_DEF_CACHED (PMD_SECT_WB | PMD_SECT_DEF_UNCACHED)
-#define DMA_ADDRESS_BROKEN NULL
-
struct arm_memory;
static inline void mmu_enable(void)
@@ -28,16 +26,7 @@ static inline void setup_dma_coherent(unsigned long offset)
{
}
-#define dma_alloc dma_alloc
-static inline void *dma_alloc(size_t size)
-{
- return xmemalign(64, ALIGN(size, 64));
-}
-
#ifdef CONFIG_MMU
-void *dma_alloc_coherent(size_t size, dma_addr_t *dma_handle);
-void dma_free_coherent(void *mem, dma_addr_t dma_handle, size_t size);
-
void dma_clean_range(unsigned long, unsigned long);
void dma_flush_range(unsigned long, unsigned long);
void dma_inv_range(unsigned long, unsigned long);
@@ -47,21 +36,6 @@ uint32_t mmu_get_pte_cached_flags(void);
uint32_t mmu_get_pte_uncached_flags(void);
#else
-static inline void *dma_alloc_coherent(size_t size, dma_addr_t *dma_handle)
-{
- void *ret = xmemalign(4096, size);
- if (dma_handle)
- *dma_handle = (dma_addr_t)ret;
-
- return ret;
-}
-
-static inline void dma_free_coherent(void *mem, dma_addr_t dma_handle,
- size_t size)
-{
- free(mem);
-}
-
static inline void dma_clean_range(unsigned long s, unsigned long e)
{
}
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index d299ac6..2c121d7 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -21,6 +21,7 @@
*/
#include <common.h>
+#include <dma.h>
#include <init.h>
#include <errno.h>
#include <io.h>
diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c
index 5692c50..ebfc647 100644
--- a/drivers/dma/apbh_dma.c
+++ b/drivers/dma/apbh_dma.c
@@ -20,13 +20,13 @@
#include <linux/list.h>
#include <linux/err.h>
#include <common.h>
+#include <dma.h>
#include <driver.h>
#include <malloc.h>
#include <errno.h>
#include <init.h>
#include <io.h>
-#include <asm/mmu.h>
#define HW_APBHX_CTRL0 0x000
#define BM_APBH_CTRL0_APB_BURST8_EN (1 << 29)
diff --git a/drivers/mci/dw_mmc.c b/drivers/mci/dw_mmc.c
index 18fb45d..0ec37b6 100644
--- a/drivers/mci/dw_mmc.c
+++ b/drivers/mci/dw_mmc.c
@@ -18,6 +18,7 @@
*/
#include <common.h>
+#include <dma.h>
#include <driver.h>
#include <malloc.h>
#include <clock.h>
diff --git a/drivers/mtd/nand/nand_mxs.c b/drivers/mtd/nand/nand_mxs.c
index 98fd9f2..d5d64f3 100644
--- a/drivers/mtd/nand/nand_mxs.c
+++ b/drivers/mtd/nand/nand_mxs.c
@@ -26,6 +26,7 @@
#include <linux/err.h>
#include <of_mtd.h>
#include <common.h>
+#include <dma.h>
#include <malloc.h>
#include <errno.h>
#include <driver.h>
@@ -33,7 +34,6 @@
#include <io.h>
#include <dma/apbh-dma.h>
#include <stmp-device.h>
-#include <asm/mmu.h>
#include <mach/generic.h>
#define MX28_BLOCK_SFTRST (1 << 31)
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index 3c49c09..385a715 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -21,6 +21,7 @@
*/
#include <common.h>
+#include <dma.h>
#include <net.h>
#include <init.h>
#include <clock.h>
diff --git a/drivers/net/arc_emac.c b/drivers/net/arc_emac.c
index 0520649..40516a5 100644
--- a/drivers/net/arc_emac.c
+++ b/drivers/net/arc_emac.c
@@ -19,6 +19,7 @@
#include <asm/mmu.h>
#include <clock.h>
#include <common.h>
+#include <dma.h>
#include <net.h>
#include <io.h>
#include <init.h>
diff --git a/drivers/net/at91_ether.c b/drivers/net/at91_ether.c
index 20aa045..9597639 100644
--- a/drivers/net/at91_ether.c
+++ b/drivers/net/at91_ether.c
@@ -20,6 +20,7 @@
*/
#include <common.h>
+#include <dma.h>
#include <net.h>
#include <clock.h>
#include <malloc.h>
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index e0e348f..0428a8c 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -22,6 +22,7 @@
*/
#include <common.h>
+#include <dma.h>
#include <init.h>
#include <io.h>
#include <net.h>
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c
index c12b26b..266357e 100644
--- a/drivers/net/fec_imx.c
+++ b/drivers/net/fec_imx.c
@@ -15,6 +15,7 @@
*/
#include <common.h>
+#include <dma.h>
#include <malloc.h>
#include <net.h>
#include <init.h>
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 9cdb7d8..1ed5c0e 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -38,6 +38,7 @@
#include <net.h>
#include <clock.h>
+#include <dma.h>
#include <malloc.h>
#include <xfuncs.h>
#include <init.h>
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index 32ba726..f2948e4 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -24,6 +24,7 @@
*/
#include <common.h>
+#include <dma.h>
#include <init.h>
#include <io.h>
#include <net.h>
diff --git a/drivers/net/orion-gbe.c b/drivers/net/orion-gbe.c
index 5104f87..8792e75 100644
--- a/drivers/net/orion-gbe.c
+++ b/drivers/net/orion-gbe.c
@@ -27,6 +27,7 @@
* MA 02110-1301 USA
*/
#include <common.h>
+#include <dma.h>
#include <init.h>
#include <io.h>
#include <net.h>
diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index b24a083..d57c706 100644
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -1,4 +1,5 @@
#include <common.h>
+#include <dma.h>
#include <net.h>
#include <malloc.h>
#include <init.h>
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index bab20e8..e465e23 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -16,6 +16,7 @@
#include <asm/mmu.h>
#include <common.h>
+#include <dma.h>
#include <init.h>
#include <net.h>
#include <malloc.h>
diff --git a/drivers/net/xgmac.c b/drivers/net/xgmac.c
index 240684e..c597110 100644
--- a/drivers/net/xgmac.c
+++ b/drivers/net/xgmac.c
@@ -16,6 +16,7 @@
*/
#include <common.h>
+#include <dma.h>
#include <net.h>
#include <clock.h>
#include <malloc.h>
diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
index 8932103..9fe2fd4 100644
--- a/drivers/spi/mxs_spi.c
+++ b/drivers/spi/mxs_spi.c
@@ -23,7 +23,6 @@
#include <stmp-device.h>
#include <linux/clk.h>
#include <linux/err.h>
-#include <asm/mmu.h>
#include <mach/generic.h>
#include <mach/clock.h>
#include <mach/ssp.h>
diff --git a/drivers/usb/gadget/fsl_udc.c b/drivers/usb/gadget/fsl_udc.c
index ed7c318..f6004b4 100644
--- a/drivers/usb/gadget/fsl_udc.c
+++ b/drivers/usb/gadget/fsl_udc.c
@@ -1,4 +1,5 @@
#include <common.h>
+#include <dma.h>
#include <errno.h>
#include <dma.h>
#include <init.h>
@@ -10,6 +11,8 @@
#include <asm/byteorder.h>
#include <linux/err.h>
+#include <asm/mmu.h>
+
/* ### define USB registers here
*/
#define USB_MAX_CTRL_PAYLOAD 64
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index c033842..89a8ffb 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -18,6 +18,7 @@
*/
/*#define DEBUG */
#include <common.h>
+#include <dma.h>
#include <asm/byteorder.h>
#include <usb/usb.h>
#include <io.h>
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index bbd0bd6..010ba35 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -41,6 +41,7 @@
* to activate workaround for bug #41 or this driver will NOT work!
*/
#include <common.h>
+#include <dma.h>
#include <clock.h>
#include <malloc.h>
#include <usb/usb.h>
diff --git a/drivers/usb/host/xhci-hcd.c b/drivers/usb/host/xhci-hcd.c
index 0a4601c..c3d623e 100644
--- a/drivers/usb/host/xhci-hcd.c
+++ b/drivers/usb/host/xhci-hcd.c
@@ -12,9 +12,9 @@
* warranty of any kind, whether express or implied.
*/
//#define DEBUG
-#include <asm/mmu.h>
#include <clock.h>
#include <common.h>
+#include <dma.h>
#include <init.h>
#include <io.h>
#include <linux/err.h>
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index bf95257..5ae16f5 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -14,7 +14,6 @@
* warranty of any kind, whether express or implied.
*/
//#define DEBUG
-#include <asm/mmu.h>
#include <clock.h>
#include <common.h>
#include <io.h>
diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c
index 26db758..f7aab7f 100644
--- a/drivers/video/atmel_hlcdfb.c
+++ b/drivers/video/atmel_hlcdfb.c
@@ -27,7 +27,6 @@
#include <mach/io.h>
#include <mach/cpu.h>
#include <errno.h>
-#include <asm/mmu.h>
#include "atmel_lcdfb.h"
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index bb302bd..20204c1 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -25,7 +25,6 @@
#include <mach/io.h>
#include <mach/cpu.h>
#include <errno.h>
-#include <asm/mmu.h>
#include <linux/clk.h>
#include "atmel_lcdfb.h"
diff --git a/drivers/video/atmel_lcdfb_core.c b/drivers/video/atmel_lcdfb_core.c
index a0a822c..76116af 100644
--- a/drivers/video/atmel_lcdfb_core.c
+++ b/drivers/video/atmel_lcdfb_core.c
@@ -19,11 +19,11 @@
*/
#include <common.h>
+#include <dma.h>
#include <io.h>
#include <linux/err.h>
#include <linux/clk.h>
#include <malloc.h>
-#include <asm/mmu.h>
#include "atmel_lcdfb.h"
diff --git a/drivers/video/imx-ipu-fb.c b/drivers/video/imx-ipu-fb.c
index eb913b1..b566582 100644
--- a/drivers/video/imx-ipu-fb.c
+++ b/drivers/video/imx-ipu-fb.c
@@ -18,6 +18,7 @@
*/
#include <common.h>
+#include <dma.h>
#include <init.h>
#include <io.h>
#include <mach/imx35-regs.h>
diff --git a/drivers/video/imx-ipu-v3/ipu-common.c b/drivers/video/imx-ipu-v3/ipu-common.c
index f13cf01..5c85f86 100644
--- a/drivers/video/imx-ipu-v3/ipu-common.c
+++ b/drivers/video/imx-ipu-v3/ipu-common.c
@@ -19,7 +19,6 @@
#include <clock.h>
#include <driver.h>
#include <init.h>
-#include <asm/mmu.h>
#include <mach/generic.h>
#include <mach/imx6-regs.h>
#include <mach/imx53-regs.h>
diff --git a/drivers/video/imx-ipu-v3/ipufb.c b/drivers/video/imx-ipu-v3/ipufb.c
index d9c81b2..7ee4ae3 100644
--- a/drivers/video/imx-ipu-v3/ipufb.c
+++ b/drivers/video/imx-ipu-v3/ipufb.c
@@ -12,6 +12,7 @@
#define pr_fmt(fmt) "IPU: " fmt
#include <common.h>
+#include <dma.h>
#include <fb.h>
#include <io.h>
#include <driver.h>
@@ -21,7 +22,6 @@
#include <linux/clk.h>
#include <linux/err.h>
#include <asm-generic/div64.h>
-#include <asm/mmu.h>
#include "imx-ipu-v3.h"
#include "ipuv3-plane.h"
diff --git a/drivers/video/omap.c b/drivers/video/omap.c
index 91f9e24..3603ad2 100644
--- a/drivers/video/omap.c
+++ b/drivers/video/omap.c
@@ -19,6 +19,7 @@
*/
#include <driver.h>
+#include <dma.h>
#include <fb.h>
#include <errno.h>
#include <xfuncs.h>
diff --git a/drivers/video/pxa.c b/drivers/video/pxa.c
index 61ce0a5..e76404d 100644
--- a/drivers/video/pxa.c
+++ b/drivers/video/pxa.c
@@ -24,6 +24,7 @@
*/
#include <common.h>
+#include <dma.h>
#include <driver.h>
#include <errno.h>
#include <fb.h>
@@ -37,7 +38,6 @@
#include <mach/pxafb.h>
#include <asm/io.h>
-#include <asm/mmu.h>
#include <asm-generic/div64.h>
/* PXA LCD DMA descriptor */
diff --git a/include/dma.h b/include/dma.h
index fb75eec..800d8b1 100644
--- a/include/dma.h
+++ b/include/dma.h
@@ -14,6 +14,8 @@
#include <dma-dir.h>
#include <asm/dma.h>
+#define DMA_ADDRESS_BROKEN NULL
+
#ifndef dma_alloc
static inline void *dma_alloc(size_t size)
{