tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge git://www.linux-watchdog.org/linux-watchdog

Pull watchdog fixes from Wim Van Sebroeck:
"This fixes several Kconfig dependencies, a compilation warning in
pcwd_usb, a failure to abort the sp805 wdt after a ping and the
max63xx wdt's MODULE_LICENSE"

* git://www.linux-watchdog.org/linux-watchdog:
watchdog: Fix dependencies for !HAS_IOMEM archs
watchdog: imgdpc: select WATCHDOG_CORE
watchdog: tango: rename ARCH_TANGOX to ARCH_TANGO
watchdog: pcwd_usb: fix compilation warning
watchdog: sp805: ping fails to abort wdt reset
watchdog: max63xx: make module's license marker match the header

Linus Torvalds ed1741b7 df48ab3c

+9 -7
+5 -1
drivers/watchdog/Kconfig
··· 145 145 config TANGOX_WATCHDOG 146 146 tristate "Sigma Designs SMP86xx/SMP87xx watchdog" 147 147 select WATCHDOG_CORE 148 - depends on ARCH_TANGOX || COMPILE_TEST 148 + depends on ARCH_TANGO || COMPILE_TEST 149 + depends on HAS_IOMEM 149 150 help 150 151 Support for the watchdog in Sigma Designs SMP86xx (tango3) 151 152 and SMP87xx (tango4) family chips. ··· 619 618 config LPC18XX_WATCHDOG 620 619 tristate "LPC18xx/43xx Watchdog" 621 620 depends on ARCH_LPC18XX || COMPILE_TEST 621 + depends on HAS_IOMEM 622 622 select WATCHDOG_CORE 623 623 help 624 624 Say Y here if to include support for the watchdog timer ··· 1376 1374 config BCM7038_WDT 1377 1375 tristate "BCM7038 Watchdog" 1378 1376 select WATCHDOG_CORE 1377 + depends on HAS_IOMEM 1379 1378 help 1380 1379 Watchdog driver for the built-in hardware in Broadcom 7038 SoCs. 1381 1380 ··· 1386 1383 tristate "Imagination Technologies PDC Watchdog Timer" 1387 1384 depends on HAS_IOMEM 1388 1385 depends on METAG || MIPS || COMPILE_TEST 1386 + select WATCHDOG_CORE 1389 1387 help 1390 1388 Driver for Imagination Technologies PowerDown Controller 1391 1389 Watchdog Timer.
+1 -1
drivers/watchdog/max63xx_wdt.c
··· 292 292 "Force selection of a timeout setting without initial delay " 293 293 "(max6373/74 only, default=0)"); 294 294 295 - MODULE_LICENSE("GPL"); 295 + MODULE_LICENSE("GPL v2");
+1 -2
drivers/watchdog/pcwd_usb.c
··· 608 608 struct usb_host_interface *iface_desc; 609 609 struct usb_endpoint_descriptor *endpoint; 610 610 struct usb_pcwd_private *usb_pcwd = NULL; 611 - int pipe, maxp; 611 + int pipe; 612 612 int retval = -ENOMEM; 613 613 int got_fw_rev; 614 614 unsigned char fw_rev_major, fw_rev_minor; ··· 641 641 642 642 /* get a handle to the interrupt data pipe */ 643 643 pipe = usb_rcvintpipe(udev, endpoint->bEndpointAddress); 644 - maxp = usb_maxpacket(udev, pipe, usb_pipeout(pipe)); 645 644 646 645 /* allocate memory for our device and initialize it */ 647 646 usb_pcwd = kzalloc(sizeof(struct usb_pcwd_private), GFP_KERNEL);
+2 -3
drivers/watchdog/sp805_wdt.c
··· 139 139 140 140 writel_relaxed(UNLOCK, wdt->base + WDTLOCK); 141 141 writel_relaxed(wdt->load_val, wdt->base + WDTLOAD); 142 + writel_relaxed(INT_MASK, wdt->base + WDTINTCLR); 142 143 143 - if (!ping) { 144 - writel_relaxed(INT_MASK, wdt->base + WDTINTCLR); 144 + if (!ping) 145 145 writel_relaxed(INT_ENABLE | RESET_ENABLE, wdt->base + 146 146 WDTCONTROL); 147 - } 148 147 149 148 writel_relaxed(LOCK, wdt->base + WDTLOCK); 150 149