Commit 0f391f18 authored by Maxime Ripard's avatar Maxime Ripard Committed by Nicolas Ferre

ARM: at91: Convert the boards to the init_time callback

Now that we have the init_time callback in the at91_init_soc structure, convert
all the boards and SoC to this.
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: default avatarBoris BREZILLON <boris.brezillon@free-electrons.com>
Acked-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent d2992e51
...@@ -440,6 +440,11 @@ static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = { ...@@ -440,6 +440,11 @@ static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = {
0, /* Advanced Interrupt Controller */ 0, /* Advanced Interrupt Controller */
}; };
static void __init at91sam9260_init_time(void)
{
at91sam926x_pit_init();
}
AT91_SOC_START(at91sam9260) AT91_SOC_START(at91sam9260)
.map_io = at91sam9260_map_io, .map_io = at91sam9260_map_io,
.default_irq_priority = at91sam9260_default_irq_priority, .default_irq_priority = at91sam9260_default_irq_priority,
...@@ -449,4 +454,5 @@ AT91_SOC_START(at91sam9260) ...@@ -449,4 +454,5 @@ AT91_SOC_START(at91sam9260)
.register_clocks = at91sam9260_register_clocks, .register_clocks = at91sam9260_register_clocks,
.register_devices = at91sam9260_register_devices, .register_devices = at91sam9260_register_devices,
.init = at91sam9260_initialize, .init = at91sam9260_initialize,
.init_time = at91sam9260_init_time,
AT91_SOC_END AT91_SOC_END
...@@ -399,6 +399,11 @@ static unsigned int at91sam9261_default_irq_priority[NR_AIC_IRQS] __initdata = { ...@@ -399,6 +399,11 @@ static unsigned int at91sam9261_default_irq_priority[NR_AIC_IRQS] __initdata = {
0, /* Advanced Interrupt Controller */ 0, /* Advanced Interrupt Controller */
}; };
static void __init at91sam9261_init_time(void)
{
at91sam926x_pit_init();
}
AT91_SOC_START(at91sam9261) AT91_SOC_START(at91sam9261)
.map_io = at91sam9261_map_io, .map_io = at91sam9261_map_io,
.default_irq_priority = at91sam9261_default_irq_priority, .default_irq_priority = at91sam9261_default_irq_priority,
...@@ -408,4 +413,5 @@ AT91_SOC_START(at91sam9261) ...@@ -408,4 +413,5 @@ AT91_SOC_START(at91sam9261)
.register_clocks = at91sam9261_register_clocks, .register_clocks = at91sam9261_register_clocks,
.register_devices = at91sam9261_register_devices, .register_devices = at91sam9261_register_devices,
.init = at91sam9261_initialize, .init = at91sam9261_initialize,
.init_time = at91sam9261_init_time,
AT91_SOC_END AT91_SOC_END
...@@ -422,6 +422,11 @@ static unsigned int at91sam9263_default_irq_priority[NR_AIC_IRQS] __initdata = { ...@@ -422,6 +422,11 @@ static unsigned int at91sam9263_default_irq_priority[NR_AIC_IRQS] __initdata = {
0, /* Advanced Interrupt Controller (IRQ1) */ 0, /* Advanced Interrupt Controller (IRQ1) */
}; };
static void __init at91sam9263_init_time(void)
{
at91sam926x_pit_init();
}
AT91_SOC_START(at91sam9263) AT91_SOC_START(at91sam9263)
.map_io = at91sam9263_map_io, .map_io = at91sam9263_map_io,
.default_irq_priority = at91sam9263_default_irq_priority, .default_irq_priority = at91sam9263_default_irq_priority,
...@@ -430,4 +435,5 @@ AT91_SOC_START(at91sam9263) ...@@ -430,4 +435,5 @@ AT91_SOC_START(at91sam9263)
.register_clocks = at91sam9263_register_clocks, .register_clocks = at91sam9263_register_clocks,
.register_devices = at91sam9263_register_devices, .register_devices = at91sam9263_register_devices,
.init = at91sam9263_initialize, .init = at91sam9263_initialize,
.init_time = at91sam9263_init_time,
AT91_SOC_END AT91_SOC_END
...@@ -477,6 +477,11 @@ static unsigned int at91sam9g45_default_irq_priority[NR_AIC_IRQS] __initdata = { ...@@ -477,6 +477,11 @@ static unsigned int at91sam9g45_default_irq_priority[NR_AIC_IRQS] __initdata = {
0, /* Advanced Interrupt Controller (IRQ0) */ 0, /* Advanced Interrupt Controller (IRQ0) */
}; };
static void __init at91sam9g45_init_time(void)
{
at91sam926x_pit_init();
}
AT91_SOC_START(at91sam9g45) AT91_SOC_START(at91sam9g45)
.map_io = at91sam9g45_map_io, .map_io = at91sam9g45_map_io,
.default_irq_priority = at91sam9g45_default_irq_priority, .default_irq_priority = at91sam9g45_default_irq_priority,
...@@ -485,4 +490,5 @@ AT91_SOC_START(at91sam9g45) ...@@ -485,4 +490,5 @@ AT91_SOC_START(at91sam9g45)
.register_clocks = at91sam9g45_register_clocks, .register_clocks = at91sam9g45_register_clocks,
.register_devices = at91sam9g45_register_devices, .register_devices = at91sam9g45_register_devices,
.init = at91sam9g45_initialize, .init = at91sam9g45_initialize,
.init_time = at91sam9g45_init_time,
AT91_SOC_END AT91_SOC_END
...@@ -410,6 +410,11 @@ static unsigned int at91sam9rl_default_irq_priority[NR_AIC_IRQS] __initdata = { ...@@ -410,6 +410,11 @@ static unsigned int at91sam9rl_default_irq_priority[NR_AIC_IRQS] __initdata = {
0, /* Advanced Interrupt Controller */ 0, /* Advanced Interrupt Controller */
}; };
static void __init at91sam9rl_init_time(void)
{
at91sam926x_pit_init();
}
AT91_SOC_START(at91sam9rl) AT91_SOC_START(at91sam9rl)
.map_io = at91sam9rl_map_io, .map_io = at91sam9rl_map_io,
.default_irq_priority = at91sam9rl_default_irq_priority, .default_irq_priority = at91sam9rl_default_irq_priority,
...@@ -420,4 +425,5 @@ AT91_SOC_START(at91sam9rl) ...@@ -420,4 +425,5 @@ AT91_SOC_START(at91sam9rl)
#endif #endif
.register_devices = at91sam9rl_register_devices, .register_devices = at91sam9rl_register_devices,
.init = at91sam9rl_initialize, .init = at91sam9rl_initialize,
.init_time = at91sam9rl_init_time,
AT91_SOC_END AT91_SOC_END
...@@ -213,7 +213,7 @@ static void __init afeb9260_board_init(void) ...@@ -213,7 +213,7 @@ static void __init afeb9260_board_init(void)
MACHINE_START(AFEB9260, "Custom afeb9260 board") MACHINE_START(AFEB9260, "Custom afeb9260 board")
/* Maintainer: Sergey Lapin <slapin@ossfans.org> */ /* Maintainer: Sergey Lapin <slapin@ossfans.org> */
.init_time = at91sam926x_pit_init, .init_time = at91_init_time,
.map_io = at91_map_io, .map_io = at91_map_io,
.handle_irq = at91_aic_handle_irq, .handle_irq = at91_aic_handle_irq,
.init_early = afeb9260_init_early, .init_early = afeb9260_init_early,
......
...@@ -190,7 +190,7 @@ static void __init cam60_board_init(void) ...@@ -190,7 +190,7 @@ static void __init cam60_board_init(void)
MACHINE_START(CAM60, "KwikByte CAM60") MACHINE_START(CAM60, "KwikByte CAM60")
/* Maintainer: KwikByte */ /* Maintainer: KwikByte */
.init_time = at91sam926x_pit_init, .init_time = at91_init_time,
.map_io = at91_map_io, .map_io = at91_map_io,
.handle_irq = at91_aic_handle_irq, .handle_irq = at91_aic_handle_irq,
.init_early = cam60_init_early, .init_early = cam60_init_early,
......
...@@ -377,7 +377,7 @@ MACHINE_START(CPUAT9260, "Eukrea CPU9260") ...@@ -377,7 +377,7 @@ MACHINE_START(CPUAT9260, "Eukrea CPU9260")
MACHINE_START(CPUAT9G20, "Eukrea CPU9G20") MACHINE_START(CPUAT9G20, "Eukrea CPU9G20")
#endif #endif
/* Maintainer: Eric Benard - EUKREA Electromatique */ /* Maintainer: Eric Benard - EUKREA Electromatique */
.init_time = at91sam926x_pit_init, .init_time = at91_init_time,
.map_io = at91_map_io, .map_io = at91_map_io,
.handle_irq = at91_aic_handle_irq, .handle_irq = at91_aic_handle_irq,
.init_early = cpu9krea_init_early, .init_early = cpu9krea_init_early,
......
...@@ -162,7 +162,7 @@ static void __init flexibity_board_init(void) ...@@ -162,7 +162,7 @@ static void __init flexibity_board_init(void)
MACHINE_START(FLEXIBITY, "Flexibity Connect") MACHINE_START(FLEXIBITY, "Flexibity Connect")
/* Maintainer: Maxim Osipov */ /* Maintainer: Maxim Osipov */
.init_time = at91sam926x_pit_init, .init_time = at91_init_time,
.map_io = at91_map_io, .map_io = at91_map_io,
.handle_irq = at91_aic_handle_irq, .handle_irq = at91_aic_handle_irq,
.init_early = flexibity_init_early, .init_early = flexibity_init_early,
......
...@@ -263,7 +263,7 @@ static void __init foxg20_board_init(void) ...@@ -263,7 +263,7 @@ static void __init foxg20_board_init(void)
MACHINE_START(ACMENETUSFOXG20, "Acme Systems srl FOX Board G20") MACHINE_START(ACMENETUSFOXG20, "Acme Systems srl FOX Board G20")
/* Maintainer: Sergio Tanzilli */ /* Maintainer: Sergio Tanzilli */
.init_time = at91sam926x_pit_init, .init_time = at91_init_time,
.map_io = at91_map_io, .map_io = at91_map_io,
.handle_irq = at91_aic_handle_irq, .handle_irq = at91_aic_handle_irq,
.init_early = foxg20_init_early, .init_early = foxg20_init_early,
......
...@@ -576,7 +576,7 @@ static void __init gsia18s_board_init(void) ...@@ -576,7 +576,7 @@ static void __init gsia18s_board_init(void)
} }
MACHINE_START(GSIA18S, "GS_IA18_S") MACHINE_START(GSIA18S, "GS_IA18_S")
.init_time = at91sam926x_pit_init, .init_time = at91_init_time,
.map_io = at91_map_io, .map_io = at91_map_io,
.handle_irq = at91_aic_handle_irq, .handle_irq = at91_aic_handle_irq,
.init_early = gsia18s_init_early, .init_early = gsia18s_init_early,
......
...@@ -219,7 +219,7 @@ static void __init pcontrol_g20_board_init(void) ...@@ -219,7 +219,7 @@ static void __init pcontrol_g20_board_init(void)
MACHINE_START(PCONTROL_G20, "PControl G20") MACHINE_START(PCONTROL_G20, "PControl G20")
/* Maintainer: pgsellmann@portner-elektronik.at */ /* Maintainer: pgsellmann@portner-elektronik.at */
.init_time = at91sam926x_pit_init, .init_time = at91_init_time,
.map_io = at91_map_io, .map_io = at91_map_io,
.handle_irq = at91_aic_handle_irq, .handle_irq = at91_aic_handle_irq,
.init_early = pcontrol_g20_init_early, .init_early = pcontrol_g20_init_early,
......
...@@ -221,7 +221,7 @@ static void __init ek_board_init(void) ...@@ -221,7 +221,7 @@ static void __init ek_board_init(void)
MACHINE_START(SAM9_L9260, "Olimex SAM9-L9260") MACHINE_START(SAM9_L9260, "Olimex SAM9-L9260")
/* Maintainer: Olimex */ /* Maintainer: Olimex */
.init_time = at91sam926x_pit_init, .init_time = at91_init_time,
.map_io = at91_map_io, .map_io = at91_map_io,
.handle_irq = at91_aic_handle_irq, .handle_irq = at91_aic_handle_irq,
.init_early = ek_init_early, .init_early = ek_init_early,
......
...@@ -345,7 +345,7 @@ static void __init ek_board_init(void) ...@@ -345,7 +345,7 @@ static void __init ek_board_init(void)
MACHINE_START(AT91SAM9260EK, "Atmel AT91SAM9260-EK") MACHINE_START(AT91SAM9260EK, "Atmel AT91SAM9260-EK")
/* Maintainer: Atmel */ /* Maintainer: Atmel */
.init_time = at91sam926x_pit_init, .init_time = at91_init_time,
.map_io = at91_map_io, .map_io = at91_map_io,
.handle_irq = at91_aic_handle_irq, .handle_irq = at91_aic_handle_irq,
.init_early = ek_init_early, .init_early = ek_init_early,
......
...@@ -604,7 +604,7 @@ static void __init ek_board_init(void) ...@@ -604,7 +604,7 @@ static void __init ek_board_init(void)
MACHINE_START(AT91SAM9261EK, "Atmel AT91SAM9261-EK") MACHINE_START(AT91SAM9261EK, "Atmel AT91SAM9261-EK")
/* Maintainer: Atmel */ /* Maintainer: Atmel */
.init_time = at91sam926x_pit_init, .init_time = at91_init_time,
.map_io = at91_map_io, .map_io = at91_map_io,
.handle_irq = at91_aic_handle_irq, .handle_irq = at91_aic_handle_irq,
.init_early = ek_init_early, .init_early = ek_init_early,
...@@ -614,7 +614,7 @@ MACHINE_END ...@@ -614,7 +614,7 @@ MACHINE_END
MACHINE_START(AT91SAM9G10EK, "Atmel AT91SAM9G10-EK") MACHINE_START(AT91SAM9G10EK, "Atmel AT91SAM9G10-EK")
/* Maintainer: Atmel */ /* Maintainer: Atmel */
.init_time = at91sam926x_pit_init, .init_time = at91_init_time,
.map_io = at91_map_io, .map_io = at91_map_io,
.handle_irq = at91_aic_handle_irq, .handle_irq = at91_aic_handle_irq,
.init_early = ek_init_early, .init_early = ek_init_early,
......
...@@ -484,7 +484,7 @@ static void __init ek_board_init(void) ...@@ -484,7 +484,7 @@ static void __init ek_board_init(void)
MACHINE_START(AT91SAM9263EK, "Atmel AT91SAM9263-EK") MACHINE_START(AT91SAM9263EK, "Atmel AT91SAM9263-EK")
/* Maintainer: Atmel */ /* Maintainer: Atmel */
.init_time = at91sam926x_pit_init, .init_time = at91_init_time,
.map_io = at91_map_io, .map_io = at91_map_io,
.handle_irq = at91_aic_handle_irq, .handle_irq = at91_aic_handle_irq,
.init_early = ek_init_early, .init_early = ek_init_early,
......
...@@ -410,7 +410,7 @@ static void __init ek_board_init(void) ...@@ -410,7 +410,7 @@ static void __init ek_board_init(void)
MACHINE_START(AT91SAM9G20EK, "Atmel AT91SAM9G20-EK") MACHINE_START(AT91SAM9G20EK, "Atmel AT91SAM9G20-EK")
/* Maintainer: Atmel */ /* Maintainer: Atmel */
.init_time = at91sam926x_pit_init, .init_time = at91_init_time,
.map_io = at91_map_io, .map_io = at91_map_io,
.handle_irq = at91_aic_handle_irq, .handle_irq = at91_aic_handle_irq,
.init_early = ek_init_early, .init_early = ek_init_early,
...@@ -420,7 +420,7 @@ MACHINE_END ...@@ -420,7 +420,7 @@ MACHINE_END
MACHINE_START(AT91SAM9G20EK_2MMC, "Atmel AT91SAM9G20-EK 2 MMC Slot Mod") MACHINE_START(AT91SAM9G20EK_2MMC, "Atmel AT91SAM9G20-EK 2 MMC Slot Mod")
/* Maintainer: Atmel */ /* Maintainer: Atmel */
.init_time = at91sam926x_pit_init, .init_time = at91_init_time,
.map_io = at91_map_io, .map_io = at91_map_io,
.handle_irq = at91_aic_handle_irq, .handle_irq = at91_aic_handle_irq,
.init_early = ek_init_early, .init_early = ek_init_early,
......
...@@ -518,7 +518,7 @@ static void __init ek_board_init(void) ...@@ -518,7 +518,7 @@ static void __init ek_board_init(void)
MACHINE_START(AT91SAM9M10G45EK, "Atmel AT91SAM9M10G45-EK") MACHINE_START(AT91SAM9M10G45EK, "Atmel AT91SAM9M10G45-EK")
/* Maintainer: Atmel */ /* Maintainer: Atmel */
.init_time = at91sam926x_pit_init, .init_time = at91_init_time,
.map_io = at91_map_io, .map_io = at91_map_io,
.handle_irq = at91_aic_handle_irq, .handle_irq = at91_aic_handle_irq,
.init_early = ek_init_early, .init_early = ek_init_early,
......
...@@ -324,7 +324,7 @@ static void __init ek_board_init(void) ...@@ -324,7 +324,7 @@ static void __init ek_board_init(void)
MACHINE_START(AT91SAM9RLEK, "Atmel AT91SAM9RL-EK") MACHINE_START(AT91SAM9RLEK, "Atmel AT91SAM9RL-EK")
/* Maintainer: Atmel */ /* Maintainer: Atmel */
.init_time = at91sam926x_pit_init, .init_time = at91_init_time,
.map_io = at91_map_io, .map_io = at91_map_io,
.handle_irq = at91_aic_handle_irq, .handle_irq = at91_aic_handle_irq,
.init_early = ek_init_early, .init_early = ek_init_early,
......
...@@ -180,7 +180,7 @@ static void __init snapper9260_board_init(void) ...@@ -180,7 +180,7 @@ static void __init snapper9260_board_init(void)
} }
MACHINE_START(SNAPPER_9260, "Bluewater Systems Snapper 9260/9G20 module") MACHINE_START(SNAPPER_9260, "Bluewater Systems Snapper 9260/9G20 module")
.init_time = at91sam926x_pit_init, .init_time = at91_init_time,
.map_io = at91_map_io, .map_io = at91_map_io,
.handle_irq = at91_aic_handle_irq, .handle_irq = at91_aic_handle_irq,
.init_early = snapper9260_init_early, .init_early = snapper9260_init_early,
......
...@@ -275,7 +275,7 @@ static void __init stamp9g20evb_board_init(void) ...@@ -275,7 +275,7 @@ static void __init stamp9g20evb_board_init(void)
MACHINE_START(PORTUXG20, "taskit PortuxG20") MACHINE_START(PORTUXG20, "taskit PortuxG20")
/* Maintainer: taskit GmbH */ /* Maintainer: taskit GmbH */
.init_time = at91sam926x_pit_init, .init_time = at91_init_time,
.map_io = at91_map_io, .map_io = at91_map_io,
.handle_irq = at91_aic_handle_irq, .handle_irq = at91_aic_handle_irq,
.init_early = stamp9g20_init_early, .init_early = stamp9g20_init_early,
...@@ -285,7 +285,7 @@ MACHINE_END ...@@ -285,7 +285,7 @@ MACHINE_END
MACHINE_START(STAMP9G20, "taskit Stamp9G20") MACHINE_START(STAMP9G20, "taskit Stamp9G20")
/* Maintainer: taskit GmbH */ /* Maintainer: taskit GmbH */
.init_time = at91sam926x_pit_init, .init_time = at91_init_time,
.map_io = at91_map_io, .map_io = at91_map_io,
.handle_irq = at91_aic_handle_irq, .handle_irq = at91_aic_handle_irq,
.init_early = stamp9g20_init_early, .init_early = stamp9g20_init_early,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment