diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 18:48:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 18:48:11 -0400 |
commit | 8690d8a9f6c2d5728a9c9f68231f1bb4de109e3a (patch) | |
tree | 175067bf67d29c75f310a1bb76d8429f579d8e9a /arch/arm/mach-orion5x | |
parent | d3f12d36f148f101c568bdbce795e41cd9ceadf3 (diff) | |
parent | 3b9d49eea1c32e529fa932670a53358e1c8cd67e (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] i6300esb.c: start locking
[WATCHDOG] i6300esb.c: convert to platform device driver
[WATCHDOG] wdt.c: remove #ifdef CONFIG_WDT_501
[WATCHDOG] Fix io.h & uaccess.h includes.
[WATCHDOG] More coding-style and trivial clean-up
[WATCHDOG] struct file_operations should be const
[WATCHDOG] cpwd.c: Coding style - Clean-up
[WATCHDOG] hpwdt.c: Add new HP BMC controller.
[PATCH 13/13] drivers/watchdog: use USB API functions rather than constants
[WATCHDOG] orion5x_wdt: fix compile issue by providing tclk as platform data
[WATCHDOG] rc32434_wdt: make sure watchdog is not running at startup
[WATCHDOG] rc32434_wdt: add spin_locking
[WATCHDOG] rc32434_wdt: add shutdown method
[WATCHDOG] rc32434_wdt: add timeout module parameter
[WATCHDOG] rc32434_wdt: clean-up driver
[WATCHDOG] davinci: convert to ioremap() + io[read|write]
[WATCHDOG] w83697ug: add error checking
[WATCHDOG] cpwd.c & riowd.c - unlocked_ioctl
Diffstat (limited to 'arch/arm/mach-orion5x')
-rw-r--r-- | arch/arm/mach-orion5x/common.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c index 8a0e49d84256..1a1df24f419e 100644 --- a/arch/arm/mach-orion5x/common.c +++ b/arch/arm/mach-orion5x/common.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <plat/ehci-orion.h> | 31 | #include <plat/ehci-orion.h> |
32 | #include <plat/mv_xor.h> | 32 | #include <plat/mv_xor.h> |
33 | #include <plat/orion_nand.h> | 33 | #include <plat/orion_nand.h> |
34 | #include <plat/orion5x_wdt.h> | ||
34 | #include <plat/time.h> | 35 | #include <plat/time.h> |
35 | #include "common.h" | 36 | #include "common.h" |
36 | 37 | ||
@@ -533,6 +534,29 @@ void __init orion5x_xor_init(void) | |||
533 | 534 | ||
534 | 535 | ||
535 | /***************************************************************************** | 536 | /***************************************************************************** |
537 | * Watchdog | ||
538 | ****************************************************************************/ | ||
539 | static struct orion5x_wdt_platform_data orion5x_wdt_data = { | ||
540 | .tclk = 0, | ||
541 | }; | ||
542 | |||
543 | static struct platform_device orion5x_wdt_device = { | ||
544 | .name = "orion5x_wdt", | ||
545 | .id = -1, | ||
546 | .dev = { | ||
547 | .platform_data = &orion5x_wdt_data, | ||
548 | }, | ||
549 | .num_resources = 0, | ||
550 | }; | ||
551 | |||
552 | void __init orion5x_wdt_init(void) | ||
553 | { | ||
554 | orion5x_wdt_data.tclk = orion5x_tclk; | ||
555 | platform_device_register(&orion5x_wdt_device); | ||
556 | } | ||
557 | |||
558 | |||
559 | /***************************************************************************** | ||
536 | * Time handling | 560 | * Time handling |
537 | ****************************************************************************/ | 561 | ****************************************************************************/ |
538 | int orion5x_tclk; | 562 | int orion5x_tclk; |
@@ -631,6 +655,11 @@ void __init orion5x_init(void) | |||
631 | printk(KERN_INFO "Orion: Applying 5281 D0 WFI workaround.\n"); | 655 | printk(KERN_INFO "Orion: Applying 5281 D0 WFI workaround.\n"); |
632 | disable_hlt(); | 656 | disable_hlt(); |
633 | } | 657 | } |
658 | |||
659 | /* | ||
660 | * Register watchdog driver | ||
661 | */ | ||
662 | orion5x_wdt_init(); | ||
634 | } | 663 | } |
635 | 664 | ||
636 | /* | 665 | /* |