Skip to content

Commit

Permalink
clocksource: kona: adapt to CLOCKSOURCE_OF_DECLARE change
Browse files Browse the repository at this point in the history
The CLOCKSOURCE_OF_DECLARE functions now take a device_node pointer
as their argument, as of the clksrc/cleanup branch in arm-soc.
This patch adapts the bcm_kona_timer driver to the new interface.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Christian Daudt <csd@broadcom.com>
Cc: John Stultz <john.stultz@linaro.org>
  • Loading branch information
Arnd Bergmann committed Jun 19, 2013
1 parent a857c6e commit 9682bcd
Showing 1 changed file with 4 additions and 11 deletions.
15 changes: 4 additions & 11 deletions drivers/clocksource/bcm_kona_timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -103,16 +103,10 @@ static const struct of_device_id bcm_timer_ids[] __initconst = {
{},
};

static void __init kona_timers_init(void)
static void __init kona_timers_init(struct device_node *node)
{
struct device_node *node;
u32 freq;

node = of_find_matching_node(NULL, bcm_timer_ids);

if (!node)
panic("No timer");

if (!of_property_read_u32(node, "clock-frequency", &freq))
arch_timer_rate = freq;
else
Expand Down Expand Up @@ -199,13 +193,12 @@ static struct irqaction kona_timer_irq = {
.handler = kona_timer_interrupt,
};

static void __init kona_timer_init(void)
static void __init kona_timer_init(struct device_node *node)
{
kona_timers_init();
kona_timers_init(node);
kona_timer_clockevents_init();
setup_irq(timers.tmr_irq, &kona_timer_irq);
kona_timer_set_next_event((arch_timer_rate / HZ), NULL);
}

CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer",
kona_timer_init);
CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer", kona_timer_init);

0 comments on commit 9682bcd

Please sign in to comment.