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 <arnd@arndb.de>

diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
index ff2e6a404dabfaf1660f6a036581c31825b665fe..3f9587bb51f6fad27a41ff57ceb9aada64c4481b 100644 (file)
--- 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();
 }