projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'clk-for-linus-3.18' of git://git.linaro.org/people/mike.turquette/linux
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-omap2
/
io.c
diff --git
a/arch/arm/mach-omap2/io.c
b/arch/arm/mach-omap2/io.c
index b8ad045bcb8dfbe528a40b93657e0bf373e1832d..03cbb16898a3f0eeef87144ea70f5b8d96849650 100644
(file)
--- a/
arch/arm/mach-omap2/io.c
+++ b/
arch/arm/mach-omap2/io.c
@@
-723,8
+723,16
@@
int __init omap_clk_init(void)
ti_clk_init_features();
ret = of_prcm_init();
- if (!ret)
- ret = omap_clk_soc_init();
+ if (ret)
+ return ret;
+
+ of_clk_init(NULL);
+
+ ti_dt_clk_init_retry_clks();
+
+ ti_dt_clockdomains_setup();
+
+ ret = omap_clk_soc_init();
return ret;
}