ARM: shmobile: r8a7779: Update early timer initialisation order
authorSimon Horman <horms+renesas@verge.net.au>
Thu, 8 Aug 2013 08:59:17 +0000 (17:59 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Fri, 30 Aug 2013 00:31:39 +0000 (09:31 +0900)
commit7658ea2fb57831c6836ffcfb20bcb84f3ff55dfb
treecdd98e20b4589f58f9f1dcca64789bfa12264d2a
parentab40900b70dc31a64f23b1b4dbb0917afb039775
ARM: shmobile: r8a7779: Update early timer initialisation order

a894fcc2d01a89e6fe3da0845a4d80a5312e1124 ("ARM: smp_twd: Divorce smp_twd
from local timer API") altered twd_local_timer_common_register() so that it
may make use of late_timer_init.

This is problematic on marzen with Magnus's recent patch "ARM: shmobile:
marzen: Switch to DT_MACHINE_START" which switches marzen around to enable
USE_OF and thus shmobile_timer_init(), which is registered as
late_time_init by shmobile_earlytimer_init() stops being a no-op.

As a work-around I have updated r8a7779_earlytimer_init() so that
shmobile_earlytimer_init() is called after r8a7779_register_twd().
Or in other words, the shmobile_earlytimer_init() setting of
late_time_init overwrites that of twd_local_timer_common_register().

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Magnus Damm <damm@opensource.se>
arch/arm/mach-shmobile/setup-r8a7779.c