diff options
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-mini2440.c')
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-mini2440.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c b/arch/arm/mach-s3c24xx/mach-mini2440.c index 9e57fd9f4f3b..5cc40ec1d254 100644 --- a/arch/arm/mach-s3c24xx/mach-mini2440.c +++ b/arch/arm/mach-s3c24xx/mach-mini2440.c | |||
@@ -54,7 +54,6 @@ | |||
54 | #include <linux/mtd/partitions.h> | 54 | #include <linux/mtd/partitions.h> |
55 | 55 | ||
56 | #include <plat/gpio-cfg.h> | 56 | #include <plat/gpio-cfg.h> |
57 | #include <plat/clock.h> | ||
58 | #include <plat/devs.h> | 57 | #include <plat/devs.h> |
59 | #include <plat/cpu.h> | 58 | #include <plat/cpu.h> |
60 | #include <plat/samsung-time.h> | 59 | #include <plat/samsung-time.h> |
@@ -525,11 +524,16 @@ static struct platform_device *mini2440_devices[] __initdata = { | |||
525 | static void __init mini2440_map_io(void) | 524 | static void __init mini2440_map_io(void) |
526 | { | 525 | { |
527 | s3c24xx_init_io(mini2440_iodesc, ARRAY_SIZE(mini2440_iodesc)); | 526 | s3c24xx_init_io(mini2440_iodesc, ARRAY_SIZE(mini2440_iodesc)); |
528 | s3c24xx_init_clocks(12000000); | ||
529 | s3c24xx_init_uarts(mini2440_uartcfgs, ARRAY_SIZE(mini2440_uartcfgs)); | 527 | s3c24xx_init_uarts(mini2440_uartcfgs, ARRAY_SIZE(mini2440_uartcfgs)); |
530 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); | 528 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); |
531 | } | 529 | } |
532 | 530 | ||
531 | static void __init mini2440_init_time(void) | ||
532 | { | ||
533 | s3c2440_init_clocks(12000000); | ||
534 | samsung_timer_init(); | ||
535 | } | ||
536 | |||
533 | /* | 537 | /* |
534 | * mini2440_features string | 538 | * mini2440_features string |
535 | * | 539 | * |
@@ -690,6 +694,6 @@ MACHINE_START(MINI2440, "MINI2440") | |||
690 | .map_io = mini2440_map_io, | 694 | .map_io = mini2440_map_io, |
691 | .init_machine = mini2440_init, | 695 | .init_machine = mini2440_init, |
692 | .init_irq = s3c2440_init_irq, | 696 | .init_irq = s3c2440_init_irq, |
693 | .init_time = samsung_timer_init, | 697 | .init_time = mini2440_init_time, |
694 | .restart = s3c244x_restart, | 698 | .restart = s3c244x_restart, |
695 | MACHINE_END | 699 | MACHINE_END |