hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux-watchdog 5.5-fixes tag 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
 iEYEABECAAYFAl4TfScACgkQ+iyteGJfRsoijQCdFnULkdAE9A/5WHEVYifyvTXP
 G+IAn35oyiKEWscqKmu3fIMk5M0VxHm1
 =G7eS
 -----END PGP SIGNATURE-----

Merge tag 'linux-watchdog-5.5-fixes' of git://www.linux-watchdog.org/linux-watchdog

Pull watchdog fixes from Wim Van Sebroeck:
 - fix module aliases
 - fix potential build errors
 - fix missing conversion of imx7ulp_wdt_enable()
 - fix platform_get_irq() complaints
 - fix NCT6116D support

* tag 'linux-watchdog-5.5-fixes' of git://www.linux-watchdog.org/linux-watchdog:
  watchdog: orion: fix platform_get_irq() complaints
  watchdog: rn5t618_wdt: fix module aliases
  watchdog: tqmx86_wdt: Fix build error
  watchdog: max77620_wdt: fix potential build errors
  watchdog: imx7ulp: Fix missing conversion of imx7ulp_wdt_enable()
  watchdog: w83627hf_wdt: Fix support NCT6116D
This commit is contained in:
Linus Torvalds 2020-01-06 14:12:50 -08:00
parent ec7b3f5372 dcbce5fbcc
commit baf4dc8295
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/watchdog/Kconfig
View File

@ -687,6 +687,7 @@ config MAX63XX_WATCHDOG
config MAX77620_WATCHDOG config MAX77620_WATCHDOG
tristate "Maxim Max77620 Watchdog Timer" tristate "Maxim Max77620 Watchdog Timer"
depends on MFD_MAX77620 || COMPILE_TEST depends on MFD_MAX77620 || COMPILE_TEST
select WATCHDOG_CORE
help help
This is the driver for the Max77620 watchdog timer. This is the driver for the Max77620 watchdog timer.
Say 'Y' here to enable the watchdog timer support for Say 'Y' here to enable the watchdog timer support for
@ -1444,6 +1445,7 @@ config SMSC37B787_WDT
config TQMX86_WDT config TQMX86_WDT
tristate "TQ-Systems TQMX86 Watchdog Timer" tristate "TQ-Systems TQMX86 Watchdog Timer"
depends on X86 depends on X86
select WATCHDOG_CORE
help help
This is the driver for the hardware watchdog timer in the TQMX86 IO This is the driver for the hardware watchdog timer in the TQMX86 IO
controller found on some of their ComExpress Modules. controller found on some of their ComExpress Modules.

2
drivers/watchdog/imx7ulp_wdt.c
View File

@ -112,7 +112,7 @@ static int imx7ulp_wdt_restart(struct watchdog_device *wdog,
{ {
struct imx7ulp_wdt_device *wdt = watchdog_get_drvdata(wdog); struct imx7ulp_wdt_device *wdt = watchdog_get_drvdata(wdog);
imx7ulp_wdt_enable(wdt->base, true); imx7ulp_wdt_enable(wdog, true);
imx7ulp_wdt_set_timeout(&wdt->wdd, 1); imx7ulp_wdt_set_timeout(&wdt->wdd, 1);
/* wait for wdog to fire */ /* wait for wdog to fire */

4
drivers/watchdog/orion_wdt.c
View File

@ -602,7 +602,7 @@ static int orion_wdt_probe(struct platform_device *pdev)
set_bit(WDOG_HW_RUNNING, &dev->wdt.status); set_bit(WDOG_HW_RUNNING, &dev->wdt.status);
/* Request the IRQ only after the watchdog is disabled */ /* Request the IRQ only after the watchdog is disabled */
irq = platform_get_irq(pdev, 0); irq = platform_get_irq_optional(pdev, 0);
if (irq > 0) { if (irq > 0) {
/* /*
* Not all supported platforms specify an interrupt for the * Not all supported platforms specify an interrupt for the
@ -617,7 +617,7 @@ static int orion_wdt_probe(struct platform_device *pdev)
} }
/* Optional 2nd interrupt for pretimeout */ /* Optional 2nd interrupt for pretimeout */
irq = platform_get_irq(pdev, 1); irq = platform_get_irq_optional(pdev, 1);
if (irq > 0) { if (irq > 0) {
orion_wdt_info.options |= WDIOF_PRETIMEOUT; orion_wdt_info.options |= WDIOF_PRETIMEOUT;
ret = devm_request_irq(&pdev->dev, irq, orion_wdt_pre_irq, ret = devm_request_irq(&pdev->dev, irq, orion_wdt_pre_irq,

1
drivers/watchdog/rn5t618_wdt.c
View File

@ -188,6 +188,7 @@ static struct platform_driver rn5t618_wdt_driver = {
module_platform_driver(rn5t618_wdt_driver); module_platform_driver(rn5t618_wdt_driver);
MODULE_ALIAS("platform:rn5t618-wdt");
MODULE_AUTHOR("Beniamino Galvani <b.galvani@gmail.com>"); MODULE_AUTHOR("Beniamino Galvani <b.galvani@gmail.com>");
MODULE_DESCRIPTION("RN5T618 watchdog driver"); MODULE_DESCRIPTION("RN5T618 watchdog driver");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");

2
drivers/watchdog/w83627hf_wdt.c
View File

@ -420,7 +420,7 @@ static int wdt_find(int addr)
cr_wdt_csr = NCT6102D_WDT_CSR; cr_wdt_csr = NCT6102D_WDT_CSR;
break; break;
case NCT6116_ID: case NCT6116_ID:
ret = nct6102; ret = nct6116;
cr_wdt_timeout = NCT6102D_WDT_TIMEOUT; cr_wdt_timeout = NCT6102D_WDT_TIMEOUT;
cr_wdt_control = NCT6102D_WDT_CONTROL; cr_wdt_control = NCT6102D_WDT_CONTROL;
cr_wdt_csr = NCT6102D_WDT_CSR; cr_wdt_csr = NCT6102D_WDT_CSR;