Skip to contentSkip to conversation

ARM: at91: fix board-rm9200-dt after sys_timer conversion

PATCH New Stephen Warren 2 participants 2 messages Jan 14, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: at91: fix board-rm9200-dt after sys_timer conversion

From: Joachim Eastwood <[email protected]>

After "ARM: delete struct sys_timer" board-rm9200-dt fails compilation with the following error:

CC arch/arm/mach-at91/board-rm9200-dt.o
arch/arm/mach-at91/board-rm9200-dt.c:50:2: error: unknown field 'timer' specified in initializer arch/arm/mach-at91/board-rm9200-dt.c:50:13: error: 'at91rm9200_timer' undeclared here (not in a function) make[1]: *** [arch/arm/mach-at91/board-rm9200-dt.o] Error 1
make: *** [arch/arm/mach-at91] Error 2

This is a fall out from the timer conversion. Fix it by converting board-rm9200-dt to use new timer init function as well.

---
Olof, Arnd, another fix for the timer-cleanup branch in arm-soc.

 arch/arm/mach-at91/board-rm9200-dt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-at91/board-rm9200-dt.c +1 -1
index 5f9ce3d..3fcb662 100644
@@ -47,7 +47,7 @@ static const char *at91rm9200_dt_board_compat[] __initdata = {
 };
 
 DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200 (Device Tree)")
-	.timer		= &at91rm9200_timer,
+	.init_time      = at91rm9200_timer_init,
 	.map_io		= at91_map_io,
 	.handle_irq	= at91_aic_handle_irq,
 	.init_early	= at91rm9200_dt_initialize,
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 ARM: at91: fix board-rm9200-dt after sys_timer conversion

Quoted 11 lines · Stephen Warren

From: Joachim Eastwood <[email protected]>

After "ARM: delete struct sys_timer" board-rm9200-dt fails compilation with the following error:

CC arch/arm/mach-at91/board-rm9200-dt.o
arch/arm/mach-at91/board-rm9200-dt.c:50:2: error: unknown field 'timer' specified in initializer arch/arm/mach-at91/board-rm9200-dt.c:50:13: error: 'at91rm9200_timer' undeclared here (not in a function) make[1]: *** [arch/arm/mach-at91/board-rm9200-dt.o] Error 1
make: *** [arch/arm/mach-at91] Error 2

Quoted 8 lines

This is a fall out from the timer conversion. Fix it by converting board-rm9200-dt to use new timer init function as well.

---
Olof, Arnd, another fix for the timer-cleanup branch in arm-soc.

Applied to timer/cleanup. Thanks!

-Olof