diff options
| author |   Viresh Kumar <viresh.kumar@st.com> | 2012-04-10 09:02:35 +0530 |
|---|---|---|
| committer |   Arnd Bergmann <arnd@arndb.de> | 2012-05-12 21:44:12 +0200 |
| commit | 5df33a62c4a028d6fc7f2dcc159827d09b7334b8 (patch) | |
| tree | f4da61ce3bf14e9bf4a1dae3188109a6de34f708 /arch/arm/mach-spear6xx/spear6xx.c | |
| parent | SPEAr: Call clk_prepare() before calling clk_enable (diff) | |
| download | linux-dev-5df33a62c4a028d6fc7f2dcc159827d09b7334b8.tar.xz linux-dev-5df33a62c4a028d6fc7f2dcc159827d09b7334b8.zip | |
SPEAr: Switch to common clock framework
SPEAr SoCs used its own clock framework since now. From now on they will move to
use common clock framework.
This patch updates existing SPEAr machine support to adapt for common clock
framework.
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Reviewed-by: Mike Turquette <mturquette@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-spear6xx/spear6xx.c')
| -rw-r--r-- | arch/arm/mach-spear6xx/spear6xx.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-spear6xx/spear6xx.c b/arch/arm/mach-spear6xx/spear6xx.c index 2ed8b14c82c8..771e19e3c43c 100644 --- a/arch/arm/mach-spear6xx/spear6xx.c +++ b/arch/arm/mach-spear6xx/spear6xx.c @@ -56,9 +56,6 @@ static struct map_desc spear6xx_io_desc[] __initdata = { void __init spear6xx_map_io(void) { iotable_init(spear6xx_io_desc, ARRAY_SIZE(spear6xx_io_desc)); - - /* This will initialize clock framework */ - spear6xx_clk_init(); } static void __init spear6xx_timer_init(void) @@ -66,6 +63,8 @@ static void __init spear6xx_timer_init(void) char pclk_name[] = "pll3_48m_clk"; struct clk *gpt_clk, *pclk; + spear6xx_clk_init(); + /* get the system timer clock */ gpt_clk = clk_get_sys("gpt0", NULL); if (IS_ERR(gpt_clk)) { |