• Linus Torvalds's avatar
    Merge git://www.linux-watchdog.org/linux-watchdog · dfb94547
    Linus Torvalds authored
    Pull watchdog updates from Wim Van Sebroeck:
     "This contains:
       - addition of the Intel MID watchdog
       - removal of W83697HF and W83697UG drivers (code was merged into
         w83627hf_wdt driver)
       - addition of Armada 375/380 SoC support
       - conversion of imx2_wdt to regmap API and to watchdog core API
       - lots of other small improvements and fixes"
    
    [ Wim was also tagged by gmail as a spammer, but not delayed by days
      unlike Ben ]
    
    * git://www.linux-watchdog.org/linux-watchdog: (25 commits)
      x86: intel-mid: add watchdog platform code for Merrifield
      watchdog: add Intel MID watchdog driver support
      watchdog: sp805: Set watchdog_device->timeout from ->set_timeout()
      booke/watchdog: refine and clean up the codes
      watchdog: iop_wdt only builds for mach-iop13xx
      watchdog: Remove drivers for W83697HF and W83697UG
      watchdog: w83627hf_wdt: Add early_disable module parameter
      ARM: mvebu: Add A375/A380 watchdog binding documentation
      watchdog: orion: Add Armada 375/380 SoC support
      watchdog: orion: Introduce per-SoC enabled() function
      watchdog: orion: Introduce per-SoC stop() function
      watchdog: orion: Remove unneeded atomic access
      watchdog: orion: Introduce a SoC-specific RSTOUT mapping
      watchdog: orion: Move the register ioremap'ing to its own function
      watchdog: xilinx: Make of_device_id array const
      watchdog: imx2_wdt: convert to watchdog core api
      watchdog: imx2_wdt: convert to use regmap API.
      watchdog: imx2_wdt: Sort the header files alphabetically
      watchdog: ath79_wdt: switch to clk_prepare/clk_disable
      watchdog: ath79_wdt: avoid spurious restarts on AR934x
      ...
    dfb94547
setup-common.c 17.7 KB