|
@@ -23,7 +23,7 @@
|
|
|
#include <linux/clk.h>
|
|
|
#include <linux/sched_clock.h>
|
|
|
|
|
|
-static void timer_get_base_and_rate(struct device_node *np,
|
|
|
+static void __init timer_get_base_and_rate(struct device_node *np,
|
|
|
void __iomem **base, u32 *rate)
|
|
|
{
|
|
|
struct clk *timer_clk;
|
|
@@ -55,11 +55,11 @@ static void timer_get_base_and_rate(struct device_node *np,
|
|
|
|
|
|
try_clock_freq:
|
|
|
if (of_property_read_u32(np, "clock-freq", rate) &&
|
|
|
- of_property_read_u32(np, "clock-frequency", rate))
|
|
|
+ of_property_read_u32(np, "clock-frequency", rate))
|
|
|
panic("No clock nor clock-frequency property for %s", np->name);
|
|
|
}
|
|
|
|
|
|
-static void add_clockevent(struct device_node *event_timer)
|
|
|
+static void __init add_clockevent(struct device_node *event_timer)
|
|
|
{
|
|
|
void __iomem *iobase;
|
|
|
struct dw_apb_clock_event_device *ced;
|
|
@@ -82,7 +82,7 @@ static void add_clockevent(struct device_node *event_timer)
|
|
|
static void __iomem *sched_io_base;
|
|
|
static u32 sched_rate;
|
|
|
|
|
|
-static void add_clocksource(struct device_node *source_timer)
|
|
|
+static void __init add_clocksource(struct device_node *source_timer)
|
|
|
{
|
|
|
void __iomem *iobase;
|
|
|
struct dw_apb_clocksource *cs;
|
|
@@ -106,7 +106,7 @@ static void add_clocksource(struct device_node *source_timer)
|
|
|
sched_rate = rate;
|
|
|
}
|
|
|
|
|
|
-static u32 read_sched_clock(void)
|
|
|
+static u64 read_sched_clock(void)
|
|
|
{
|
|
|
return __raw_readl(sched_io_base);
|
|
|
}
|
|
@@ -117,7 +117,7 @@ static const struct of_device_id sptimer_ids[] __initconst = {
|
|
|
{ /* Sentinel */ },
|
|
|
};
|
|
|
|
|
|
-static void init_sched_clock(void)
|
|
|
+static void __init init_sched_clock(void)
|
|
|
{
|
|
|
struct device_node *sched_timer;
|
|
|
|
|
@@ -128,7 +128,7 @@ static void init_sched_clock(void)
|
|
|
of_node_put(sched_timer);
|
|
|
}
|
|
|
|
|
|
- setup_sched_clock(read_sched_clock, 32, sched_rate);
|
|
|
+ sched_clock_register(read_sched_clock, 32, sched_rate);
|
|
|
}
|
|
|
|
|
|
static int num_called;
|
|
@@ -138,12 +138,10 @@ static void __init dw_apb_timer_init(struct device_node *timer)
|
|
|
case 0:
|
|
|
pr_debug("%s: found clockevent timer\n", __func__);
|
|
|
add_clockevent(timer);
|
|
|
- of_node_put(timer);
|
|
|
break;
|
|
|
case 1:
|
|
|
pr_debug("%s: found clocksource timer\n", __func__);
|
|
|
add_clocksource(timer);
|
|
|
- of_node_put(timer);
|
|
|
init_sched_clock();
|
|
|
break;
|
|
|
default:
|