diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 22:51:32 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 22:51:32 -0400 |
commit | 2a56d2220284b0e4dd8569fa475d7053f1c40a63 (patch) | |
tree | 96f959486a2f31db599e5f97167074bd1ecb3dc6 /arch/arm/mach-at91/generic.h | |
parent | 46f2cc80514e389bacfb642a32a4181fa1f1d20b (diff) | |
parent | 239df0fd5ee25588f8a5ba7f7ee646940cc403f4 (diff) |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (45 commits)
ARM: 6945/1: Add unwinding support for division functions
ARM: kill pmd_off()
ARM: 6944/1: mm: allow ASID 0 to be allocated to tasks
ARM: 6943/1: mm: use TTBR1 instead of reserved context ID
ARM: 6942/1: mm: make TTBR1 always point to swapper_pg_dir on ARMv6/7
ARM: 6941/1: cache: ensure MVA is cacheline aligned in flush_kern_dcache_area
ARM: add sendmmsg syscall
ARM: 6863/1: allow hotplug on msm
ARM: 6832/1: mmci: support for ST-Ericsson db8500v2
ARM: 6830/1: mach-ux500: force PrimeCell revisions
ARM: 6829/1: amba: make hardcoded periphid override hardware
ARM: 6828/1: mach-ux500: delete SSP PrimeCell ID
ARM: 6827/1: mach-netx: delete hardcoded periphid
ARM: 6940/1: fiq: Briefly document driver responsibilities for suspend/resume
ARM: 6938/1: fiq: Refactor {get,set}_fiq_regs() for Thumb-2
ARM: 6914/1: sparsemem: fix highmem detection when using SPARSEMEM
ARM: 6913/1: sparsemem: allow pfn_valid to be overridden when using SPARSEMEM
at91: drop at572d940hf support
at91rm9200: introduce at91rm9200_set_type to specficy cpu package
at91: drop boot_params and PLAT_PHYS_OFFSET
...
Diffstat (limited to 'arch/arm/mach-at91/generic.h')
-rw-r--r-- | arch/arm/mach-at91/generic.h | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h index 0c66deb2db39..8ff3418f3430 100644 --- a/arch/arm/mach-at91/generic.h +++ b/arch/arm/mach-at91/generic.h | |||
@@ -8,8 +8,21 @@ | |||
8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/clkdev.h> | ||
12 | |||
13 | /* Map io */ | ||
14 | extern void __init at91rm9200_map_io(void); | ||
15 | extern void __init at91sam9260_map_io(void); | ||
16 | extern void __init at91sam9261_map_io(void); | ||
17 | extern void __init at91sam9263_map_io(void); | ||
18 | extern void __init at91sam9rl_map_io(void); | ||
19 | extern void __init at91sam9g45_map_io(void); | ||
20 | extern void __init at91x40_map_io(void); | ||
21 | extern void __init at91cap9_map_io(void); | ||
22 | |||
11 | /* Processors */ | 23 | /* Processors */ |
12 | extern void __init at91rm9200_initialize(unsigned long main_clock, unsigned short banks); | 24 | extern void __init at91rm9200_set_type(int type); |
25 | extern void __init at91rm9200_initialize(unsigned long main_clock); | ||
13 | extern void __init at91sam9260_initialize(unsigned long main_clock); | 26 | extern void __init at91sam9260_initialize(unsigned long main_clock); |
14 | extern void __init at91sam9261_initialize(unsigned long main_clock); | 27 | extern void __init at91sam9261_initialize(unsigned long main_clock); |
15 | extern void __init at91sam9263_initialize(unsigned long main_clock); | 28 | extern void __init at91sam9263_initialize(unsigned long main_clock); |
@@ -17,7 +30,6 @@ extern void __init at91sam9rl_initialize(unsigned long main_clock); | |||
17 | extern void __init at91sam9g45_initialize(unsigned long main_clock); | 30 | extern void __init at91sam9g45_initialize(unsigned long main_clock); |
18 | extern void __init at91x40_initialize(unsigned long main_clock); | 31 | extern void __init at91x40_initialize(unsigned long main_clock); |
19 | extern void __init at91cap9_initialize(unsigned long main_clock); | 32 | extern void __init at91cap9_initialize(unsigned long main_clock); |
20 | extern void __init at572d940hf_initialize(unsigned long main_clock); | ||
21 | 33 | ||
22 | /* Interrupts */ | 34 | /* Interrupts */ |
23 | extern void __init at91rm9200_init_interrupts(unsigned int priority[]); | 35 | extern void __init at91rm9200_init_interrupts(unsigned int priority[]); |
@@ -28,7 +40,6 @@ extern void __init at91sam9rl_init_interrupts(unsigned int priority[]); | |||
28 | extern void __init at91sam9g45_init_interrupts(unsigned int priority[]); | 40 | extern void __init at91sam9g45_init_interrupts(unsigned int priority[]); |
29 | extern void __init at91x40_init_interrupts(unsigned int priority[]); | 41 | extern void __init at91x40_init_interrupts(unsigned int priority[]); |
30 | extern void __init at91cap9_init_interrupts(unsigned int priority[]); | 42 | extern void __init at91cap9_init_interrupts(unsigned int priority[]); |
31 | extern void __init at572d940hf_init_interrupts(unsigned int priority[]); | ||
32 | extern void __init at91_aic_init(unsigned int priority[]); | 43 | extern void __init at91_aic_init(unsigned int priority[]); |
33 | 44 | ||
34 | /* Timer */ | 45 | /* Timer */ |
@@ -39,8 +50,19 @@ extern struct sys_timer at91x40_timer; | |||
39 | 50 | ||
40 | /* Clocks */ | 51 | /* Clocks */ |
41 | extern int __init at91_clock_init(unsigned long main_clock); | 52 | extern int __init at91_clock_init(unsigned long main_clock); |
53 | /* | ||
54 | * function to specify the clock of the default console. As we do not | ||
55 | * use the device/driver bus, the dev_name is not intialize. So we need | ||
56 | * to link the clock to a specific con_id only "usart" | ||
57 | */ | ||
58 | extern void __init at91rm9200_set_console_clock(int id); | ||
59 | extern void __init at91sam9260_set_console_clock(int id); | ||
60 | extern void __init at91sam9261_set_console_clock(int id); | ||
61 | extern void __init at91sam9263_set_console_clock(int id); | ||
62 | extern void __init at91sam9rl_set_console_clock(int id); | ||
63 | extern void __init at91sam9g45_set_console_clock(int id); | ||
64 | extern void __init at91cap9_set_console_clock(int id); | ||
42 | struct device; | 65 | struct device; |
43 | extern void __init at91_clock_associate(const char *id, struct device *dev, const char *func); | ||
44 | 66 | ||
45 | /* Power Management */ | 67 | /* Power Management */ |
46 | extern void at91_irq_suspend(void); | 68 | extern void at91_irq_suspend(void); |