Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afba951e authored by Olof Johansson's avatar Olof Johansson
Browse files

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

arch/arm/mach-shmobile/setup-r8a7779.c

+1 −1
Original line number Diff line number Diff line
@@ -691,8 +691,8 @@ void __init __weak r8a7779_register_twd(void) { } 
void __init r8a7779_earlytimer_init(void)

{

	r8a7779_clock_init();

	shmobile_earlytimer_init();

	r8a7779_register_twd();

	shmobile_earlytimer_init();

}



void __init r8a7779_add_early_devices(void)