aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-orion5x/common.c
diff options
context:
space:
mode:
authorThomas Reitmayr <treitmayr@devbase.at>2009-02-24 17:59:22 -0500
committerWim Van Sebroeck <wim@iguana.be>2009-03-25 05:02:50 -0400
commit9e058d4f57751daa008b764735f97fdfccfeab6c (patch)
treed9e194a94ab6b1dd30400570c8796ab017185cdc /arch/arm/mach-orion5x/common.c
parentf296b14355a2d0cb170a85236ec391bb0a3fdb3a (diff)
[WATCHDOG] orion5x_wdt: fix compile issue by providing tclk as platform data
The orion5x-wdt driver is now registered as a platform device and receives the tclk value as platform data. This fixes a compile issue cause by a previously removed define "ORION5X_TCLK". Signed-off-by: Thomas Reitmayr <treitmayr@devbase.at> Acked-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Kristof Provost <kristof@sigsegv.be> Cc: Lennert Buytenhek <buytenh@wantstofly.org> Cc: Wim Van Sebroeck <wim@iguana.be> Cc: Russell King <rmk@arm.linux.org.uk> Cc: Martin Michlmayr <tbm@cyrius.com> Cc: Sylver Bruneau <sylver.bruneau@googlemail.com> Cc: Kunihiko IMAI <bak@d2.dion.ne.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'arch/arm/mach-orion5x/common.c')
-rw-r--r--arch/arm/mach-orion5x/common.c29
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 ****************************************************************************/
539static struct orion5x_wdt_platform_data orion5x_wdt_data = {
540 .tclk = 0,
541};
542
543static 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
552void __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 ****************************************************************************/
538int orion5x_tclk; 562int 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/*