Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fe19a13 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://www.linux-watchdog.org/linux-watchdog 

Pull watchdog updates from Wim Van Sebroeck:
 "This includes some fixes and code improvements (like
  clk_prepare_enable and clk_disable_unprepare), conversion from the
  omap_wdt and twl4030_wdt drivers to the watchdog framework, addition
  of the SB8x0 chipset support and the DA9055 Watchdog driver and some
  OF support for the davinci_wdt driver."

* git://www.linux-watchdog.org/linux-watchdog: (22 commits)
  watchdog: mei: avoid oops in watchdog unregister code path
  watchdog: Orion: Fix possible null-deference in orion_wdt_probe
  watchdog: sp5100_tco: Add SB8x0 chipset support
  watchdog: davinci_wdt: add OF support
  watchdog: da9052: Fix invalid free of devm_ allocated data
  watchdog: twl4030_wdt: Change TWL4030_MODULE_PM_RECEIVER to TWL_MODULE_PM_RECEIVER
  watchdog: remove depends on CONFIG_EXPERIMENTAL
  watchdog: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
  watchdog: DA9055 Watchdog driver
  watchdog: omap_wdt: eliminate goto
  watchdog: omap_wdt: delete redundant platform_set_drvdata() calls
  watchdog: omap_wdt: convert to devm_ functions
  watchdog: omap_wdt: convert to new watchdog core
  watchdog: WatchDog Timer Driver Core: fix comment
  watchdog: s3c2410_wdt: use clk_prepare_enable and clk_disable_unprepare
  watchdog: imx2_wdt: Select the driver via ARCH_MXC
  watchdog: cpu5wdt.c: add missing del_timer call
  watchdog: hpwdt.c: Increase version string
  watchdog: Convert twl4030_wdt to watchdog core
  davinci_wdt: preparation for switch to common clock framework
  ...
parents 769cb858 d6921700

Documentation/devicetree/bindings/watchdog/davinci-wdt.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
DaVinci Watchdog Timer (WDT) Controller



Required properties:

- compatible : Should be "ti,davinci-wdt"

- reg : Should contain WDT registers location and length



Examples:



wdt: wdt@2320000 {

	compatible = "ti,davinci-wdt";

	reg = <0x02320000 0x80>;

};

drivers/misc/mei/wd.c

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ void mei_watchdog_register(struct mei_device *dev) 


void mei_watchdog_unregister(struct mei_device *dev)

{

	if (test_bit(WDOG_UNREGISTERED, &amt_wd_dev.status))

	if (watchdog_get_drvdata(&amt_wd_dev) == NULL)

		return;



	watchdog_set_drvdata(&amt_wd_dev, NULL);

drivers/watchdog/Kconfig

+15 −3
Original line number Diff line number Diff line
@@ -76,6 +76,16 @@ config DA9052_WATCHDOG 
          Alternatively say M to compile the driver as a module,

          which will be called da9052_wdt.



config DA9055_WATCHDOG

	tristate "Dialog Semiconductor DA9055 Watchdog"

	depends on MFD_DA9055

	help

	  If you say yes here you get support for watchdog on the Dialog

	  Semiconductor DA9055 PMIC.



	  This driver can also be built as a module.  If so, the module

	  will be called da9055_wdt.



config WM831X_WATCHDOG

	tristate "WM831x watchdog"

	depends on MFD_WM831X
@@ -232,6 +242,7 @@ config EP93XX_WATCHDOG 
config OMAP_WATCHDOG

	tristate "OMAP Watchdog"

	depends on ARCH_OMAP16XX || ARCH_OMAP2PLUS

	select WATCHDOG_CORE

	help

	  Support for TI OMAP1610/OMAP1710/OMAP2420/OMAP3430/OMAP4430 watchdog.  Say 'Y'

	  here to enable the OMAP1610/OMAP1710/OMAP2420/OMAP3430/OMAP4430 watchdog timer.
@@ -300,6 +311,7 @@ config COH901327_WATCHDOG 
config TWL4030_WATCHDOG

	tristate "TWL4030 Watchdog"

	depends on TWL4030_CORE

	select WATCHDOG_CORE

	help

	  Support for TI TWL4030 watchdog.  Say 'Y' here to enable the

	  watchdog timer support for TWL4030 chips.
@@ -342,7 +354,7 @@ config MAX63XX_WATCHDOG 


config IMX2_WDT

	tristate "IMX2+ Watchdog"

	depends on IMX_HAVE_PLATFORM_IMX2_WDT

	depends on ARCH_MXC

	help

	  This is the driver for the hardware watchdog

	  on the Freescale IMX2 and later processors.
@@ -431,7 +443,7 @@ config ALIM7101_WDT 


config F71808E_WDT

	tristate "Fintek F71808E, F71862FG, F71869, F71882FG and F71889FG Watchdog"

	depends on X86 && EXPERIMENTAL

	depends on X86

	help

	  This is the driver for the hardware watchdog on the Fintek

	  F71808E, F71862FG, F71869, F71882FG and F71889FG Super I/O controllers.
@@ -622,7 +634,7 @@ config IT8712F_WDT 


config IT87_WDT

	tristate "IT87 Watchdog Timer"

	depends on X86 && EXPERIMENTAL

	depends on X86

	---help---

	  This is the driver for the hardware watchdog on the ITE IT8702,

	  IT8712, IT8716, IT8718, IT8720, IT8721, IT8726 and IT8728

drivers/watchdog/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ obj-$(CONFIG_XEN_WDT) += xen_wdt.o 


# Architecture Independent

obj-$(CONFIG_DA9052_WATCHDOG) += da9052_wdt.o

obj-$(CONFIG_DA9055_WATCHDOG) += da9055_wdt.o

obj-$(CONFIG_WM831X_WATCHDOG) += wm831x_wdt.o

obj-$(CONFIG_WM8350_WATCHDOG) += wm8350_wdt.o

obj-$(CONFIG_MAX63XX_WATCHDOG) += max63xx_wdt.o

drivers/watchdog/ath79_wdt.c

+2 −11
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ static void ath97_wdt_shutdown(struct platform_device *pdev) 
}



static struct platform_driver ath79_wdt_driver = {

	.probe		= ath79_wdt_probe,

	.remove		= ath79_wdt_remove,

	.shutdown	= ath97_wdt_shutdown,

	.driver		= {
@@ -292,17 +293,7 @@ static struct platform_driver ath79_wdt_driver = { 
	},

};



static int __init ath79_wdt_init(void)

{

	return platform_driver_probe(&ath79_wdt_driver, ath79_wdt_probe);

}

module_init(ath79_wdt_init);



static void __exit ath79_wdt_exit(void)

{

	platform_driver_unregister(&ath79_wdt_driver);

}

module_exit(ath79_wdt_exit);

module_platform_driver(ath79_wdt_driver);



MODULE_DESCRIPTION("Atheros AR71XX/AR724X/AR913X hardware watchdog driver");

MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org");