diff options
| author | Alessandro Rubini <rubini@gnudd.com> | 2012-11-24 00:22:56 +0000 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-01-13 05:19:45 -0800 |
| commit | 3a95b9fbba893ebfa9b83de105707539e0228e0c (patch) | |
| tree | c2d2d725e2962c26ed7233099c63544e0b21c2ad | |
| parent | a5dbff111cacecd2e79843a51cc86d21d3648af5 (diff) | |
pl080.h: moved from arm/include/asm/hardware to include/linux/amba/
The header is used by drivers/dma/amba-pl08x.c, which can be compiled
under x86, where PL080 exists under a PCI-to-AMBA bridge. This patche
moves it where it can be accessed by other architectures, and fixes
all users.
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
Acked-by: Giancarlo Asnaghi <giancarlo.asnaghi@st.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
| -rw-r--r-- | arch/arm/mach-s3c64xx/dma.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-spear3xx/spear3xx.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-spear6xx/spear6xx.c | 2 | ||||
| -rw-r--r-- | drivers/dma/amba-pl08x.c | 2 | ||||
| -rw-r--r-- | include/linux/amba/pl080.h (renamed from arch/arm/include/asm/hardware/pl080.h) | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c64xx/dma.c b/arch/arm/mach-s3c64xx/dma.c index f2a7a172559..a77f5214bbe 100644 --- a/arch/arm/mach-s3c64xx/dma.c +++ b/arch/arm/mach-s3c64xx/dma.c @@ -23,6 +23,7 @@ #include <linux/clk.h> #include <linux/err.h> #include <linux/io.h> +#include <linux/amba/pl080.h> #include <mach/dma.h> #include <mach/map.h> @@ -30,7 +31,6 @@ #include <mach/regs-sys.h> -#include <asm/hardware/pl080.h> /* dma channel state information */ diff --git a/arch/arm/mach-spear3xx/spear3xx.c b/arch/arm/mach-spear3xx/spear3xx.c index 38fe95db31a..3d9b1b5e8ed 100644 --- a/arch/arm/mach-spear3xx/spear3xx.c +++ b/arch/arm/mach-spear3xx/spear3xx.c @@ -18,7 +18,6 @@ #include <linux/irqchip/spear-shirq.h> #include <linux/of_irq.h> #include <linux/io.h> -#include <asm/hardware/pl080.h> #include <asm/hardware/vic.h> #include <plat/pl080.h> #include <mach/generic.h> diff --git a/arch/arm/mach-spear6xx/spear6xx.c b/arch/arm/mach-spear6xx/spear6xx.c index 5a5a52db252..8ce65a23b06 100644 --- a/arch/arm/mach-spear6xx/spear6xx.c +++ b/arch/arm/mach-spear6xx/spear6xx.c @@ -20,7 +20,7 @@ #include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/of_platform.h> -#include <asm/hardware/pl080.h> +#include <linux/amba/pl080.h> #include <asm/hardware/vic.h> #include <asm/mach/arch.h> #include <asm/mach/time.h> diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c index 6eb6a5c210b..8bad254a498 100644 --- a/drivers/dma/amba-pl08x.c +++ b/drivers/dma/amba-pl08x.c @@ -83,7 +83,7 @@ #include <linux/pm_runtime.h> #include <linux/seq_file.h> #include <linux/slab.h> -#include <asm/hardware/pl080.h> +#include <linux/amba/pl080.h> #include "dmaengine.h" #include "virt-dma.h" diff --git a/arch/arm/include/asm/hardware/pl080.h b/include/linux/amba/pl080.h index 4eea2107214..3e7b62fbefb 100644 --- a/arch/arm/include/asm/hardware/pl080.h +++ b/include/linux/amba/pl080.h @@ -1,4 +1,4 @@ -/* arch/arm/include/asm/hardware/pl080.h +/* include/linux/amba/pl080.h * * Copyright 2008 Openmoko, Inc. * Copyright 2008 Simtec Electronics |