ARM: davinci: select CONFIG_RESET_CONTROLLER
diff mbox series

Message ID 20191210195202.622734-1-arnd@arndb.de
State Mainlined
Commit 7afec66e2bf5683d8bfc812cc295313d1b8473bc
Headers show
Series
  • ARM: davinci: select CONFIG_RESET_CONTROLLER
Related show

Commit Message

Arnd Bergmann Dec. 10, 2019, 7:51 p.m. UTC
Selecting RESET_CONTROLLER is actually required, otherwise we
can get a link failure in the clock driver:

drivers/clk/davinci/psc.o: In function `__davinci_psc_register_clocks':
psc.c:(.text+0x9a0): undefined reference to `devm_reset_controller_register'
drivers/clk/davinci/psc-da850.o: In function `da850_psc0_init':
psc-da850.c:(.text+0x24): undefined reference to `reset_controller_add_lookup'

Fixes: f962396ce292 ("ARM: davinci: support multiplatform build for ARM v5")
Cc: <stable@vger.kernel.org> # v5.4
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 arch/arm/mach-davinci/Kconfig | 1 +
 1 file changed, 1 insertion(+)

Comments

Bartosz Golaszewski Dec. 11, 2019, 9:14 a.m. UTC | #1
wt., 10 gru 2019 o 20:52 Arnd Bergmann <arnd@arndb.de> napisał(a):
>
> Selecting RESET_CONTROLLER is actually required, otherwise we
> can get a link failure in the clock driver:
>
> drivers/clk/davinci/psc.o: In function `__davinci_psc_register_clocks':
> psc.c:(.text+0x9a0): undefined reference to `devm_reset_controller_register'
> drivers/clk/davinci/psc-da850.o: In function `da850_psc0_init':
> psc-da850.c:(.text+0x24): undefined reference to `reset_controller_add_lookup'
>
> Fixes: f962396ce292 ("ARM: davinci: support multiplatform build for ARM v5")
> Cc: <stable@vger.kernel.org> # v5.4
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  arch/arm/mach-davinci/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
>

Reviewed-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Philipp Zabel Dec. 11, 2019, 10 a.m. UTC | #2
On Wed, 2019-12-11 at 10:14 +0100, Bartosz Golaszewski wrote:
> wt., 10 gru 2019 o 20:52 Arnd Bergmann <arnd@arndb.de> napisał(a):
> > Selecting RESET_CONTROLLER is actually required, otherwise we
> > can get a link failure in the clock driver:
> > 
> > drivers/clk/davinci/psc.o: In function `__davinci_psc_register_clocks':
> > psc.c:(.text+0x9a0): undefined reference to `devm_reset_controller_register'
> > drivers/clk/davinci/psc-da850.o: In function `da850_psc0_init':
> > psc-da850.c:(.text+0x24): undefined reference to `reset_controller_add_lookup'
> > 
> > Fixes: f962396ce292 ("ARM: davinci: support multiplatform build for ARM v5")
> > Cc: <stable@vger.kernel.org> # v5.4
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > ---
> >  arch/arm/mach-davinci/Kconfig | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> 
> Reviewed-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>

Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>

regards
Philipp
Sekhar Nori Dec. 11, 2019, 10:12 a.m. UTC | #3
Hi Arnd,

On 11/12/19 1:21 AM, Arnd Bergmann wrote:
> Selecting RESET_CONTROLLER is actually required, otherwise we
> can get a link failure in the clock driver:
> 
> drivers/clk/davinci/psc.o: In function `__davinci_psc_register_clocks':
> psc.c:(.text+0x9a0): undefined reference to `devm_reset_controller_register'
> drivers/clk/davinci/psc-da850.o: In function `da850_psc0_init':
> psc-da850.c:(.text+0x24): undefined reference to `reset_controller_add_lookup'
> 
> Fixes: f962396ce292 ("ARM: davinci: support multiplatform build for ARM v5")
> Cc: <stable@vger.kernel.org> # v5.4
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Assuming you are going to apply directly to ARM-SoC,

