GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-29 18:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Linus Torvalds 2016-02-05 11:20:15 -08:00
commit ed1741b77c
4 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/watchdog/Kconfig
View file

@ -145,7 +145,8 @@ config MENF21BMC_WATCHDOG
config TANGOX_WATCHDOG config TANGOX_WATCHDOG
tristate "Sigma Designs SMP86xx/SMP87xx watchdog" tristate "Sigma Designs SMP86xx/SMP87xx watchdog"
select WATCHDOG_CORE select WATCHDOG_CORE
depends on ARCH_TANGOX || COMPILE_TEST depends on ARCH_TANGO || COMPILE_TEST
depends on HAS_IOMEM
help help
Support for the watchdog in Sigma Designs SMP86xx (tango3) Support for the watchdog in Sigma Designs SMP86xx (tango3)
and SMP87xx (tango4) family chips. and SMP87xx (tango4) family chips.
@ -618,6 +619,7 @@ config DIGICOLOR_WATCHDOG
config LPC18XX_WATCHDOG config LPC18XX_WATCHDOG
tristate "LPC18xx/43xx Watchdog" tristate "LPC18xx/43xx Watchdog"
depends on ARCH_LPC18XX || COMPILE_TEST depends on ARCH_LPC18XX || COMPILE_TEST
depends on HAS_IOMEM
select WATCHDOG_CORE select WATCHDOG_CORE
help help
Say Y here if to include support for the watchdog timer Say Y here if to include support for the watchdog timer
@ -1374,6 +1376,7 @@ config BCM_KONA_WDT_DEBUG
config BCM7038_WDT config BCM7038_WDT
tristate "BCM7038 Watchdog" tristate "BCM7038 Watchdog"
select WATCHDOG_CORE select WATCHDOG_CORE
depends on HAS_IOMEM
help help
Watchdog driver for the built-in hardware in Broadcom 7038 SoCs. Watchdog driver for the built-in hardware in Broadcom 7038 SoCs.
@ -1383,6 +1386,7 @@ config IMGPDC_WDT
tristate "Imagination Technologies PDC Watchdog Timer" tristate "Imagination Technologies PDC Watchdog Timer"
depends on HAS_IOMEM depends on HAS_IOMEM
depends on METAG || MIPS || COMPILE_TEST depends on METAG || MIPS || COMPILE_TEST
select WATCHDOG_CORE
help help
Driver for Imagination Technologies PowerDown Controller Driver for Imagination Technologies PowerDown Controller
Watchdog Timer. Watchdog Timer.

2
drivers/watchdog/max63xx_wdt.c
View file

@ -292,4 +292,4 @@ MODULE_PARM_DESC(nodelay,
"Force selection of a timeout setting without initial delay " "Force selection of a timeout setting without initial delay "
"(max6373/74 only, default=0)"); "(max6373/74 only, default=0)");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL v2");

3
drivers/watchdog/pcwd_usb.c
View file

@ -608,7 +608,7 @@ static int usb_pcwd_probe(struct usb_interface *interface,
struct usb_host_interface *iface_desc; struct usb_host_interface *iface_desc;
struct usb_endpoint_descriptor *endpoint; struct usb_endpoint_descriptor *endpoint;
struct usb_pcwd_private *usb_pcwd = NULL; struct usb_pcwd_private *usb_pcwd = NULL;
int pipe, maxp; int pipe;
int retval = -ENOMEM; int retval = -ENOMEM;
int got_fw_rev; int got_fw_rev;
unsigned char fw_rev_major, fw_rev_minor; unsigned char fw_rev_major, fw_rev_minor;
@ -641,7 +641,6 @@ static int usb_pcwd_probe(struct usb_interface *interface,
/* get a handle to the interrupt data pipe */ /* get a handle to the interrupt data pipe */
pipe = usb_rcvintpipe(udev, endpoint->bEndpointAddress); pipe = usb_rcvintpipe(udev, endpoint->bEndpointAddress);
maxp = usb_maxpacket(udev, pipe, usb_pipeout(pipe));
/* allocate memory for our device and initialize it */ /* allocate memory for our device and initialize it */
usb_pcwd = kzalloc(sizeof(struct usb_pcwd_private), GFP_KERNEL); usb_pcwd = kzalloc(sizeof(struct usb_pcwd_private), GFP_KERNEL);

5
drivers/watchdog/sp805_wdt.c
View file

@ -139,12 +139,11 @@ static int wdt_config(struct watchdog_device *wdd, bool ping)
writel_relaxed(UNLOCK, wdt->base + WDTLOCK); writel_relaxed(UNLOCK, wdt->base + WDTLOCK);
writel_relaxed(wdt->load_val, wdt->base + WDTLOAD); writel_relaxed(wdt->load_val, wdt->base + WDTLOAD);
if (!ping) {
writel_relaxed(INT_MASK, wdt->base + WDTINTCLR); writel_relaxed(INT_MASK, wdt->base + WDTINTCLR);
if (!ping)
writel_relaxed(INT_ENABLE | RESET_ENABLE, wdt->base + writel_relaxed(INT_ENABLE | RESET_ENABLE, wdt->base +
WDTCONTROL); WDTCONTROL);
}
writel_relaxed(LOCK, wdt->base + WDTLOCK); writel_relaxed(LOCK, wdt->base + WDTLOCK);