sunxi: spl: initialise timer before clocks
Recent changes in the H6 clock code added delay() calls into the SPL clock setup routine, which requires the timers to work. When compiling for AArch64, we are always using the Arm Generic Timer (aka. arch timer), which does not require further setup, hence having an empty timer_init() routine. However for 32-bit SoCs we use the Allwinner timers, which require some setup routine, and hence we need timer_init() to be called before clock_init(). Swap the order of the two calls, to be more robust when compiling the H6 clock code for AArch32 or when using the Allwinner timers for whatever reason. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com>
This commit is contained in:
@@ -476,8 +476,8 @@ void board_init_f(ulong dummy)
|
||||
/* Enable non-secure access to some peripherals */
|
||||
tzpc_init();
|
||||
|
||||
clock_init();
|
||||
timer_init();
|
||||
clock_init();
|
||||
gpio_init();
|
||||
|
||||
spl_init();
|
||||
|
||||
Reference in New Issue
Block a user