diff options
author | Tarun Kanti DebBarma <tarun.kanti@ti.com> | 2012-07-05 08:40:59 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-07-06 04:13:52 -0400 |
commit | ae6df418a21f3a361c5f9b878e32a8aba4e17692 (patch) | |
tree | b58cdec99c8ddf8ff974da94bcf542b29dd8b7ca /arch/arm/mach-omap2/timer.c | |
parent | 68c9a95e9253ce1776bd21bf8d37ddf213cced66 (diff) |
ARM: OMAP2+: dmtimer: cleanup fclk usage
With omap_hwmod_get_main_clk() now available, this can be passed to
clk_get() to extract the fclk and thus avoid construction of fclk name.
Corrected the timer fck name mis-match between clock44xx_data.c and
omap_hwmod_44xx_data.c. For other platforms this is already taken care.
Cc: Cousson, Benoit <b-cousson@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@ti.com>
Cc: Rajendra Nayak <rnayak@ti.com>
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/timer.c')
-rw-r--r-- | arch/arm/mach-omap2/timer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index b5b5d92acd9d..2b318ec92d39 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c | |||
@@ -168,8 +168,7 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer, | |||
168 | return -ENXIO; | 168 | return -ENXIO; |
169 | 169 | ||
170 | /* After the dmtimer is using hwmod these clocks won't be needed */ | 170 | /* After the dmtimer is using hwmod these clocks won't be needed */ |
171 | sprintf(name, "gpt%d_fck", gptimer_id); | 171 | timer->fclk = clk_get(NULL, omap_hwmod_get_main_clk(oh)); |
172 | timer->fclk = clk_get(NULL, name); | ||
173 | if (IS_ERR(timer->fclk)) | 172 | if (IS_ERR(timer->fclk)) |
174 | return -ENODEV; | 173 | return -ENODEV; |
175 | 174 | ||