Skip to content
  • Linus Torvalds's avatar
    Merge git://www.linux-watchdog.org/linux-watchdog · 1e75a9f3
    Linus Torvalds authored
    Pull watchdog updates from Wim Van Sebroeck:
    
     - new drivers for: NI 903x/913x watchdog driver, WinSystems EBC-C384
       watchdog timer and ARM SBSA watchdog driver
    
     - Support for NCT6102D devices
    
     - Improvements of the generic watchdog framework (improve restart
       handler, make set_timeout optional, introduce infrastructure
       triggered keepalives, ...
    
     - improvements on the pnx4008 watchdog driver
    
     - several smaller fixes and improvements
    
    * git://www.linux-watchdog.org/linux-watchdog: (28 commits)
      watchdog: Ensure that wdd is not dereferenced if NULL
      watchdog: imx2: Convert to use infrastructure triggered keepalives
      watchdog: dw_wdt: Convert to use watchdog infrastructure
      watchdog: Add support for minimum time between heartbeats
      watchdog: Make stop function optional
      watchdog: Introduce WDOG_HW_RUNNING flag
      watchdog: Introduce hardware maximum heartbeat in watchdog core
      watchdog: Make set_timeout function optional
      arm: lpc32xx: remove restart handler
      arm: lpc32xx: phy3250 remove restart hook
      watchdog: pnx4008: restart: support "cmd" from userspace
      watchdog: pnx4008: add support for soft reset
      watchdog: pnx4008: add restart handler
      watchdog: pnx4008: update logging during power-on
      watchdog: tangox_wdt: test clock rate to avoid division by 0
      watchdog: atlas7_wdt: test clock rate to avoid division by 0
      watchdog: s3c2410_wdt: Add max and min timeout values
      Watchdog: introduce ARM SBSA watchdog driver
      Documentation: add sbsa-gwdt driver documentation
      watchdog: Add watchdog timer support for the WinSystems EBC-C384
      ...
    1e75a9f3