[PATCH 04/18] ARM: imx: Added one more parameter for mxc_clockevent_init

Shenwei Wang shenwei.wang at freescale.com
Thu Apr 30 07:44:19 PDT 2015


One more parameter was added for the function of
mxc_clockevent_init, so that we could remove the
global variables later.

Signed-off-by: Shenwei Wang <shenwei.wang at freescale.com>
---
 arch/arm/mach-imx/time.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c
index f44c2aa..f7403ab 100644
--- a/arch/arm/mach-imx/time.c
+++ b/arch/arm/mach-imx/time.c
@@ -299,7 +299,8 @@ static struct clock_event_device clockevent_mxc = {
 	.rating		= 200,
 };
 
-static int __init mxc_clockevent_init(struct clk *timer_clk)
+static int __init mxc_clockevent_init(struct clk *timer_clk,
+		struct imx_timer *tm)
 {
 	if (timer_is_v2())
 		clockevent_mxc.set_next_event = v2_set_next_event;
@@ -355,7 +356,7 @@ static void __init _mxc_timer_init(int irq,
 
 	/* init and register the timer to the framework */
 	mxc_clocksource_init(clk_per);
-	mxc_clockevent_init(clk_per);
+	mxc_clockevent_init(clk_per, 0);
 
 	/* Make irqs happen */
 	setup_irq(irq, &mxc_timer_irq);
-- 
1.9.1





More information about the linux-arm-kernel mailing list