Skip to content

Commit

Permalink
ARM: imx: reset_controller may be disabled
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Arnd Bergmann committed May 2, 2013
1 parent 8b85143 commit 5c5f042
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion arch/arm/mach-imx/src.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5c5f042

Please sign in to comment.