diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2012-10-31 17:04:31 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-11-04 12:09:12 -0500 |
commit | 2389d5014342e9535aad212d0c68d439aaf534ba (patch) | |
tree | b0ebf2e8a58b7776e4982b9039439b8e6af457c2 /arch/arm/mach-integrator | |
parent | da72a66ba852fef3d5dfe02ab311a894e7d791e9 (diff) |
ARM: plat-versatile: move FPGA irq driver to drivers/irqchip
This moves the Versatile FPGA interrupt controller driver, used in
the Integrator/AP, Integrator/CP and some Versatile boards, out
of arch/arm/plat-versatile and down to drivers/irqchip where we
have consensus that such drivers belong. The header file is
consequently moved to <linux/platform_data/irq-versatile-fpga.h>.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-integrator')
-rw-r--r-- | arch/arm/mach-integrator/integrator_ap.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-integrator/integrator_cp.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index 4f13bc57e5a4..e67a9fe18d1b 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <linux/clockchips.h> | 31 | #include <linux/clockchips.h> |
32 | #include <linux/interrupt.h> | 32 | #include <linux/interrupt.h> |
33 | #include <linux/io.h> | 33 | #include <linux/io.h> |
34 | #include <linux/irqchip/versatile-fpga.h> | ||
34 | #include <linux/mtd/physmap.h> | 35 | #include <linux/mtd/physmap.h> |
35 | #include <linux/clk.h> | 36 | #include <linux/clk.h> |
36 | #include <linux/platform_data/clk-integrator.h> | 37 | #include <linux/platform_data/clk-integrator.h> |
@@ -56,8 +57,6 @@ | |||
56 | #include <asm/mach/pci.h> | 57 | #include <asm/mach/pci.h> |
57 | #include <asm/mach/time.h> | 58 | #include <asm/mach/time.h> |
58 | 59 | ||
59 | #include <plat/fpga-irq.h> | ||
60 | |||
61 | #include "common.h" | 60 | #include "common.h" |
62 | 61 | ||
63 | /* | 62 | /* |
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 4423bc8e84c5..acecf04f50f7 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/amba/clcd.h> | 20 | #include <linux/amba/clcd.h> |
21 | #include <linux/amba/mmci.h> | 21 | #include <linux/amba/mmci.h> |
22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
23 | #include <linux/irqchip/versatile-fpga.h> | ||
23 | #include <linux/gfp.h> | 24 | #include <linux/gfp.h> |
24 | #include <linux/mtd/physmap.h> | 25 | #include <linux/mtd/physmap.h> |
25 | #include <linux/platform_data/clk-integrator.h> | 26 | #include <linux/platform_data/clk-integrator.h> |
@@ -46,7 +47,6 @@ | |||
46 | #include <asm/hardware/timer-sp.h> | 47 | #include <asm/hardware/timer-sp.h> |
47 | 48 | ||
48 | #include <plat/clcd.h> | 49 | #include <plat/clcd.h> |
49 | #include <plat/fpga-irq.h> | ||
50 | #include <plat/sched_clock.h> | 50 | #include <plat/sched_clock.h> |
51 | 51 | ||
52 | #include "common.h" | 52 | #include "common.h" |