Acked-by: Sekhar Nori <nsekhar@ti.com>

Thanks,
Sekhar

> ---
>  arch/arm/mach-davinci/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
> index dd427bd2768c..02b180ad7245 100644
> --- a/arch/arm/mach-davinci/Kconfig
> +++ b/arch/arm/mach-davinci/Kconfig
> @@ -9,6 +9,7 @@ menuconfig ARCH_DAVINCI
>  	select PM_GENERIC_DOMAINS if PM
>  	select PM_GENERIC_DOMAINS_OF if PM && OF
>  	select REGMAP_MMIO
> +	select RESET_CONTROLLER
>  	select HAVE_IDE
>  	select PINCTRL_SINGLE
>  
> -- 
> 2.20.0
>
Pavel Machek Dec. 17, 2019, 10:45 a.m. UTC | #4
Hi!

> Selecting RESET_CONTROLLER is actually required, otherwise we
> can get a link failure in the clock driver:
> 
> drivers/clk/davinci/psc.o: In function `__davinci_psc_register_clocks':
> psc.c:(.text+0x9a0): undefined reference to `devm_reset_controller_register'
> drivers/clk/davinci/psc-da850.o: In function `da850_psc0_init':
> psc-da850.c:(.text+0x24): undefined reference to
> `reset_controller_add_lookup'

Does omap need similar handing in 5.5-rc1?

  LD      .tmp_vmlinux1
  drivers/soc/ti/omap_prm.o: In function `omap_prm_probe':
  omap_prm.c:(.text+0x4d0): undefined reference to
  `devm_reset_controller_register'
  /data/fast/l/k/Makefile:1077: recipe for target 'vmlinux' failed
  make[1]: *** [vmlinux] Error 1

Enabling reset controller seems to help::

Reset Controller Support (RESET_CONTROLLER) [Y/n/?] (NEW)
  TI SYSCON Reset Driver (RESET_TI_SYSCON) [N/m/y/?] (NEW)

Best regards,
									Pavel
Tony Lindgren Dec. 17, 2019, 4:46 p.m. UTC | #5
* Pavel Machek <pavel@ucw.cz> [191217 10:46]:
> Hi!
> 
> > Selecting RESET_CONTROLLER is actually required, otherwise we
> > can get a link failure in the clock driver:
> > 
> > drivers/clk/davinci/psc.o: In function `__davinci_psc_register_clocks':
> > psc.c:(.text+0x9a0): undefined reference to `devm_reset_controller_register'
> > drivers/clk/davinci/psc-da850.o: In function `da850_psc0_init':
> > psc-da850.c:(.text+0x24): undefined reference to
> > `reset_controller_add_lookup'
> 
> Does omap need similar handing in 5.5-rc1?
> 
>   LD      .tmp_vmlinux1
>   drivers/soc/ti/omap_prm.o: In function `omap_prm_probe':
>   omap_prm.c:(.text+0x4d0): undefined reference to
>   `devm_reset_controller_register'
>   /data/fast/l/k/Makefile:1077: recipe for target 'vmlinux' failed
>   make[1]: *** [vmlinux] Error 1
> 
> Enabling reset controller seems to help::
> 
> Reset Controller Support (RESET_CONTROLLER) [Y/n/?] (NEW)
>   TI SYSCON Reset Driver (RESET_TI_SYSCON) [N/m/y/?] (NEW)

Yes see the patch Arnd recently posted to do that.

Regards,

Tony
Pavel Machek Dec. 21, 2019, 4:20 p.m. UTC | #6
Hi!

