summaryrefslogtreecommitdiff
path: root/arch/arm/mach-davinci/common.c
diff options
context:
space:
mode:
authorMark A. Greer <mgreer@mvista.com>2009-04-15 12:39:23 -0700
committerKevin Hilman <khilman@deeprootsystems.com>2009-05-26 08:14:59 -0700
commit66e0c3991c5a1735dd8add77ab8aff5005f57681 (patch)
tree9437a2cea15b2abbdd3e440f9be3809311f3d30d /arch/arm/mach-davinci/common.c
parentb9ab12797e74d93a3656ea0bf5591f8b3e094fd5 (diff)
downloadlinux-3.10-66e0c3991c5a1735dd8add77ab8aff5005f57681.tar.gz
linux-3.10-66e0c3991c5a1735dd8add77ab8aff5005f57681.tar.bz2
linux-3.10-66e0c3991c5a1735dd8add77ab8aff5005f57681.zip
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.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/common.c b/arch/arm/mach-davinci/common.c
index 29b3a8d5121..2e5b888e6ca 100644
--- a/arch/arm/mach-davinci/common.c
+++ b/arch/arm/mach-davinci/common.c
@@ -17,6 +17,8 @@
#include <mach/common.h>
#include <mach/cputype.h>
+#include "clock.h"
+
struct davinci_soc_info davinci_soc_info;
EXPORT_SYMBOL(davinci_soc_info);
@@ -75,6 +77,13 @@ void __init davinci_common_init(struct davinci_soc_info *soc_info)
davinci_soc_info.cpu_id = dip->cpu_id;
pr_info("DaVinci %s variant 0x%x\n", dip->name, dip->variant);
+ if (davinci_soc_info.cpu_clks) {
+ ret = davinci_clk_init(davinci_soc_info.cpu_clks);
+
+ if (ret != 0)
+ goto err;
+ }
+
return;
err: