]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
ARM: prima2: always enable reset controller
authorArnd Bergmann <arnd@arndb.de>
Sat, 28 Nov 2015 22:56:47 +0000 (23:56 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 26 Feb 2016 16:46:29 +0000 (17:46 +0100)
The atlas7 clock controller driver registers a reset controller
for itself, which causes a link error when the subsystem is
disabled:

drivers/built-in.o: In function `atlas7_clk_init':
drivers/clk/sirf/clk-atlas7.c:1681: undefined reference to `reset_controller_register'

As the clk driver does not have a Kconfig symbol for itself
but it always built-in when the platform is enabled, we have
to ensure that the reset controller subsystem is also built-in
in this case.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Fixes: 301c5d29402e ("clk: sirf: add CSR atlas7 clk and reset support")
arch/arm/mach-prima2/Kconfig

index f998eb1c698ec69bb18735c60ce4660f680db272..0cf4426183cff99718d63975dfcb01453b45f56b 100644 (file)
@@ -2,6 +2,7 @@ menuconfig ARCH_SIRF
        bool "CSR SiRF"
        depends on ARCH_MULTI_V7
        select ARCH_HAS_RESET_CONTROLLER
+       select RESET_CONTROLLER
        select ARCH_REQUIRE_GPIOLIB
        select GENERIC_IRQ_CHIP
        select NO_IOPORT_MAP