clock.c (e5451c8f8330e03ad3cfa16048b4daf961af434f) clock.c (15f0c8f2f378a05fe7b25e545c353a6b5cf5126a)
1/*
2 * arch/sh/kernel/cpu/clock.c - SuperH clock framework
3 *
4 * Copyright (C) 2005 - 2009 Paul Mundt
5 *
6 * This clock framework is derived from the OMAP version by:
7 *
8 * Copyright (C) 2004 - 2008 Nokia Corporation

--- 10 unchanged lines hidden (view full) ---

19#include <linux/clk.h>
20#include <asm/clock.h>
21#include <asm/machvec.h>
22
23int __init clk_init(void)
24{
25 int ret;
26
1/*
2 * arch/sh/kernel/cpu/clock.c - SuperH clock framework
3 *
4 * Copyright (C) 2005 - 2009 Paul Mundt
5 *
6 * This clock framework is derived from the OMAP version by:
7 *
8 * Copyright (C) 2004 - 2008 Nokia Corporation

--- 10 unchanged lines hidden (view full) ---

19#include <linux/clk.h>
20#include <asm/clock.h>
21#include <asm/machvec.h>
22
23int __init clk_init(void)
24{
25 int ret;
26
27#ifndef CONFIG_COMMON_CLK
27 ret = arch_clk_init();
28 if (unlikely(ret)) {
29 pr_err("%s: CPU clock registration failed.\n", __func__);
30 return ret;
31 }
28 ret = arch_clk_init();
29 if (unlikely(ret)) {
30 pr_err("%s: CPU clock registration failed.\n", __func__);
31 return ret;
32 }
33#endif
32
33 if (sh_mv.mv_clk_init) {
34 ret = sh_mv.mv_clk_init();
35 if (unlikely(ret)) {
36 pr_err("%s: machvec clock initialization failed.\n",
37 __func__);
38 return ret;
39 }
40 }
41
34
35 if (sh_mv.mv_clk_init) {
36 ret = sh_mv.mv_clk_init();
37 if (unlikely(ret)) {
38 pr_err("%s: machvec clock initialization failed.\n",
39 __func__);
40 return ret;
41 }
42 }
43
44#ifndef CONFIG_COMMON_CLK
42 /* Kick the child clocks.. */
43 recalculate_root_clocks();
44
45 /* Enable the necessary init clocks */
46 clk_enable_init_clocks();
45 /* Kick the child clocks.. */
46 recalculate_root_clocks();
47
48 /* Enable the necessary init clocks */
49 clk_enable_init_clocks();
50#endif
47
48 return ret;
49}
50
51
51
52 return ret;
53}
54
55