diff options
author | Lucas Stach <dev@lynxeye.de> | 2015-03-05 22:50:01 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-03-06 07:52:02 +0100 |
commit | 381f034ed607042fa171673b6c4d0150745842e8 (patch) | |
tree | d019a16eb1dde42943f07d32828e520a2715154d /drivers | |
parent | a0c4e2203fdde7b2636eab3f1406ea66f0e0da19 (diff) | |
download | barebox-381f034ed607042fa171673b6c4d0150745842e8.tar.gz barebox-381f034ed607042fa171673b6c4d0150745842e8.tar.xz |
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>
Diffstat (limited to 'drivers')
29 files changed, 26 insertions, 11 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index d299ac6e27..2c121d7c5e 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 5692c500b8..ebfc64700e 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 18fb45d2b8..0ec37b6638 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 98fd9f2579..d5d64f369e 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 3c49c0945b..385a7150ba 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 05206494fe..40516a593f 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 20aa045da3..9597639b44 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 e0e348fb00..0428a8cbb4 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 c12b26b4a0..266357e551 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 9cdb7d8539..1ed5c0ebc2 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 32ba726ac9..f2948e4ed7 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 5104f87264..8792e75343 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 b24a083a56..d57c706e52 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 bab20e8c57..e465e23352 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 240684ee1e..c5971108e4 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 8932103475..9fe2fd4eaf 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 ed7c318a39..f6004b4146 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 c033842bc1..89a8ffb2a8 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 bbd0bd6b77..010ba35014 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 0a4601ca19..c3d623e91f 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 bf952570f8..5ae16f5ca5 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 26db7589af..f7aab7f454 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 bb302bdc94..20204c1dd4 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 a0a822c240..76116af1da 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 eb913b1b4c..b56658202c 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 f13cf012a1..5c85f8615c 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 d9c81b25e8..7ee4ae3627 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 91f9e24d7d..3603ad2ccb 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 61ce0a5d33..e76404d9c9 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 */ |