On Tuesday 27 August 2013, Sebastian Hesselbarth wrote:@@ -58,10 +57,10 @@ static void __init zynq_init_machine(void)
of_platform_bus_probe(NULL, zynq_of_bus_ids, NULL);
}
-static void __init zynq_timer_init(void)
+static void __init zynq_init_irq(void)
{
+ irqchip_init();
zynq_slcr_init();
- clocksource_of_init();
}
static struct map_desc zynq_cortex_a9_scu_map __initdata = {
@@ -104,8 +103,8 @@ static const char * const zynq_dt_match[] = {
DT_MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform")
.smp = smp_ops(zynq_smp_ops),
.map_io = zynq_map_io,
+ .init_irq = zynq_init_irq,
.init_machine = zynq_init_machine,
- .init_time = zynq_timer_init,
.dt_compat = zynq_dt_match,
.restart = zynq_system_reset,
MACHINE_END
It looks like we are not getting any closer to removing all callbacks here,
since you add one in order to remove another, and after the patch we do
more things "early", which we try to avoid. I think we're better off without
this particular patch.