Skip to content

Commit

Permalink
ARM: sunxi: Register the A31 reset IP in init_time
Browse files Browse the repository at this point in the history
The A31 has a reset IP that maintains a few other IPs in reset by
default. Among these IPs are the UARTs, and most notably the timers. We
thus need to register the reset driver before initializing the timers so
that the reset timer can use the reset framework.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
  • Loading branch information
Maxime Ripard committed Nov 22, 2013
1 parent a85d80b commit 751b2ac
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions arch/arm/mach-sunxi/sunxi.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
* warranty of any kind, whether express or implied.
*/

#include <linux/clk-provider.h>
#include <linux/clocksource.h>
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/init.h>
Expand Down Expand Up @@ -132,8 +134,17 @@ static const char * const sun6i_board_dt_compat[] = {
NULL,
};

extern void __init sun6i_reset_init(void);
static void __init sun6i_timer_init(void)
{
of_clk_init(NULL);
sun6i_reset_init();
clocksource_of_init();
}

DT_MACHINE_START(SUN6I_DT, "Allwinner sun6i (A31) Family")
.init_machine = sunxi_dt_init,
.init_time = sun6i_timer_init,
.dt_compat = sun6i_board_dt_compat,
.restart = sun6i_restart,
MACHINE_END
Expand Down

0 comments on commit 751b2ac

Please sign in to comment.