[PATCH] ARM: sunxi: allow building without reset controller

[PATCH] ARM: sunxi: allow building without reset controller

[Arnd Bergmann]

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 ff2e6a4..3f9587b 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();
 }
 

[PATCH] ARM: sunxi: allow building without reset controller

[Maxime Ripard]

Hi Arnd,

On Mon, May 26, 2014 at 05:19:03PM +0200, Arnd Bergmann wrote:
> 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>

Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>

Can you apply it directly in arm-soc?

Thanks,
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140527/62394c7a/attachment.sig>