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/generic.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/generic.c')
-rw-r--r-- | arch/arm/mach-ns9xxx/generic.c | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/arch/arm/mach-ns9xxx/generic.c b/arch/arm/mach-ns9xxx/generic.c index d742c921e34d..1e0f467879cc 100644 --- a/arch/arm/mach-ns9xxx/generic.c +++ b/arch/arm/mach-ns9xxx/generic.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * arch/arm/mach-ns9xxx/generic.c | 2 | * arch/arm/mach-ns9xxx/generic.c |
3 | * | 3 | * |
4 | * Copyright (C) 2006 by Digi International Inc. | 4 | * Copyright (C) 2006,2007 by Digi International Inc. |
5 | * All rights reserved. | 5 | * All rights reserved. |
6 | * | 6 | * |
7 | * This program is free software; you can redistribute it and/or modify it | 7 | * This program is free software; you can redistribute it and/or modify it |
@@ -11,34 +11,9 @@ | |||
11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
13 | #include <asm/memory.h> | 13 | #include <asm/memory.h> |
14 | #include <asm/page.h> | ||
15 | #include <asm/mach-types.h> | ||
16 | #include <asm/mach/map.h> | ||
17 | #include <asm/arch-ns9xxx/regs-sys.h> | ||
18 | #include <asm/arch-ns9xxx/regs-mem.h> | ||
19 | #include <asm/arch-ns9xxx/board.h> | ||
20 | 14 | ||
21 | #include "generic.h" | 15 | #include "generic.h" |
22 | 16 | ||
23 | static struct map_desc standard_io_desc[] __initdata = { | ||
24 | { /* BBus */ | ||
25 | .virtual = io_p2v(0x90000000), | ||
26 | .pfn = __phys_to_pfn(0x90000000), | ||
27 | .length = 0x00700000, | ||
28 | .type = MT_DEVICE, | ||
29 | }, { /* AHB */ | ||
30 | .virtual = io_p2v(0xa0100000), | ||
31 | .pfn = __phys_to_pfn(0xa0100000), | ||
32 | .length = 0x00900000, | ||
33 | .type = MT_DEVICE, | ||
34 | }, | ||
35 | }; | ||
36 | |||
37 | void __init ns9xxx_map_io(void) | ||
38 | { | ||
39 | iotable_init(standard_io_desc, ARRAY_SIZE(standard_io_desc)); | ||
40 | } | ||
41 | |||
42 | void __init ns9xxx_init_machine(void) | 17 | void __init ns9xxx_init_machine(void) |
43 | { | 18 | { |
44 | } | 19 | } |