Commit afba951e authored by Olof Johansson's avatar Olof Johansson

Merge tag 'renesas-fixes3-for-v3.12' of...

Merge tag 'renesas-fixes3-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes

From Simon Horman:
Third Round of Renesas ARM based SoC fixes for v3.12

* Update early timer initialisation order of r8a7779 SoC

This resolves a regression introduced by
a894fcc2 ("ARM: smp_twd: Divorce smp_twd
from local timer API").

This problem was introduced in v3.10-rc2.

* tag 'renesas-fixes3-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7779: Update early timer initialisation order
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents d5ece937 7658ea2f
...@@ -691,8 +691,8 @@ void __init __weak r8a7779_register_twd(void) { } ...@@ -691,8 +691,8 @@ void __init __weak r8a7779_register_twd(void) { }
void __init r8a7779_earlytimer_init(void) void __init r8a7779_earlytimer_init(void)
{ {
r8a7779_clock_init(); r8a7779_clock_init();
shmobile_earlytimer_init();
r8a7779_register_twd(); r8a7779_register_twd();
shmobile_earlytimer_init();
} }
void __init r8a7779_add_early_devices(void) void __init r8a7779_add_early_devices(void)
......
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