|
@@ -24,11 +24,13 @@ int __init clk_init(void)
|
|
|
{
|
|
|
int ret;
|
|
|
|
|
|
+#ifndef CONFIG_COMMON_CLK
|
|
|
ret = arch_clk_init();
|
|
|
if (unlikely(ret)) {
|
|
|
pr_err("%s: CPU clock registration failed.\n", __func__);
|
|
|
return ret;
|
|
|
}
|
|
|
+#endif
|
|
|
|
|
|
if (sh_mv.mv_clk_init) {
|
|
|
ret = sh_mv.mv_clk_init();
|
|
@@ -39,11 +41,13 @@ int __init clk_init(void)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+#ifndef CONFIG_COMMON_CLK
|
|
|
/* Kick the child clocks.. */
|
|
|
recalculate_root_clocks();
|
|
|
|
|
|
/* Enable the necessary init clocks */
|
|
|
clk_enable_init_clocks();
|
|
|
+#endif
|
|
|
|
|
|
return ret;
|
|
|
}
|