ARM: omap2plus: select RESET_CONTROLLER

Message ID 20191216132132.3330811-1-arnd@arndb.de
State New
Headers show
Series
  • ARM: omap2plus: select RESET_CONTROLLER
Related show

Commit Message

Arnd Bergmann Dec. 16, 2019, 1:21 p.m.
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'

Fixes: 3e99cb214f03 ("soc: ti: add initial PRM driver with reset control support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 arch/arm/mach-omap2/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
2.20.0

Comments

Tony Lindgren Dec. 16, 2019, 2:59 p.m. | #1
* Arnd Bergmann <arnd@arndb.de> [191216 13:22]:
> 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'

> 

> 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>


> ---

>  arch/arm/mach-omap2/Kconfig | 3 ++-

>  1 file changed, 2 insertions(+), 1 deletion(-)

> 

> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig

> index fe0f82efb1de..639bc38567a7 100644

> --- a/arch/arm/mach-omap2/Kconfig

> +++ b/arch/arm/mach-omap2/Kconfig

> @@ -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

>  

> -- 

> 2.20.0

>

Patch

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index fe0f82efb1de..639bc38567a7 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -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