aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/clk-imx51-imx53.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-05-16 06:29:53 -0400
committerSascha Hauer <s.hauer@pengutronix.de>2012-05-16 06:46:09 -0400
commit2cfb45188a997ba4c3348e98a999b36663a4646f (patch)
tree4ba4e5f29e8b22e3ccf108fcde09d0dd0dec3a69 /arch/arm/mach-imx/clk-imx51-imx53.c
parent1f152b48eaaf4918047e84777b01a6d687f066e9 (diff)
ARM i.MX: remove now unnecessary argument from mxc_timer_init
As the timer code now does a clk_get to get its clock we don't need the struct clk argument anymore. This also changes the alternative EPIT timer to do a clk_get. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/clk-imx51-imx53.c')
-rw-r--r--arch/arm/mach-imx/clk-imx51-imx53.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c
index 1e7828d6be95..c1739f6078d5 100644
--- a/arch/arm/mach-imx/clk-imx51-imx53.c
+++ b/arch/arm/mach-imx/clk-imx51-imx53.c
@@ -329,8 +329,7 @@ int __init mx51_clocks_init(unsigned long rate_ckil, unsigned long rate_osc,
329 clk_set_rate(clk[esdhc_b_podf], 166250000); 329 clk_set_rate(clk[esdhc_b_podf], 166250000);
330 330
331 /* System timer */ 331 /* System timer */
332 mxc_timer_init(NULL, MX51_IO_ADDRESS(MX51_GPT1_BASE_ADDR), 332 mxc_timer_init(MX51_IO_ADDRESS(MX51_GPT1_BASE_ADDR), MX51_INT_GPT);
333 MX51_INT_GPT);
334 333
335 clk_prepare_enable(clk[iim_gate]); 334 clk_prepare_enable(clk[iim_gate]);
336 imx_print_silicon_rev("i.MX51", mx51_revision()); 335 imx_print_silicon_rev("i.MX51", mx51_revision());
@@ -412,8 +411,7 @@ int __init mx53_clocks_init(unsigned long rate_ckil, unsigned long rate_osc,
412 clk_set_rate(clk[esdhc_b_podf], 200000000); 411 clk_set_rate(clk[esdhc_b_podf], 200000000);
413 412
414 /* System timer */ 413 /* System timer */
415 mxc_timer_init(NULL, MX53_IO_ADDRESS(MX53_GPT1_BASE_ADDR), 414 mxc_timer_init(MX53_IO_ADDRESS(MX53_GPT1_BASE_ADDR), MX53_INT_GPT);
416 MX53_INT_GPT);
417 415
418 clk_prepare_enable(clk[iim_gate]); 416 clk_prepare_enable(clk[iim_gate]);
419 imx_print_silicon_rev("i.MX53", mx53_revision()); 417 imx_print_silicon_rev("i.MX53", mx53_revision());