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/at91sam9260.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/at91sam9260.c')
-rw-r--r-- | arch/arm/mach-at91/at91sam9260.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c index 8a6b9aa1dd9c..40e123fa9cf5 100644 --- a/arch/arm/mach-at91/at91sam9260.c +++ b/arch/arm/mach-at91/at91sam9260.c | |||
@@ -350,16 +350,13 @@ static void __init at91sam9260_map_io(void) | |||
350 | iotable_init(at91sam9260_sram_desc, ARRAY_SIZE(at91sam9260_sram_desc)); | 350 | iotable_init(at91sam9260_sram_desc, ARRAY_SIZE(at91sam9260_sram_desc)); |
351 | } | 351 | } |
352 | 352 | ||
353 | static void __init at91sam9260_initialize(unsigned long main_clock) | 353 | static void __init at91sam9260_initialize(void) |
354 | { | 354 | { |
355 | at91_arch_reset = at91sam9_alt_reset; | 355 | at91_arch_reset = at91sam9_alt_reset; |
356 | pm_power_off = at91sam9260_poweroff; | 356 | pm_power_off = at91sam9260_poweroff; |
357 | at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1) | 357 | at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1) |
358 | | (1 << AT91SAM9260_ID_IRQ2); | 358 | | (1 << AT91SAM9260_ID_IRQ2); |
359 | 359 | ||
360 | /* Init clock subsystem */ | ||
361 | at91_clock_init(main_clock); | ||
362 | |||
363 | /* Register the processor-specific clocks */ | 360 | /* Register the processor-specific clocks */ |
364 | at91sam9260_register_clocks(); | 361 | at91sam9260_register_clocks(); |
365 | 362 | ||