| From ef2b1d777d643af227a22309d8b79898b90b123c Mon Sep 17 00:00:00 2001 |
| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Sat, 28 Nov 2015 23:56:47 +0100 |
| Subject: ARM: prima2: always enable reset controller |
| |
| From: Arnd Bergmann <arnd@arndb.de> |
| |
| commit ef2b1d777d643af227a22309d8b79898b90b123c upstream. |
| |
| 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") |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/arm/mach-prima2/Kconfig | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/arch/arm/mach-prima2/Kconfig |
| +++ b/arch/arm/mach-prima2/Kconfig |
| @@ -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 |
