summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sunxi
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-05-26 17:14:57 +0200
committerArnd Bergmann <arnd@arndb.de>2014-05-26 21:27:22 +0200
commite58cf0193c0f268d03d99e5757a0444d88cb5134 (patch)
treec615390db16daec85713a94bbc59fd115d23a2b4 /arch/arm/mach-sunxi
parentDocumentation: devicetree: arm: sort enable-method entries (diff)
downloadlinux-e58cf0193c0f268d03d99e5757a0444d88cb5134.tar.xz
linux-e58cf0193c0f268d03d99e5757a0444d88cb5134.zip
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>
Diffstat (limited to 'arch/arm/mach-sunxi')
-rw-r--r--arch/arm/mach-sunxi/sunxi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
index ff2e6a404dab..3f9587bb51f6 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();
}