diff mbox series

[-next] watchdog: fix mtk_wdt.c RESET_CONTROLLER build error

Message ID 77c1e557-4941-3806-2933-6c3583576390@infradead.org (mailing list archive)
State Accepted
Headers show
Series [-next] watchdog: fix mtk_wdt.c RESET_CONTROLLER build error | expand

Commit Message

Randy Dunlap Feb. 3, 2020, 4:10 p.m. UTC 
From: Randy Dunlap <rdunlap@infradead.org>

Fix build error when CONFIG_RESET_CONTROLLER is not set by
selecting RESET_CONTROLLER.

ld: drivers/watchdog/mtk_wdt.o: in function `mtk_wdt_probe':
mtk_wdt.c:(.text+0x3ec): undefined reference to `devm_reset_controller_register'

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Wim Van Sebroeck <wim@linux-watchdog.org>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: linux-watchdog@vger.kernel.org
---
 drivers/watchdog/Kconfig |    1 +
 1 file changed, 1 insertion(+)

Comments

Guenter Roeck Feb. 3, 2020, 5:49 p.m. UTC | #1 
On Mon, Feb 03, 2020 at 08:10:29AM -0800, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap@infradead.org>
> 
> Fix build error when CONFIG_RESET_CONTROLLER is not set by
> selecting RESET_CONTROLLER.
> 
> ld: drivers/watchdog/mtk_wdt.o: in function `mtk_wdt_probe':
> mtk_wdt.c:(.text+0x3ec): undefined reference to `devm_reset_controller_register'
> 
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: Wim Van Sebroeck <wim@linux-watchdog.org>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: linux-watchdog@vger.kernel.org

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  drivers/watchdog/Kconfig |    1 +
>  1 file changed, 1 insertion(+)
> 
> --- linux-next-20200203.orig/drivers/watchdog/Kconfig
> +++ linux-next-20200203/drivers/watchdog/Kconfig
> @@ -841,6 +841,7 @@ config MEDIATEK_WATCHDOG
>  	tristate "Mediatek SoCs watchdog support"
>  	depends on ARCH_MEDIATEK || COMPILE_TEST
>  	select WATCHDOG_CORE
> +	select RESET_CONTROLLER
>  	help
>  	  Say Y here to include support for the watchdog timer
>  	  in Mediatek SoCs.
> 
>
Nicolas Boichat Feb. 17, 2020, 11:55 a.m. UTC | #2 
On Tue, Feb 4, 2020 at 1:49 AM Guenter Roeck <linux@roeck-us.net> wrote:
>
> On Mon, Feb 03, 2020 at 08:10:29AM -0800, Randy Dunlap wrote:
> > From: Randy Dunlap <rdunlap@infradead.org>
> >
> > Fix build error when CONFIG_RESET_CONTROLLER is not set by
> > selecting RESET_CONTROLLER.
> >
> > ld: drivers/watchdog/mtk_wdt.o: in function `mtk_wdt_probe':
> > mtk_wdt.c:(.text+0x3ec): undefined reference to `devm_reset_controller_register'
> >
> > Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> > Cc: Wim Van Sebroeck <wim@linux-watchdog.org>
> > Cc: Guenter Roeck <linux@roeck-us.net>
> > Cc: Matthias Brugger <matthias.bgg@gmail.com>
> > Cc: linux-watchdog@vger.kernel.org
>
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>

Wim: Can you please help pick this patch? This seems necessary.

I'd also add this to the commit message:
Fixes: c254e103082b74e ("watchdog: mtk_wdt: mt8183: Add reset controller")

Thanks!


> > ---
> >  drivers/watchdog/Kconfig |    1 +
> >  1 file changed, 1 insertion(+)
> >
> > --- linux-next-20200203.orig/drivers/watchdog/Kconfig
> > +++ linux-next-20200203/drivers/watchdog/Kconfig
> > @@ -841,6 +841,7 @@ config MEDIATEK_WATCHDOG
> >       tristate "Mediatek SoCs watchdog support"
> >       depends on ARCH_MEDIATEK || COMPILE_TEST
> >       select WATCHDOG_CORE
> > +     select RESET_CONTROLLER
> >       help
> >         Say Y here to include support for the watchdog timer
> >         in Mediatek SoCs.
> >
> >
diff mbox series

Patch

--- linux-next-20200203.orig/drivers/watchdog/Kconfig
+++ linux-next-20200203/drivers/watchdog/Kconfig
@@ -841,6 +841,7 @@  config MEDIATEK_WATCHDOG
 	tristate "Mediatek SoCs watchdog support"
 	depends on ARCH_MEDIATEK || COMPILE_TEST
 	select WATCHDOG_CORE
+	select RESET_CONTROLLER
 	help
 	  Say Y here to include support for the watchdog timer
 	  in Mediatek SoCs.