From f4696752b1e966ea5b3a53ec088a237780612fc0 Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Tue, 27 May 2014 13:04:46 +0400 Subject: ARM: i.MX: Use of_clk_get_by_name() for timer clocks for DT case. Use of_clk_get_by_name() for timer clocks for DT case. This patch eliminates a lot of unneeded clk_register_clkdev() calls for GPT. Signed-off-by: Alexander Shiyan Signed-off-by: Shawn Guo --- arch/arm/mach-imx/time.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) (limited to 'arch/arm/mach-imx/time.c') diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c index bed081e..2d96051 100644 --- a/arch/arm/mach-imx/time.c +++ b/arch/arm/mach-imx/time.c @@ -290,23 +290,20 @@ static int __init mxc_clockevent_init(struct clk *timer_clk) return 0; } -void __init mxc_timer_init(void __iomem *base, int irq) +static void __init _mxc_timer_init(void __iomem *base, int irq, + struct clk *clk_per, struct clk *clk_ipg) { uint32_t tctl_val; - struct clk *timer_clk; - struct clk *timer_ipg_clk; - timer_clk = clk_get_sys("imx-gpt.0", "per"); - if (IS_ERR(timer_clk)) { + if (IS_ERR(clk_per)) { pr_err("i.MX timer: unable to get clk\n"); return; } - timer_ipg_clk = clk_get_sys("imx-gpt.0", "ipg"); - if (!IS_ERR(timer_ipg_clk)) - clk_prepare_enable(timer_ipg_clk); + if (!IS_ERR(clk_ipg)) + clk_prepare_enable(clk_ipg); - clk_prepare_enable(timer_clk); + clk_prepare_enable(clk_per); timer_base = base; @@ -325,15 +322,24 @@ void __init mxc_timer_init(void __iomem *base, int irq) __raw_writel(tctl_val, timer_base + MXC_TCTL); /* init and register the timer to the framework */ - mxc_clocksource_init(timer_clk); - mxc_clockevent_init(timer_clk); + mxc_clocksource_init(clk_per); + mxc_clockevent_init(clk_per); /* Make irqs happen */ setup_irq(irq, &mxc_timer_irq); } +void __init mxc_timer_init(void __iomem *base, int irq) +{ + struct clk *clk_per = clk_get_sys("imx-gpt.0", "per"); + struct clk *clk_ipg = clk_get_sys("imx-gpt.0", "ipg"); + + _mxc_timer_init(base, irq, clk_per, clk_ipg); +} + void __init mxc_timer_init_dt(struct device_node *np) { + struct clk *clk_per, *clk_ipg; void __iomem *base; int irq; @@ -341,5 +347,8 @@ void __init mxc_timer_init_dt(struct device_node *np) WARN_ON(!base); irq = irq_of_parse_and_map(np, 0); - mxc_timer_init(base, irq); + clk_per = of_clk_get_by_name(np, "per"); + clk_ipg = of_clk_get_by_name(np, "ipg"); + + _mxc_timer_init(base, irq, clk_per, clk_ipg); } -- cgit v1.1 From d7f9891500aa23bd5d29c37621be82a90c4e25d9 Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Tue, 27 May 2014 13:04:47 +0400 Subject: ARM: i.MX: Remove excess variable Base address for driver is global, there are no need to use intermediate variable for it. Signed-off-by: Alexander Shiyan Signed-off-by: Shawn Guo --- arch/arm/mach-imx/time.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'arch/arm/mach-imx/time.c') diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c index 2d96051..1da2270 100644 --- a/arch/arm/mach-imx/time.c +++ b/arch/arm/mach-imx/time.c @@ -290,7 +290,7 @@ static int __init mxc_clockevent_init(struct clk *timer_clk) return 0; } -static void __init _mxc_timer_init(void __iomem *base, int irq, +static void __init _mxc_timer_init(int irq, struct clk *clk_per, struct clk *clk_ipg) { uint32_t tctl_val; @@ -305,8 +305,6 @@ static void __init _mxc_timer_init(void __iomem *base, int irq, clk_prepare_enable(clk_per); - timer_base = base; - /* * Initialise to a known state (all timers off, and timing reset) */ @@ -334,21 +332,22 @@ void __init mxc_timer_init(void __iomem *base, int irq) struct clk *clk_per = clk_get_sys("imx-gpt.0", "per"); struct clk *clk_ipg = clk_get_sys("imx-gpt.0", "ipg"); - _mxc_timer_init(base, irq, clk_per, clk_ipg); + timer_base = base; + + _mxc_timer_init(irq, clk_per, clk_ipg); } void __init mxc_timer_init_dt(struct device_node *np) { struct clk *clk_per, *clk_ipg; - void __iomem *base; int irq; - base = of_iomap(np, 0); - WARN_ON(!base); + timer_base = of_iomap(np, 0); + WARN_ON(!timer_base); irq = irq_of_parse_and_map(np, 0); clk_per = of_clk_get_by_name(np, "per"); clk_ipg = of_clk_get_by_name(np, "ipg"); - _mxc_timer_init(base, irq, clk_per, clk_ipg); + _mxc_timer_init(irq, clk_per, clk_ipg); } -- cgit v1.1 From fd4959d8779a8e7099c6ecf4f7c854dbf34890e9 Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Sun, 13 Jul 2014 09:34:00 +0400 Subject: ARM: i.MX: Use CLOCKSOURCE_OF_DECLARE() for DT targets This patch uses clocksource_of_init() call for DT targets. Signed-off-by: Alexander Shiyan Signed-off-by: Shawn Guo --- arch/arm/mach-imx/time.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'arch/arm/mach-imx/time.c') diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c index 1da2270..bf92e5a 100644 --- a/arch/arm/mach-imx/time.c +++ b/arch/arm/mach-imx/time.c @@ -337,11 +337,14 @@ void __init mxc_timer_init(void __iomem *base, int irq) _mxc_timer_init(irq, clk_per, clk_ipg); } -void __init mxc_timer_init_dt(struct device_node *np) +static void __init mxc_timer_init_dt(struct device_node *np) { struct clk *clk_per, *clk_ipg; int irq; + if (timer_base) + return; + timer_base = of_iomap(np, 0); WARN_ON(!timer_base); irq = irq_of_parse_and_map(np, 0); @@ -351,3 +354,11 @@ void __init mxc_timer_init_dt(struct device_node *np) _mxc_timer_init(irq, clk_per, clk_ipg); } +CLOCKSOURCE_OF_DECLARE(mx1_timer, "fsl,imx1-gpt", mxc_timer_init_dt); +CLOCKSOURCE_OF_DECLARE(mx25_timer, "fsl,imx25-gpt", mxc_timer_init_dt); +CLOCKSOURCE_OF_DECLARE(mx50_timer, "fsl,imx50-gpt", mxc_timer_init_dt); +CLOCKSOURCE_OF_DECLARE(mx51_timer, "fsl,imx51-gpt", mxc_timer_init_dt); +CLOCKSOURCE_OF_DECLARE(mx53_timer, "fsl,imx53-gpt", mxc_timer_init_dt); +CLOCKSOURCE_OF_DECLARE(mx6q_timer, "fsl,imx6q-gpt", mxc_timer_init_dt); +CLOCKSOURCE_OF_DECLARE(mx6sl_timer, "fsl,imx6sl-gpt", mxc_timer_init_dt); +CLOCKSOURCE_OF_DECLARE(mx6sx_timer, "fsl,imx6sx-gpt", mxc_timer_init_dt); -- cgit v1.1