aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-22 19:21:54 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-22 19:21:54 -0700
commit8b0eaccab4584ace24d233214bfee3cb50e49a60 (patch)
treea22c53631041504f357f06e0ab779b3d3b283423 /drivers
parentf10f114f199dbcb9e1d6b5a0b36a34acf93f6179 (diff)
parent3cfa8f6c542467bd046aedb9d2e394b3d0e8467f (diff)
downloadkernel_samsung_tuna-8b0eaccab4584ace24d233214bfee3cb50e49a60.zip
kernel_samsung_tuna-8b0eaccab4584ace24d233214bfee3cb50e49a60.tar.gz
kernel_samsung_tuna-8b0eaccab4584ace24d233214bfee3cb50e49a60.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Enable restart support for lite5200 board [POWERPC] Add restart support for mpc52xx based platforms [POWERPC] Update device tree binding for mpc5200 gpt [POWERPC] Add mpc52xx_find_and_map_path(), refactor utility functions [POWERPC] bestcomm: Restrict bus prefetch bugfix to original mpc5200 silicon.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/watchdog/mpc5200_wdt.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/watchdog/mpc5200_wdt.c b/drivers/watchdog/mpc5200_wdt.c
index 9cfb975..11f6a11 100644
--- a/drivers/watchdog/mpc5200_wdt.c
+++ b/drivers/watchdog/mpc5200_wdt.c
@@ -176,6 +176,8 @@ static int mpc5200_wdt_probe(struct of_device *op, const struct of_device_id *ma
has_wdt = of_get_property(op->node, "has-wdt", NULL);
if (!has_wdt)
+ has_wdt = of_get_property(op->node, "fsl,has-wdt", NULL);
+ if (!has_wdt)
return -ENODEV;
wdt = kzalloc(sizeof(*wdt), GFP_KERNEL);
@@ -254,6 +256,7 @@ static int mpc5200_wdt_shutdown(struct of_device *op)
static struct of_device_id mpc5200_wdt_match[] = {
{ .compatible = "mpc5200-gpt", },
+ { .compatible = "fsl,mpc5200-gpt", },
{},
};
static struct of_platform_driver mpc5200_wdt_driver = {