OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arm: zynq: Move timer to clocksource interface 

Use clocksource timer initialization.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek 2013-03-20 10:24:59 +01:00
parent e932900a32
commit c5263bb8b7
3 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-zynq/common.c
View File

@ -78,7 +78,7 @@ static void __init xilinx_zynq_timer_init(void)
xilinx_zynq_clocks_init(slcr); xilinx_zynq_clocks_init(slcr);
xttcps_timer_init(); clocksource_of_init();
} }
/** /**

2
arch/arm/mach-zynq/common.h
View File

@ -17,6 +17,4 @@
#ifndef __MACH_ZYNQ_COMMON_H__ #ifndef __MACH_ZYNQ_COMMON_H__
#define __MACH_ZYNQ_COMMON_H__ #define __MACH_ZYNQ_COMMON_H__
void __init xttcps_timer_init(void);
#endif #endif

43
arch/arm/mach-zynq/timer.c
View File

@ -22,7 +22,6 @@
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/clk-provider.h> #include <linux/clk-provider.h>
#include "common.h"
/* /*
* This driver configures the 2 16-bit count-up timers as follows: * This driver configures the 2 16-bit count-up timers as follows:
@ -260,8 +259,10 @@ static void __init xttc_setup_clocksource(struct clk *clk, void __iomem *base)
ttccs->xttc.clk = clk; ttccs->xttc.clk = clk;
err = clk_prepare_enable(ttccs->xttc.clk); err = clk_prepare_enable(ttccs->xttc.clk);
if (WARN_ON(err)) if (WARN_ON(err)) {
kfree(ttccs);
return; return;
}
ttccs->xttc.clk_rate_change_nb.notifier_call = ttccs->xttc.clk_rate_change_nb.notifier_call =
xttcps_rate_change_clocksource_cb; xttcps_rate_change_clocksource_cb;
@ -290,9 +291,10 @@ static void __init xttc_setup_clocksource(struct clk *clk, void __iomem *base)
err = clocksource_register_hz(&ttccs->cs, err = clocksource_register_hz(&ttccs->cs,
clk_get_rate(ttccs->xttc.clk) / PRESCALE); clk_get_rate(ttccs->xttc.clk) / PRESCALE);
if (WARN_ON(err)) if (WARN_ON(err)) {
kfree(ttccs);
return; return;
}
} }
static int xttcps_rate_change_clockevent_cb(struct notifier_block *nb, static int xttcps_rate_change_clockevent_cb(struct notifier_block *nb,
@ -341,8 +343,10 @@ static void __init xttc_setup_clockevent(struct clk *clk,
ttcce->xttc.clk = clk; ttcce->xttc.clk = clk;
err = clk_prepare_enable(ttcce->xttc.clk); err = clk_prepare_enable(ttcce->xttc.clk);
if (WARN_ON(err)) if (WARN_ON(err)) {
kfree(ttcce);
return; return;
}
ttcce->xttc.clk_rate_change_nb.notifier_call = ttcce->xttc.clk_rate_change_nb.notifier_call =
xttcps_rate_change_clockevent_cb; xttcps_rate_change_clockevent_cb;
@ -373,8 +377,10 @@ static void __init xttc_setup_clockevent(struct clk *clk,
err = request_irq(irq, xttcps_clock_event_interrupt, err = request_irq(irq, xttcps_clock_event_interrupt,
IRQF_DISABLED | IRQF_TIMER, IRQF_DISABLED | IRQF_TIMER,
ttcce->ce.name, ttcce); ttcce->ce.name, ttcce);
if (WARN_ON(err)) if (WARN_ON(err)) {
kfree(ttcce);
return; return;
}
clockevents_config_and_register(&ttcce->ce, clockevents_config_and_register(&ttcce->ce,
clk_get_rate(ttcce->xttc.clk) / PRESCALE, 1, 0xfffe); clk_get_rate(ttcce->xttc.clk) / PRESCALE, 1, 0xfffe);
@ -386,11 +392,17 @@ static void __init xttc_setup_clockevent(struct clk *clk,
* Initializes the timer hardware and register the clock source and clock event * Initializes the timer hardware and register the clock source and clock event
* timers with Linux kernal timer framework * timers with Linux kernal timer framework
*/ */
static void __init xttcps_timer_init_of(struct device_node *timer) static void __init xttcps_timer_init(struct device_node *timer)
{ {
unsigned int irq; unsigned int irq;
void __iomem *timer_baseaddr; void __iomem *timer_baseaddr;
struct clk *clk; struct clk *clk;
static int initialized;
if (initialized)
return;
initialized = 1;
/* /*
* Get the 1st Triple Timer Counter (TTC) block from the device tree * Get the 1st Triple Timer Counter (TTC) block from the device tree
@ -421,19 +433,4 @@ static void __init xttcps_timer_init_of(struct device_node *timer)
pr_info("%s #0 at %p, irq=%d\n", timer->name, timer_baseaddr, irq); pr_info("%s #0 at %p, irq=%d\n", timer->name, timer_baseaddr, irq);
} }
void __init xttcps_timer_init(void) CLOCKSOURCE_OF_DECLARE(ttc, "cdns,ttc", xttcps_timer_init);
{
const char * const timer_list[] = {
"cdns,ttc",
NULL
};
struct device_node *timer;
timer = of_find_compatible_node(NULL, NULL, timer_list[0]);
if (!timer) {
pr_err("ERROR: no compatible timer found\n");
BUG();
}
xttcps_timer_init_of(timer);
}