ARM: highbank: use OF init for sp804 timer
Remove the highbank specific setup for the sp804 timer now that clocksource_of_init will do it. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
This commit is contained in:
parent
7a0eca7121
commit
5993b3ee98
|
@ -32,8 +32,6 @@
|
||||||
#include <asm/cacheflush.h>
|
#include <asm/cacheflush.h>
|
||||||
#include <asm/cputype.h>
|
#include <asm/cputype.h>
|
||||||
#include <asm/smp_plat.h>
|
#include <asm/smp_plat.h>
|
||||||
#include <asm/hardware/arm_timer.h>
|
|
||||||
#include <asm/hardware/timer-sp.h>
|
|
||||||
#include <asm/hardware/cache-l2x0.h>
|
#include <asm/hardware/cache-l2x0.h>
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
#include <asm/mach/map.h>
|
#include <asm/mach/map.h>
|
||||||
|
@ -90,33 +88,16 @@ static void __init highbank_init_irq(void)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct clk_lookup lookup = {
|
|
||||||
.dev_id = "sp804",
|
|
||||||
.con_id = NULL,
|
|
||||||
};
|
|
||||||
|
|
||||||
static void __init highbank_timer_init(void)
|
static void __init highbank_timer_init(void)
|
||||||
{
|
{
|
||||||
int irq;
|
|
||||||
struct device_node *np;
|
struct device_node *np;
|
||||||
void __iomem *timer_base;
|
|
||||||
|
|
||||||
/* Map system registers */
|
/* Map system registers */
|
||||||
np = of_find_compatible_node(NULL, NULL, "calxeda,hb-sregs");
|
np = of_find_compatible_node(NULL, NULL, "calxeda,hb-sregs");
|
||||||
sregs_base = of_iomap(np, 0);
|
sregs_base = of_iomap(np, 0);
|
||||||
WARN_ON(!sregs_base);
|
WARN_ON(!sregs_base);
|
||||||
|
|
||||||
np = of_find_compatible_node(NULL, NULL, "arm,sp804");
|
|
||||||
timer_base = of_iomap(np, 0);
|
|
||||||
WARN_ON(!timer_base);
|
|
||||||
irq = irq_of_parse_and_map(np, 0);
|
|
||||||
|
|
||||||
of_clk_init(NULL);
|
of_clk_init(NULL);
|
||||||
lookup.clk = of_clk_get(np, 0);
|
|
||||||
clkdev_add(&lookup);
|
|
||||||
|
|
||||||
sp804_clocksource_and_sched_clock_init(timer_base + 0x20, "timer1");
|
|
||||||
sp804_clockevents_init(timer_base, irq, "timer0");
|
|
||||||
|
|
||||||
clocksource_of_init();
|
clocksource_of_init();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue