diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 15:42:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 15:42:42 -0700 |
| commit | 0b87da68a0f0a7bf7f7446cf64f92e672bd68ef8 (patch) | |
| tree | cc5ddfd411bc9c5d6fb828b86eba92f50294805e /drivers/watchdog/pnx4008_wdt.c | |
| parent | 59d0952b43552570e0f1c3ff91ebb16d4caec171 (diff) | |
| parent | cad19fa66469d2a745fae0c168833d5d33d64489 (diff) | |
| download | linux-next-0b87da68a0f0a7bf7f7446cf64f92e672bd68ef8.tar.gz | |
Merge git://www.linux-watchdog.org/linux-watchdog
Pull first set of watchdog updates from Wim Van Sebroeck:
"This pull contains:
- The removal of ixp2000_wdt
- The addition of ie6xx_wdt
- Some documentation fixes
- Small fixes and improvements
(Note: Part 2 will contain generic watchdog core changes + conversion
of some more drivers)"
* git://www.linux-watchdog.org/linux-watchdog:
Documentation/watchdog: Fix the file descriptor leak when no cmdline arg given
Documentation/watchdog: close the fd when cmdline arg given
Documentation/watchdog: Fix a small typo
watchdog: s3c2410_wdt: Set timeout to actually achieved timeout
watchdog: wm831x: Convert to gpio_request_one()
watchdog: via_wdt: depends on PCI
watchdog: ie6xx_wdt needs io.h
watchdog: ie6xx_wdt.c: fix printk format warning
watchdog: Add watchdog driver for Intel Atom E6XX
watchdog: it87_wdt: Add support for IT8728F watchdog.
watchdog: i6300esb: don't depend on X86
watchdog: Use module_pci_driver
watchdog: sch311x_wdt.c: Remove RESGEN
watchdog: s3c2410-wdt: Use of_match_ptr().
watchdog: Device tree support for pnx4008-wdt
watchdog: ar7_wdt.c: use devm_request_and_ioremap
watchdog: remove ixp2000 driver
watchdog: sp5100_tco.c: quiet sparse noise about using plain integer was NULL pointer
Diffstat (limited to 'drivers/watchdog/pnx4008_wdt.c')
| -rw-r--r-- | drivers/watchdog/pnx4008_wdt.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c index 6b8432f61d05..87722e126058 100644 --- a/drivers/watchdog/pnx4008_wdt.c +++ b/drivers/watchdog/pnx4008_wdt.c @@ -32,6 +32,7 @@ #include <linux/io.h> #include <linux/slab.h> #include <linux/err.h> +#include <linux/of.h> #include <mach/hardware.h> /* WatchDog Timer - Chapter 23 Page 207 */ @@ -201,10 +202,19 @@ static int __devexit pnx4008_wdt_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_OF +static const struct of_device_id pnx4008_wdt_match[] = { + { .compatible = "nxp,pnx4008-wdt" }, + { } +}; +MODULE_DEVICE_TABLE(of, pnx4008_wdt_match); +#endif + static struct platform_driver platform_wdt_driver = { .driver = { .name = "pnx4008-watchdog", .owner = THIS_MODULE, + .of_match_table = of_match_ptr(pnx4008_wdt_match), }, .probe = pnx4008_wdt_probe, .remove = __devexit_p(pnx4008_wdt_remove), |