diff options
author | Werner Almesberger <werner@openmoko.org> | 2009-03-04 22:43:13 -0500 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-05-07 06:14:27 -0400 |
commit | a03f7daf6df31b4d849031c51a3c10b8ba78ce67 (patch) | |
tree | 1a9d4d5fd2a3a28d892374c2bb5fea0eb53e2c40 /arch/arm | |
parent | e2c977dca2901012ddabdc2a7b3c47a80c94d431 (diff) |
[ARM] S3C64XX: Add HCLKx2
Add doubled HCLK to S3C64xx.
Signed-off-by: Werner Almesberger <werner@openmoko.org>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/plat-s3c/include/plat/clock.h | 1 | ||||
-rw-r--r-- | arch/arm/plat-s3c64xx/clock.c | 7 | ||||
-rw-r--r-- | arch/arm/plat-s3c64xx/s3c6400-clock.c | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c/include/plat/clock.h b/arch/arm/plat-s3c/include/plat/clock.h index a10622eed43a..d86af84b5b8c 100644 --- a/arch/arm/plat-s3c/include/plat/clock.h +++ b/arch/arm/plat-s3c/include/plat/clock.h | |||
@@ -50,6 +50,7 @@ extern struct clk clk_xtal; | |||
50 | extern struct clk clk_ext; | 50 | extern struct clk clk_ext; |
51 | 51 | ||
52 | /* S3C64XX specific clocks */ | 52 | /* S3C64XX specific clocks */ |
53 | extern struct clk clk_h2; | ||
53 | extern struct clk clk_27m; | 54 | extern struct clk clk_27m; |
54 | extern struct clk clk_48m; | 55 | extern struct clk clk_48m; |
55 | 56 | ||
diff --git a/arch/arm/plat-s3c64xx/clock.c b/arch/arm/plat-s3c64xx/clock.c index ad1b9682c9c3..679076f5071a 100644 --- a/arch/arm/plat-s3c64xx/clock.c +++ b/arch/arm/plat-s3c64xx/clock.c | |||
@@ -27,6 +27,12 @@ | |||
27 | #include <plat/devs.h> | 27 | #include <plat/devs.h> |
28 | #include <plat/clock.h> | 28 | #include <plat/clock.h> |
29 | 29 | ||
30 | struct clk clk_h2 = { | ||
31 | .name = "hclk2", | ||
32 | .id = -1, | ||
33 | .rate = 0, | ||
34 | }; | ||
35 | |||
30 | struct clk clk_27m = { | 36 | struct clk clk_27m = { |
31 | .name = "clk_27m", | 37 | .name = "clk_27m", |
32 | .id = -1, | 38 | .id = -1, |
@@ -246,6 +252,7 @@ static struct clk *clks[] __initdata = { | |||
246 | &clk_epll, | 252 | &clk_epll, |
247 | &clk_27m, | 253 | &clk_27m, |
248 | &clk_48m, | 254 | &clk_48m, |
255 | &clk_h2, | ||
249 | }; | 256 | }; |
250 | 257 | ||
251 | void __init s3c64xx_register_clocks(void) | 258 | void __init s3c64xx_register_clocks(void) |
diff --git a/arch/arm/plat-s3c64xx/s3c6400-clock.c b/arch/arm/plat-s3c64xx/s3c6400-clock.c index 6dd187d04743..96fa9ea4d5bc 100644 --- a/arch/arm/plat-s3c64xx/s3c6400-clock.c +++ b/arch/arm/plat-s3c64xx/s3c6400-clock.c | |||
@@ -636,6 +636,7 @@ void __init_or_cpufreq s3c6400_setup_clocks(void) | |||
636 | clk_fout_epll.rate = epll; | 636 | clk_fout_epll.rate = epll; |
637 | clk_fout_apll.rate = apll; | 637 | clk_fout_apll.rate = apll; |
638 | 638 | ||
639 | clk_h2.rate = hclk2; | ||
639 | clk_h.rate = hclk; | 640 | clk_h.rate = hclk; |
640 | clk_p.rate = pclk; | 641 | clk_p.rate = pclk; |
641 | clk_f.rate = fclk; | 642 | clk_f.rate = fclk; |