diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2012-08-13 15:49:45 +0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-08-13 15:53:07 +0400 |
| commit | a4fe292fa75baaa9cfb1a7224614f31fcd0d9a7b (patch) | |
| tree | 320038aa5b3763506bc87a0f1d836841e27ab0d1 | |
| parent | 8dcf470760b74c41e7c93deebc2ff60af3908c97 (diff) | |
| download | linux-a4fe292fa75baaa9cfb1a7224614f31fcd0d9a7b.tar.xz | |
ARM: u300: convert to sparse IRQs
This converts the U300 to use sparse IRQs, which is simple now
that the number of machines are reduced.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-u300/core.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-u300/include/mach/irqs.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-u300/timer.c | 3 |
4 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e91c7cdc6fe5..0fb682d3e4d5 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -937,6 +937,7 @@ config ARCH_U300 select COMMON_CLK select GENERIC_GPIO select ARCH_REQUIRE_GPIOLIB + select SPARSE_IRQ help Support for ST-Ericsson U300 series mobile platforms. diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index 31cc9267efc1..ef6f602b7e48 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c @@ -38,13 +38,13 @@ #include <asm/memory.h> #include <asm/hardware/vic.h> #include <asm/mach/map.h> -#include <asm/mach/irq.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <mach/coh901318.h> #include <mach/hardware.h> #include <mach/syscon.h> +#include <mach/irqs.h> #include "timer.h" #include "spi.h" @@ -1807,6 +1807,7 @@ MACHINE_START(U300, "Ericsson AB U335 S335/B335 Prototype Board") /* Maintainer: Linus Walleij <linus.walleij@stericsson.com> */ .atag_offset = 0x100, .map_io = u300_map_io, + .nr_irqs = NR_IRQS_U300, .init_irq = u300_init_irq, .handle_irq = vic_handle_irq, .timer = &u300_timer, diff --git a/arch/arm/mach-u300/include/mach/irqs.h b/arch/arm/mach-u300/include/mach/irqs.h index c09386bca206..e27425a63fa1 100644 --- a/arch/arm/mach-u300/include/mach/irqs.h +++ b/arch/arm/mach-u300/include/mach/irqs.h @@ -85,6 +85,6 @@ #define IRQ_U300_GPIO_END (U300_VIC_IRQS_END) #endif -#define NR_IRQS (IRQ_U300_GPIO_END - IRQ_U300_INTCON0_START) +#define NR_IRQS_U300 (IRQ_U300_GPIO_END - IRQ_U300_INTCON0_START) #endif diff --git a/arch/arm/mach-u300/timer.c b/arch/arm/mach-u300/timer.c index 146e81531da3..1da10e20e996 100644 --- a/arch/arm/mach-u300/timer.c +++ b/arch/arm/mach-u300/timer.c @@ -17,14 +17,15 @@ #include <linux/io.h> #include <linux/clk.h> #include <linux/err.h> +#include <linux/irq.h> #include <mach/hardware.h> +#include <mach/irqs.h> /* Generic stuff */ #include <asm/sched_clock.h> #include <asm/mach/map.h> #include <asm/mach/time.h> -#include <asm/mach/irq.h> #include "timer.h" |