summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorRoland Stigge <stigge@antcom.de>2012-04-20 21:55:29 +0200
committerWim Van Sebroeck <wim@iguana.be>2012-05-23 16:16:55 +0200
commit3ba3774b8c433fe9e91158d65cf2324ff0c5a15d (patch)
tree10f26eabcc5e67ff65845f384c84491c354c2296 /drivers/watchdog
parentae21cc20a604b45e97d0cdbce7e9302ce7dd7d5c (diff)
downloadblackbird-op-linux-3ba3774b8c433fe9e91158d65cf2324ff0c5a15d.tar.gz
blackbird-op-linux-3ba3774b8c433fe9e91158d65cf2324ff0c5a15d.zip
watchdog: Device tree support for pnx4008-wdt
This patch adds device tree support to pnx4008-wdt.c Signed-off-by: Roland Stigge <stigge@antcom.de> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/pnx4008_wdt.c10
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),
OpenPOWER on IntegriCloud