diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2011-04-24 06:20:28 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:07:29 -0400 |
commit | 465393749da3a3229f6067246c7e8f97f7cc833d (patch) | |
tree | f2a8fa3d4c03fd09aed307e6d71805169c71003a /arch/arm/mach-at91/at91sam9261.c | |
parent | 8c3583b634d5705d8f604c0d9392bc273d19c256 (diff) |
at91: move clock subsystem init to soc generic init
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Patrice Vilchez <patrice.vilchez@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91/at91sam9261.c')
-rw-r--r-- | arch/arm/mach-at91/at91sam9261.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c index f6a2b30884e9..963197383870 100644 --- a/arch/arm/mach-at91/at91sam9261.c +++ b/arch/arm/mach-at91/at91sam9261.c | |||
@@ -302,16 +302,13 @@ static void __init at91sam9261_map_io(void) | |||
302 | iotable_init(at91sam9261_sram_desc, ARRAY_SIZE(at91sam9261_sram_desc)); | 302 | iotable_init(at91sam9261_sram_desc, ARRAY_SIZE(at91sam9261_sram_desc)); |
303 | } | 303 | } |
304 | 304 | ||
305 | static void __init at91sam9261_initialize(unsigned long main_clock) | 305 | static void __init at91sam9261_initialize(void) |
306 | { | 306 | { |
307 | at91_arch_reset = at91sam9_alt_reset; | 307 | at91_arch_reset = at91sam9_alt_reset; |
308 | pm_power_off = at91sam9261_poweroff; | 308 | pm_power_off = at91sam9261_poweroff; |
309 | at91_extern_irq = (1 << AT91SAM9261_ID_IRQ0) | (1 << AT91SAM9261_ID_IRQ1) | 309 | at91_extern_irq = (1 << AT91SAM9261_ID_IRQ0) | (1 << AT91SAM9261_ID_IRQ1) |
310 | | (1 << AT91SAM9261_ID_IRQ2); | 310 | | (1 << AT91SAM9261_ID_IRQ2); |
311 | 311 | ||
312 | /* Init clock subsystem */ | ||
313 | at91_clock_init(main_clock); | ||
314 | |||
315 | /* Register the processor-specific clocks */ | 312 | /* Register the processor-specific clocks */ |
316 | at91sam9261_register_clocks(); | 313 | at91sam9261_register_clocks(); |
317 | 314 | ||