Skip to content
  • Linus Torvalds's avatar
    Merge git://www.linux-watchdog.org/linux-watchdog · 68b86a25
    Linus Torvalds authored
    Pull watchdog updates from Wim Van Sebroeck:
     "This contains:
       - fixes and improvements
       - devicetree bindings
       - conversion to watchdog generic framework of the following drivers:
            - booke_wdt
            - bcm47xx_wdt.c
            - at91sam9_wdt
       - Removal of old STMP3xxx driver
       - Addition of following new drivers:
            - new driver for STMP3xxx and i.MX23/28
            - Retu watchdog driver"
    
    * git://www.linux-watchdog.org/linux-watchdog: (30 commits)
      watchdog: sp805_wdt depends on ARM
      watchdog: davinci_wdt: update to devm_* API
      watchdog: davinci_wdt: use devm managed clk get
      watchdog: at91rm9200: add DT support
      watchdog: add timeout-sec property binding
      watchdog: at91sam9_wdt: Convert to use the watchdog framework
      watchdog: omap_wdt: Add option nowayout
      watchdog: core: dt: add support for the timeout-sec dt property
      watchdog: bcm47xx_wdt.c: add hard timer
      watchdog: bcm47xx_wdt.c: rename wdt_time to timeout
      watchdog: bcm47xx_wdt.c: rename ops methods
      watchdog: bcm47xx_wdt.c: use platform device
      watchdog: bcm47xx_wdt.c: convert to watchdog core api
      watchdog: Convert BookE watchdog driver to watchdog infrastructure
      watchdog: s3c2410_wdt: Use devm_* functions
      watchdog: remove old STMP3xxx driver
      watchdog: add new driver for STMP3xxx and i.MX23/28
      rtc: stmp3xxx: add wdt-accessor function
      watchdog: introduce retu_wdt driver
      watchdog: intel_scu_watchdog: fix Kconfig dependency
      ...
    68b86a25