diff options
author | Mark A. Greer <mgreer@mvista.com> | 2009-04-15 15:39:23 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@deeprootsystems.com> | 2009-05-26 11:14:59 -0400 |
commit | 66e0c3991c5a1735dd8add77ab8aff5005f57681 (patch) | |
tree | 9437a2cea15b2abbdd3e440f9be3809311f3d30d /arch/arm/mach-davinci/common.c | |
parent | b9ab12797e74d93a3656ea0bf5591f8b3e094fd5 (diff) |
davinci: Add clock init call to common init routine
All of the davinci SoCs need to call davinci_clk_init() so
put the call in the common init routine.
Signed-off-by: Mark A. Greer <mgreer@mvista.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-davinci/common.c')
-rw-r--r-- | arch/arm/mach-davinci/common.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/common.c b/arch/arm/mach-davinci/common.c index 29b3a8d51211..2e5b888e6ca6 100644 --- a/arch/arm/mach-davinci/common.c +++ b/arch/arm/mach-davinci/common.c | |||
@@ -17,6 +17,8 @@ | |||
17 | #include <mach/common.h> | 17 | #include <mach/common.h> |
18 | #include <mach/cputype.h> | 18 | #include <mach/cputype.h> |
19 | 19 | ||
20 | #include "clock.h" | ||
21 | |||
20 | struct davinci_soc_info davinci_soc_info; | 22 | struct davinci_soc_info davinci_soc_info; |
21 | EXPORT_SYMBOL(davinci_soc_info); | 23 | EXPORT_SYMBOL(davinci_soc_info); |
22 | 24 | ||
@@ -75,6 +77,13 @@ void __init davinci_common_init(struct davinci_soc_info *soc_info) | |||
75 | davinci_soc_info.cpu_id = dip->cpu_id; | 77 | davinci_soc_info.cpu_id = dip->cpu_id; |
76 | pr_info("DaVinci %s variant 0x%x\n", dip->name, dip->variant); | 78 | pr_info("DaVinci %s variant 0x%x\n", dip->name, dip->variant); |
77 | 79 | ||
80 | if (davinci_soc_info.cpu_clks) { | ||
81 | ret = davinci_clk_init(davinci_soc_info.cpu_clks); | ||
82 | |||
83 | if (ret != 0) | ||
84 | goto err; | ||
85 | } | ||
86 | |||
78 | return; | 87 | return; |
79 | 88 | ||
80 | err: | 89 | err: |