diff options
author | Ben Dooks <ben-linux@fluff.org> | 2009-08-14 10:23:45 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-08-14 10:23:45 -0400 |
commit | 215ed3236a17b748cf75a2c23f50028c95302a42 (patch) | |
tree | a1fa16573704a4a1bb646365f5d4c6cd3bb321f9 /arch/arm/mach-s3c2410/mach-bast.c | |
parent | 0fbdd270078a3e3ce537a2fb6ffc8a9b2427500c (diff) | |
parent | e6d197a6954c8a9ff85727c31ca61fc1da78628a (diff) |
Merge branch 'next-s3c24xx-cpufreq' into next-s3c
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-bast.c')
-rw-r--r-- | arch/arm/mach-s3c2410/mach-bast.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c index 06670bb89cab..647c9adb018f 100644 --- a/arch/arm/mach-s3c2410/mach-bast.c +++ b/arch/arm/mach-s3c2410/mach-bast.c | |||
@@ -60,6 +60,7 @@ | |||
60 | #include <plat/clock.h> | 60 | #include <plat/clock.h> |
61 | #include <plat/devs.h> | 61 | #include <plat/devs.h> |
62 | #include <plat/cpu.h> | 62 | #include <plat/cpu.h> |
63 | #include <plat/cpu-freq.h> | ||
63 | 64 | ||
64 | #include "usb-simtec.h" | 65 | #include "usb-simtec.h" |
65 | #include "nor-simtec.h" | 66 | #include "nor-simtec.h" |
@@ -601,6 +602,12 @@ static struct clk *bast_clocks[] __initdata = { | |||
601 | &s3c24xx_uclk, | 602 | &s3c24xx_uclk, |
602 | }; | 603 | }; |
603 | 604 | ||
605 | static struct s3c_cpufreq_board __initdata bast_cpufreq = { | ||
606 | .refresh = 7800, /* 7.8usec */ | ||
607 | .auto_io = 1, | ||
608 | .need_io = 1, | ||
609 | }; | ||
610 | |||
604 | static void __init bast_map_io(void) | 611 | static void __init bast_map_io(void) |
605 | { | 612 | { |
606 | /* initialise the clocks */ | 613 | /* initialise the clocks */ |
@@ -640,6 +647,8 @@ static void __init bast_init(void) | |||
640 | 647 | ||
641 | usb_simtec_init(); | 648 | usb_simtec_init(); |
642 | nor_simtec_init(); | 649 | nor_simtec_init(); |
650 | |||
651 | s3c_cpufreq_setboard(&bast_cpufreq); | ||
643 | } | 652 | } |
644 | 653 | ||
645 | MACHINE_START(BAST, "Simtec-BAST") | 654 | MACHINE_START(BAST, "Simtec-BAST") |