summaryrefslogtreecommitdiff
path: root/drivers/clocksource/vt8500_timer.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2013-04-01 16:29:56 +0800
committerShawn Guo <shawn.guo@linaro.org>2013-04-01 16:29:56 +0800
commit3ed628a8122112ee796cd643e2478c4a6def234c (patch)
tree1e5e352eb501a2afa173989415a8b4896d4999a5 /drivers/clocksource/vt8500_timer.c
parent07961ac7c0ee8b546658717034fe692fd12eefa9 (diff)
parentda4a686a2cfb077a8bfc1697f597e7f86235b822 (diff)
Merge remote-tracking branch 'arm-soc/clksrc/cleanup' into mxs/cleanup
Diffstat (limited to 'drivers/clocksource/vt8500_timer.c')
-rw-r--r--drivers/clocksource/vt8500_timer.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/clocksource/vt8500_timer.c b/drivers/clocksource/vt8500_timer.c
index 8efc86b5b5dd..242255285597 100644
--- a/drivers/clocksource/vt8500_timer.c
+++ b/drivers/clocksource/vt8500_timer.c
@@ -129,22 +129,10 @@ static struct irqaction irq = {
.dev_id = &clockevent,
};
-static struct of_device_id vt8500_timer_ids[] = {
- { .compatible = "via,vt8500-timer" },
- { }
-};
-
-static void __init vt8500_timer_init(void)
+static void __init vt8500_timer_init(struct device_node *np)
{
- struct device_node *np;
int timer_irq;
- np = of_find_matching_node(NULL, vt8500_timer_ids);
- if (!np) {
- pr_err("%s: Timer description missing from Device Tree\n",
- __func__);
- return;
- }
regbase = of_iomap(np, 0);
if (!regbase) {
pr_err("%s: Missing iobase description in Device Tree\n",