From 2d316b71f9109d0ee529c1227cf7fa568b6530c6 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 26 May 2014 17:14:57 +0200 Subject: [PATCH] ARM: sunxi: allow building without reset controller The sunxi reset controller code is only used with sun6i (a31). After the platform has been split up into per-soc options, it's now possible to build it without the reset controller code, so the base platform init must not call into the reset driver if that is turned off at compile time. Signed-off-by: Arnd Bergmann --- arch/arm/mach-sunxi/sunxi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c index ff2e6a404dabf..3f9587bb51f6f 100644 --- a/arch/arm/mach-sunxi/sunxi.c +++ b/arch/arm/mach-sunxi/sunxi.c @@ -35,7 +35,8 @@ extern void __init sun6i_reset_init(void); static void __init sun6i_timer_init(void) { of_clk_init(NULL); - sun6i_reset_init(); + if (IS_ENABLED(CONFIG_RESET_CONTROLLER)) + sun6i_reset_init(); clocksource_of_init(); } -- 2.39.5