mirror of
https://github.com/torvalds/linux.git
synced 2024-12-26 21:02:19 +00:00
16eeed7e55
Commit0881841f7eintroduced a regression by inverting a test check after calling clocksource_mmio_init(). That results on the system to hang at boot time. Fix it by inverting the test again. Fixes:0881841f7e("Replace code by clocksource_mmio_init") Reported-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
55 lines
1.2 KiB
C
55 lines
1.2 KiB
C
#include <linux/clocksource.h>
|
|
#include <linux/sched_clock.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/printk.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/init.h>
|
|
#include <linux/clk.h>
|
|
|
|
static void __iomem *xtal_in_cnt;
|
|
static struct delay_timer delay_timer;
|
|
|
|
static unsigned long notrace read_xtal_counter(void)
|
|
{
|
|
return readl_relaxed(xtal_in_cnt);
|
|
}
|
|
|
|
static u64 notrace read_sched_clock(void)
|
|
{
|
|
return read_xtal_counter();
|
|
}
|
|
|
|
static void __init tango_clocksource_init(struct device_node *np)
|
|
{
|
|
struct clk *clk;
|
|
int xtal_freq, ret;
|
|
|
|
xtal_in_cnt = of_iomap(np, 0);
|
|
if (xtal_in_cnt == NULL) {
|
|
pr_err("%s: invalid address\n", np->full_name);
|
|
return;
|
|
}
|
|
|
|
clk = of_clk_get(np, 0);
|
|
if (IS_ERR(clk)) {
|
|
pr_err("%s: invalid clock\n", np->full_name);
|
|
return;
|
|
}
|
|
|
|
xtal_freq = clk_get_rate(clk);
|
|
delay_timer.freq = xtal_freq;
|
|
delay_timer.read_current_timer = read_xtal_counter;
|
|
|
|
ret = clocksource_mmio_init(xtal_in_cnt, "tango-xtal", xtal_freq, 350,
|
|
32, clocksource_mmio_readl_up);
|
|
if (ret) {
|
|
pr_err("%s: registration failed\n", np->full_name);
|
|
return;
|
|
}
|
|
|
|
sched_clock_register(read_sched_clock, 32, xtal_freq);
|
|
register_current_timer_delay(&delay_timer);
|
|
}
|
|
|
|
CLOCKSOURCE_OF_DECLARE(tango, "sigma,tick-counter", tango_clocksource_init);
|