diff options
author | Alessandro Rubini <rubini@gnudd.com> | 2012-11-23 19:22:56 -0500 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2013-01-13 08:19:45 -0500 |
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 f2a7a1725596..a77f5214bbe8 100644 --- a/arch/arm/mach-s3c64xx/dma.c +++ b/arch/arm/mach-s3c64xx/dma.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/clk.h> | 23 | #include <linux/clk.h> |
24 | #include <linux/err.h> | 24 | #include <linux/err.h> |
25 | #include <linux/io.h> | 25 | #include <linux/io.h> |
26 | #include <linux/amba/pl080.h> | ||
26 | 27 | ||
27 | #include <mach/dma.h> | 28 | #include <mach/dma.h> |
28 | #include <mach/map.h> | 29 | #include <mach/map.h> |
@@ -30,7 +31,6 @@ | |||
30 | 31 | ||
31 | #include <mach/regs-sys.h> | 32 | #include <mach/regs-sys.h> |
32 | 33 | ||
33 | #include <asm/hardware/pl080.h> | ||
34 | 34 | ||
35 | /* dma channel state information */ | 35 | /* dma channel state information */ |
36 | 36 | ||
diff --git a/arch/arm/mach-spear3xx/spear3xx.c b/arch/arm/mach-spear3xx/spear3xx.c index 38fe95db31a7..3d9b1b5e8ed9 100644 --- a/arch/arm/mach-spear3xx/spear3xx.c +++ b/arch/arm/mach-spear3xx/spear3xx.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <linux/irqchip/spear-shirq.h> | 18 | #include <linux/irqchip/spear-shirq.h> |
19 | #include <linux/of_irq.h> | 19 | #include <linux/of_irq.h> |
20 | #include <linux/io.h> | 20 | #include <linux/io.h> |
21 | #include <asm/hardware/pl080.h> | ||
22 | #include <asm/hardware/vic.h> | 21 | #include <asm/hardware/vic.h> |
23 | #include <plat/pl080.h> | 22 | #include <plat/pl080.h> |
24 | #include <mach/generic.h> | 23 | #include <mach/generic.h> |
diff --git a/arch/arm/mach-spear6xx/spear6xx.c b/arch/arm/mach-spear6xx/spear6xx.c index 5a5a52db252b..8ce65a23b06e 100644 --- a/arch/arm/mach-spear6xx/spear6xx.c +++ b/arch/arm/mach-spear6xx/spear6xx.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <linux/of_address.h> | 20 | #include <linux/of_address.h> |
21 | #include <linux/of_irq.h> | 21 | #include <linux/of_irq.h> |
22 | #include <linux/of_platform.h> | 22 | #include <linux/of_platform.h> |
23 | #include <asm/hardware/pl080.h> | 23 | #include <linux/amba/pl080.h> |
24 | #include <asm/hardware/vic.h> | 24 | #include <asm/hardware/vic.h> |
25 | #include <asm/mach/arch.h> | 25 | #include <asm/mach/arch.h> |
26 | #include <asm/mach/time.h> | 26 | #include <asm/mach/time.h> |
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c index 6eb6a5c210bb..8bad254a498d 100644 --- a/drivers/dma/amba-pl08x.c +++ b/drivers/dma/amba-pl08x.c | |||
@@ -83,7 +83,7 @@ | |||
83 | #include <linux/pm_runtime.h> | 83 | #include <linux/pm_runtime.h> |
84 | #include <linux/seq_file.h> | 84 | #include <linux/seq_file.h> |
85 | #include <linux/slab.h> | 85 | #include <linux/slab.h> |
86 | #include <asm/hardware/pl080.h> | 86 | #include <linux/amba/pl080.h> |
87 | 87 | ||
88 | #include "dmaengine.h" | 88 | #include "dmaengine.h" |
89 | #include "virt-dma.h" | 89 | #include "virt-dma.h" |
diff --git a/arch/arm/include/asm/hardware/pl080.h b/include/linux/amba/pl080.h index 4eea2107214b..3e7b62fbefbd 100644 --- a/arch/arm/include/asm/hardware/pl080.h +++ b/include/linux/amba/pl080.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* arch/arm/include/asm/hardware/pl080.h | 1 | /* include/linux/amba/pl080.h |
2 | * | 2 | * |
3 | * Copyright 2008 Openmoko, Inc. | 3 | * Copyright 2008 Openmoko, Inc. |
4 | * Copyright 2008 Simtec Electronics | 4 | * Copyright 2008 Simtec Electronics |