* [PATCH] ARM: at91: fix board-rm9200-dt after sys_timer conversion
@ 2013-01-13 15:50 Joachim Eastwood
0 siblings, 0 replies; 3+ messages in thread
From: Joachim Eastwood @ 2013-01-13 15:50 UTC (permalink / raw)
To: linux-arm-kernel
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.
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
---
Hi Stephen,
Feel free to fold this fix into your patch if it's possible.
regards
Joachim Eastwood
arch/arm/mach-at91/board-rm9200-dt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-at91/board-rm9200-dt.c b/arch/arm/mach-at91/board-rm9200-dt.c
index 5f9ce3d..3fcb662 100644
--- a/arch/arm/mach-at91/board-rm9200-dt.c
+++ b/arch/arm/mach-at91/board-rm9200-dt.c
@@ -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,
--
1.8.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] ARM: at91: fix board-rm9200-dt after sys_timer conversion
@ 2013-01-14 17:42 Stephen Warren
2013-01-14 18:14 ` Olof Johansson
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Warren @ 2013-01-14 17:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Joachim Eastwood <manabian@gmail.com>
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.
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
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(-)
diff --git a/arch/arm/mach-at91/board-rm9200-dt.c b/arch/arm/mach-at91/board-rm9200-dt.c
index 5f9ce3d..3fcb662 100644
--- a/arch/arm/mach-at91/board-rm9200-dt.c
+++ b/arch/arm/mach-at91/board-rm9200-dt.c
@@ -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,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] ARM: at91: fix board-rm9200-dt after sys_timer conversion
2013-01-14 17:42 Stephen Warren
@ 2013-01-14 18:14 ` Olof Johansson
0 siblings, 0 replies; 3+ messages in thread
From: Olof Johansson @ 2013-01-14 18:14 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jan 14, 2013 at 10:42:22AM -0700, Stephen Warren wrote:
> From: Joachim Eastwood <manabian@gmail.com>
>
> 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.
>
> Signed-off-by: Joachim Eastwood <manabian@gmail.com>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
> Olof, Arnd, another fix for the timer-cleanup branch in arm-soc.
Applied to timer/cleanup. Thanks!
-Olof
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-01-14 18:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-13 15:50 [PATCH] ARM: at91: fix board-rm9200-dt after sys_timer conversion Joachim Eastwood
-- strict thread matches above, loose matches on Subject: below --
2013-01-14 17:42 Stephen Warren
2013-01-14 18:14 ` Olof Johansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).