diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-22 22:21:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-22 22:21:54 -0400 |
commit | 8b0eaccab4584ace24d233214bfee3cb50e49a60 (patch) | |
tree | a22c53631041504f357f06e0ab779b3d3b283423 /drivers | |
parent | f10f114f199dbcb9e1d6b5a0b36a34acf93f6179 (diff) | |
parent | 3cfa8f6c542467bd046aedb9d2e394b3d0e8467f (diff) |
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.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/watchdog/mpc5200_wdt.c b/drivers/watchdog/mpc5200_wdt.c index 9cfb97576623..11f6a111e75b 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 | |||
176 | 176 | ||
177 | has_wdt = of_get_property(op->node, "has-wdt", NULL); | 177 | has_wdt = of_get_property(op->node, "has-wdt", NULL); |
178 | if (!has_wdt) | 178 | if (!has_wdt) |
179 | has_wdt = of_get_property(op->node, "fsl,has-wdt", NULL); | ||
180 | if (!has_wdt) | ||
179 | return -ENODEV; | 181 | return -ENODEV; |
180 | 182 | ||
181 | wdt = kzalloc(sizeof(*wdt), GFP_KERNEL); | 183 | wdt = kzalloc(sizeof(*wdt), GFP_KERNEL); |
@@ -254,6 +256,7 @@ static int mpc5200_wdt_shutdown(struct of_device *op) | |||
254 | 256 | ||
255 | static struct of_device_id mpc5200_wdt_match[] = { | 257 | static struct of_device_id mpc5200_wdt_match[] = { |
256 | { .compatible = "mpc5200-gpt", }, | 258 | { .compatible = "mpc5200-gpt", }, |
259 | { .compatible = "fsl,mpc5200-gpt", }, | ||
257 | {}, | 260 | {}, |
258 | }; | 261 | }; |
259 | static struct of_platform_driver mpc5200_wdt_driver = { | 262 | static struct of_platform_driver mpc5200_wdt_driver = { |