Merge git://www.linux-watchdog.org/linux-watchdog
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 ...
No related branches found
No related tags found
Showing
- Documentation/devicetree/bindings/watchdog/marvel.txt 7 additions, 0 deletionsDocumentation/devicetree/bindings/watchdog/marvel.txt
- arch/powerpc/kernel/setup-common.c 0 additions, 27 deletionsarch/powerpc/kernel/setup-common.c
- arch/x86/platform/intel-mid/device_libs/Makefile 1 addition, 0 deletionsarch/x86/platform/intel-mid/device_libs/Makefile
- arch/x86/platform/intel-mid/device_libs/platform_wdt.c 72 additions, 0 deletionsarch/x86/platform/intel-mid/device_libs/platform_wdt.c
- drivers/watchdog/Kconfig 17 additions, 32 deletionsdrivers/watchdog/Kconfig
- drivers/watchdog/Makefile 1 addition, 2 deletionsdrivers/watchdog/Makefile
- drivers/watchdog/ath79_wdt.c 13 additions, 3 deletionsdrivers/watchdog/ath79_wdt.c
- drivers/watchdog/booke_wdt.c 33 additions, 18 deletionsdrivers/watchdog/booke_wdt.c
- drivers/watchdog/imx2_wdt.c 143 additions, 177 deletionsdrivers/watchdog/imx2_wdt.c
- drivers/watchdog/intel-mid_wdt.c 184 additions, 0 deletionsdrivers/watchdog/intel-mid_wdt.c
- drivers/watchdog/kempld_wdt.c 1 addition, 1 deletiondrivers/watchdog/kempld_wdt.c
- drivers/watchdog/of_xilinx_wdt.c 1 addition, 1 deletiondrivers/watchdog/of_xilinx_wdt.c
- drivers/watchdog/orion_wdt.c 190 additions, 23 deletionsdrivers/watchdog/orion_wdt.c
- drivers/watchdog/shwdt.c 0 additions, 2 deletionsdrivers/watchdog/shwdt.c
- drivers/watchdog/sp805_wdt.c 1 addition, 3 deletionsdrivers/watchdog/sp805_wdt.c
- drivers/watchdog/sunxi_wdt.c 11 additions, 11 deletionsdrivers/watchdog/sunxi_wdt.c
- drivers/watchdog/via_wdt.c 1 addition, 1 deletiondrivers/watchdog/via_wdt.c
- drivers/watchdog/w83627hf_wdt.c 12 additions, 3 deletionsdrivers/watchdog/w83627hf_wdt.c
- drivers/watchdog/w83697hf_wdt.c 0 additions, 460 deletionsdrivers/watchdog/w83697hf_wdt.c
- drivers/watchdog/w83697ug_wdt.c 0 additions, 397 deletionsdrivers/watchdog/w83697ug_wdt.c
Loading
Please register or sign in to comment