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 ...
No related branches found
No related tags found
Showing
- Documentation/devicetree/bindings/watchdog/davinci-wdt.txt 12 additions, 0 deletionsDocumentation/devicetree/bindings/watchdog/davinci-wdt.txt
- drivers/misc/mei/wd.c 1 addition, 1 deletiondrivers/misc/mei/wd.c
- drivers/watchdog/Kconfig 15 additions, 3 deletionsdrivers/watchdog/Kconfig
- drivers/watchdog/Makefile 1 addition, 0 deletionsdrivers/watchdog/Makefile
- drivers/watchdog/ath79_wdt.c 2 additions, 11 deletionsdrivers/watchdog/ath79_wdt.c
- drivers/watchdog/cpu5wdt.c 1 addition, 0 deletionsdrivers/watchdog/cpu5wdt.c
- drivers/watchdog/da9052_wdt.c 0 additions, 4 deletionsdrivers/watchdog/da9052_wdt.c
- drivers/watchdog/da9055_wdt.c 216 additions, 0 deletionsdrivers/watchdog/da9055_wdt.c
- drivers/watchdog/davinci_wdt.c 9 additions, 2 deletionsdrivers/watchdog/davinci_wdt.c
- drivers/watchdog/hpwdt.c 1 addition, 1 deletiondrivers/watchdog/hpwdt.c
- drivers/watchdog/mpcore_wdt.c 9 additions, 10 deletionsdrivers/watchdog/mpcore_wdt.c
- drivers/watchdog/omap_wdt.c 122 additions, 189 deletionsdrivers/watchdog/omap_wdt.c
- drivers/watchdog/orion_wdt.c 2 additions, 0 deletionsdrivers/watchdog/orion_wdt.c
- drivers/watchdog/s3c2410_wdt.c 3 additions, 3 deletionsdrivers/watchdog/s3c2410_wdt.c
- drivers/watchdog/sp5100_tco.c 271 additions, 50 deletionsdrivers/watchdog/sp5100_tco.c
- drivers/watchdog/sp5100_tco.h 35 additions, 11 deletionsdrivers/watchdog/sp5100_tco.h
- drivers/watchdog/sp805_wdt.c 2 additions, 9 deletionsdrivers/watchdog/sp805_wdt.c
- drivers/watchdog/twl4030_wdt.c 35 additions, 150 deletionsdrivers/watchdog/twl4030_wdt.c
- include/linux/watchdog.h 1 addition, 1 deletioninclude/linux/watchdog.h
Loading
Please register or sign in to comment