ARM: imx: reset_controller may be disabled

The new reset controller API is optional, so if that is disabled,
we must not call it from platform code.

arch/arm/mach-imx/built-in.o: In function
 `imx_src_init': /git/arm-soc/arch/arm/mach-imx/src.c:144:
	undefined reference to `reset_controller_register'

Cc: Sascha Hauer <kernel@pengutronix.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/mach-imx/src.c b/arch/arm/mach-imx/src.c
index dec6411..4e0236c 100644 (file)
--- a/arch/arm/mach-imx/src.c
+++ b/arch/arm/mach-imx/src.c
@@ -138,7 +138,8 @@ void __init imx_src_init(void)
        WARN_ON(!src_base);
 
        imx_reset_controller.of_node = np;
-       reset_controller_register(&imx_reset_controller);
+       if (IS_ENABLED(CONFIG_RESET_CONTROLLER))
+               reset_controller_register(&imx_reset_controller);
 
        /*
         * force warm reset sources to generate cold reset