Skip to contentSkip to conversation

ARM: sunxi: allow building without reset controller

PATCH New Arnd Bergmann 2 participants 2 messages May 26, 2014 – May 27, 2014

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm/Allwinner sunXi SoC support
lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
arch/arm/mach-sunxi/sunxi.c +2 -1
index ff2e6a4..3f9587b 100644
@@ -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();
 }
#1 lore raw

PATCH 1/1 ARM: sunxi: allow building without reset controller

Hi Arnd,

Quoted 7 lines · 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 <[email protected]>
Acked-by Maxime Ripard <[email protected]>

Can you apply it directly in arm-soc?

Thanks,
Maxime

Signature · 10 lines
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>