diff options
| author | Vitaly Wool <vwool@ru.mvista.com> | 2006-07-05 14:47:20 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-07-05 14:47:20 +0100 |
| commit | 5904a7f9167cdeb95569799e0be652c2ce6d3298 (patch) | |
| tree | 724016de1c8a478d391a7b23a2368d9c594be2ef /arch/arm | |
| parent | 20e652761cbf6983fd067aef2f0242c262057737 (diff) | |
[ARM] 3709/1: pnx4008: convert to generic irq subsystem
Patch from Vitaly Wool
Convert pnx4008 chip support to use generic irq subsystem
Signed-off-by: Vitaly Wool <vitalywool@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-pnx4008/core.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-pnx4008/dma.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-pnx4008/irq.c | 22 | ||||
| -rw-r--r-- | arch/arm/mach-pnx4008/time.c | 8 |
4 files changed, 13 insertions, 20 deletions
diff --git a/arch/arm/mach-pnx4008/core.c b/arch/arm/mach-pnx4008/core.c index ba91daad64f..3d73c1e9375 100644 --- a/arch/arm/mach-pnx4008/core.c +++ b/arch/arm/mach-pnx4008/core.c @@ -27,7 +27,6 @@ #include <linux/spi/spi.h> #include <asm/hardware.h> -#include <asm/irq.h> #include <asm/io.h> #include <asm/setup.h> #include <asm/mach-types.h> @@ -36,7 +35,6 @@ #include <asm/system.h> #include <asm/mach/arch.h> -#include <asm/mach/irq.h> #include <asm/mach/map.h> #include <asm/mach/time.h> diff --git a/arch/arm/mach-pnx4008/dma.c b/arch/arm/mach-pnx4008/dma.c index 981aa9dcded..ec01574f88a 100644 --- a/arch/arm/mach-pnx4008/dma.c +++ b/arch/arm/mach-pnx4008/dma.c @@ -23,7 +23,6 @@ #include <linux/clk.h> #include <asm/system.h> -#include <asm/irq.h> #include <asm/hardware.h> #include <asm/dma.h> #include <asm/dma-mapping.h> diff --git a/arch/arm/mach-pnx4008/irq.c b/arch/arm/mach-pnx4008/irq.c index 9b0a8e084e9..3a4bcf3d91f 100644 --- a/arch/arm/mach-pnx4008/irq.c +++ b/arch/arm/mach-pnx4008/irq.c @@ -22,8 +22,8 @@ #include <linux/init.h> #include <linux/ioport.h> #include <linux/device.h> +#include <linux/irq.h> #include <asm/hardware.h> -#include <asm/irq.h> #include <asm/io.h> #include <asm/setup.h> #include <asm/mach-types.h> @@ -96,26 +96,24 @@ void __init pnx4008_init_irq(void) { unsigned int i; - /* configure and enable IRQ 0,1,30,31 (cascade interrupts) mask all others */ + /* configure IRQ's */ + for (i = 0; i < NR_IRQS; i++) { + set_irq_flags(i, IRQF_VALID); + set_irq_chip(i, &pnx4008_irq_chip); + pnx4008_set_irq_type(i, pnx4008_irq_type[i]); + } + + /* configure and enable IRQ 0,1,30,31 (cascade interrupts) */ pnx4008_set_irq_type(SUB1_IRQ_N, pnx4008_irq_type[SUB1_IRQ_N]); pnx4008_set_irq_type(SUB2_IRQ_N, pnx4008_irq_type[SUB2_IRQ_N]); pnx4008_set_irq_type(SUB1_FIQ_N, pnx4008_irq_type[SUB1_FIQ_N]); pnx4008_set_irq_type(SUB2_FIQ_N, pnx4008_irq_type[SUB2_FIQ_N]); + /* mask all others */ __raw_writel((1 << SUB2_FIQ_N) | (1 << SUB1_FIQ_N) | (1 << SUB2_IRQ_N) | (1 << SUB1_IRQ_N), INTC_ER(MAIN_BASE_INT)); __raw_writel(0, INTC_ER(SIC1_BASE_INT)); __raw_writel(0, INTC_ER(SIC2_BASE_INT)); - - /* configure all other IRQ's */ - for (i = 0; i < NR_IRQS; i++) { - if (i == SUB2_FIQ_N || i == SUB1_FIQ_N || - i == SUB2_IRQ_N || i == SUB1_IRQ_N) - continue; - set_irq_flags(i, IRQF_VALID); - set_irq_chip(i, &pnx4008_irq_chip); - pnx4008_set_irq_type(i, pnx4008_irq_type[i]); - } } diff --git a/arch/arm/mach-pnx4008/time.c b/arch/arm/mach-pnx4008/time.c index 888bf6cfba8..756228ddd03 100644 --- a/arch/arm/mach-pnx4008/time.c +++ b/arch/arm/mach-pnx4008/time.c @@ -20,17 +20,15 @@ #include <linux/spinlock.h> #include <linux/module.h> #include <linux/kallsyms.h> +#include <linux/time.h> +#include <linux/timex.h> +#include <linux/irq.h> #include <asm/system.h> #include <asm/hardware.h> #include <asm/io.h> #include <asm/leds.h> -#include <asm/irq.h> -#include <asm/mach/irq.h> #include <asm/mach/time.h> - -#include <linux/time.h> -#include <linux/timex.h> #include <asm/errno.h> /*! Note: all timers are UPCOUNTING */ |