ARM: omap2plus: select RESET_CONTROLLER
authorArnd Bergmann <arnd@arndb.de>
Mon, 16 Dec 2019 13:21:26 +0000 (14:21 +0100)
committerOlof Johansson <olof@lixom.net>
Wed, 8 Jan 2020 18:24:05 +0000 (10:24 -0800)
With the new omap_prm driver added unconditionally, omap2 builds
fail when the reset controller subsystem is disabled:

drivers/soc/ti/omap_prm.o: In function `omap_prm_probe':
omap_prm.c:(.text+0x2d4): undefined reference to `devm_reset_controller_register'

Link: https://lore.kernel.org/r/20191216132132.3330811-1-arnd@arndb.de
Fixes: 3e99cb214f03 ("soc: ti: add initial PRM driver with reset control support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/mach-omap2/Kconfig

index ad08d47..dca7d06 100644 (file)
@@ -95,6 +95,7 @@ config ARCH_OMAP2PLUS
        bool
        select ARCH_HAS_BANDGAP
        select ARCH_HAS_HOLES_MEMORYMODEL
+       select ARCH_HAS_RESET_CONTROLLER
        select ARCH_OMAP
        select CLKSRC_MMIO
        select GENERIC_IRQ_CHIP
@@ -105,11 +106,11 @@ config ARCH_OMAP2PLUS
        select OMAP_DM_TIMER
        select OMAP_GPMC
        select PINCTRL
+       select RESET_CONTROLLER
        select SOC_BUS
        select TI_SYSC
        select OMAP_IRQCHIP
        select CLKSRC_TI_32K
-       select ARCH_HAS_RESET_CONTROLLER
        help
          Systems based on OMAP2, OMAP3, OMAP4 or OMAP5