> > > Selecting RESET_CONTROLLER is actually required, otherwise we
> > > can get a link failure in the clock driver:
> > > 
> > > drivers/clk/davinci/psc.o: In function `__davinci_psc_register_clocks':
> > > psc.c:(.text+0x9a0): undefined reference to `devm_reset_controller_register'
> > > drivers/clk/davinci/psc-da850.o: In function `da850_psc0_init':
> > > psc-da850.c:(.text+0x24): undefined reference to
> > > `reset_controller_add_lookup'
> > 
> > Does omap need similar handing in 5.5-rc1?
> > 
> >   LD      .tmp_vmlinux1
> >   drivers/soc/ti/omap_prm.o: In function `omap_prm_probe':
> >   omap_prm.c:(.text+0x4d0): undefined reference to
> >   `devm_reset_controller_register'
> >   /data/fast/l/k/Makefile:1077: recipe for target 'vmlinux' failed
> >   make[1]: *** [vmlinux] Error 1
> > 
> > Enabling reset controller seems to help::
> > 
> > Reset Controller Support (RESET_CONTROLLER) [Y/n/?] (NEW)
> >   TI SYSCON Reset Driver (RESET_TI_SYSCON) [N/m/y/?] (NEW)
> 
> Yes see the patch Arnd recently posted to do that.

Thanks for the hint and sorry for the noise.

Best regards,
									Pavel
Sekhar Nori Jan. 13, 2020, 12:02 p.m. UTC | #7
Hi Arnd,

On 11/12/19 3:42 PM, Sekhar Nori wrote:
> Hi Arnd,
> 
> On 11/12/19 1:21 AM, Arnd Bergmann wrote:
>> Selecting RESET_CONTROLLER is actually required, otherwise we
>> can get a link failure in the clock driver:
>>
>> drivers/clk/davinci/psc.o: In function `__davinci_psc_register_clocks':
>> psc.c:(.text+0x9a0): undefined reference to `devm_reset_controller_register'
>> drivers/clk/davinci/psc-da850.o: In function `da850_psc0_init':
>> psc-da850.c:(.text+0x24): undefined reference to `reset_controller_add_lookup'
>>
>> Fixes: f962396ce292 ("ARM: davinci: support multiplatform build for ARM v5")
>> Cc: <stable@vger.kernel.org> # v5.4
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> 
> Assuming you are going to apply directly to ARM-SoC,
> 
> Acked-by: Sekhar Nori <nsekhar@ti.com>

This is not yet in Linus's master. Let me know if I should collect it
and send a pull request.

Thanks,
Sekhar
Olof Johansson Jan. 16, 2020, 6:34 p.m. UTC | #8
On Mon, Jan 13, 2020 at 05:32:54PM +0530, Sekhar Nori wrote:
> Hi Arnd,
> 
> On 11/12/19 3:42 PM, Sekhar Nori wrote:
> > Hi Arnd,
> > 
> > On 11/12/19 1:21 AM, Arnd Bergmann wrote:
> >> Selecting RESET_CONTROLLER is actually required, otherwise we
> >> can get a link failure in the clock driver:
> >>
> >> drivers/clk/davinci/psc.o: In function `__davinci_psc_register_clocks':
> >> psc.c:(.text+0x9a0): undefined reference to `devm_reset_controller_register'
> >> drivers/clk/davinci/psc-da850.o: In function `da850_psc0_init':
> >> psc-da850.c:(.text+0x24): undefined reference to `reset_controller_add_lookup'
> >>
> >> Fixes: f962396ce292 ("ARM: davinci: support multiplatform build for ARM v5")
> >> Cc: <stable@vger.kernel.org> # v5.4
> >> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > 
> > Assuming you are going to apply directly to ARM-SoC,
> > 
> > Acked-by: Sekhar Nori <nsekhar@ti.com>
> 
> This is not yet in Linus's master. Let me know if I should collect it
> and send a pull request.

It's sitting in our fixes branch and should show up in mainline in not too
long.


-Olof

Patch
diff mbox series

diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
index dd427bd2768c..02b180ad7245 100644
--- a/arch/arm/mach-davinci/Kconfig
+++ b/arch/arm/mach-davinci/Kconfig
@@ -9,6 +9,7 @@  menuconfig ARCH_DAVINCI
 	select PM_GENERIC_DOMAINS if PM
 	select PM_GENERIC_DOMAINS_OF if PM && OF
 	select REGMAP_MMIO
+	select RESET_CONTROLLER
 	select HAVE_IDE
 	select PINCTRL_SINGLE