diff options
author | Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com> | 2008-02-15 02:41:06 -0500 |
---|---|---|
committer | Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com> | 2008-03-31 02:17:01 -0400 |
commit | 724ce5ee15ff4c4f3035110b683b990a3b33c832 (patch) | |
tree | 7b07d25bf64d2e6dad4495c847d1b24d9d5dca43 /arch/arm/mach-ns9xxx/irq.c | |
parent | 3a581349b961f225893103a0fbbd065a831c5184 (diff) |
ns9xxx: prepare for adding support for Digi ns921x processors
The hardware team changed some things that were taken as being common to
all ns9xxx processors up to now.
This patch addresses:
- irqs: s/IRQ_/IRQ_NS9360_/
- system module registers: some registers are still general, their
definition lives now in include/asm-arm/arch-ns9xxx/regs-sys-common.h.
The ns9360 specific ones are in .../regs-sys-ns9360.h
As a result ns9360_systemclock cannot be static inline any more as its
definition needs regs-sys-ns9360.h. This becomes a real problem when
adding support for ns9215 as this will need regs-sys-ns9215.h and
including both files will not work. For the same reason
ns9360_reset() is now non-inline and gpio functions live in their own
file.
- register mapping: s/ns9xxx_map_io/ns9360_map_io/
- timer registers: move time.c to time-ns9360.c;
s/ns9xxx_timer/ns9360_timer/
Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Diffstat (limited to 'arch/arm/mach-ns9xxx/irq.c')
-rw-r--r-- | arch/arm/mach-ns9xxx/irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ns9xxx/irq.c b/arch/arm/mach-ns9xxx/irq.c index 00001b874e97..d4a583cc44c5 100644 --- a/arch/arm/mach-ns9xxx/irq.c +++ b/arch/arm/mach-ns9xxx/irq.c | |||
@@ -12,7 +12,7 @@ | |||
12 | #include <asm/io.h> | 12 | #include <asm/io.h> |
13 | #include <asm/mach/irq.h> | 13 | #include <asm/mach/irq.h> |
14 | #include <asm/mach-types.h> | 14 | #include <asm/mach-types.h> |
15 | #include <asm/arch-ns9xxx/regs-sys.h> | 15 | #include <asm/arch-ns9xxx/regs-sys-common.h> |
16 | #include <asm/arch-ns9xxx/irqs.h> | 16 | #include <asm/arch-ns9xxx/irqs.h> |
17 | #include <asm/arch-ns9xxx/board.h> | 17 | #include <asm/arch-ns9xxx/board.h> |
18 | 18 | ||
@@ -67,7 +67,7 @@ void __init ns9xxx_init_irq(void) | |||
67 | for (i = 0; i < 32; ++i) | 67 | for (i = 0; i < 32; ++i) |
68 | __raw_writel(i, SYS_IVA(i)); | 68 | __raw_writel(i, SYS_IVA(i)); |
69 | 69 | ||
70 | for (i = IRQ_WATCHDOG; i <= IRQ_EXT3; ++i) { | 70 | for (i = 0; i <= 31; ++i) { |
71 | set_irq_chip(i, &ns9xxx_chip); | 71 | set_irq_chip(i, &ns9xxx_chip); |
72 | set_irq_handler(i, handle_level_irq); | 72 | set_irq_handler(i, handle_level_irq); |
73 | set_irq_flags(i, IRQF_VALID); | 73 | set_irq_flags(i, IRQF_VALID); |