瀏覽代碼

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>
Arnd Bergmann 11 年之前
父節點
當前提交
e58cf0193c
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      arch/arm/mach-sunxi/sunxi.c

+ 2 - 1
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();
 }