diff options
author | Andrew Lunn <andrew@lunn.ch> | 2011-05-15 07:32:47 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2011-05-16 15:10:03 -0400 |
commit | 5e00d3783dd362a34c9816bb582103c9833e4643 (patch) | |
tree | fae2485cc6ab26c1f1138b473488111e4b7f5af1 /arch/arm/mach-kirkwood | |
parent | 980f9f601ad456dc5a699bf526b6bd894957bad3 (diff) |
ARM: orion: Consolidate the platform data setup for the watchdog.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Diffstat (limited to 'arch/arm/mach-kirkwood')
-rw-r--r-- | arch/arm/mach-kirkwood/common.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index af864fc7883b..08847a6f7d10 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <plat/mvsdio.h> | 29 | #include <plat/mvsdio.h> |
30 | #include <plat/mv_xor.h> | 30 | #include <plat/mv_xor.h> |
31 | #include <plat/orion_nand.h> | 31 | #include <plat/orion_nand.h> |
32 | #include <plat/orion_wdt.h> | ||
33 | #include <plat/common.h> | 32 | #include <plat/common.h> |
34 | #include <plat/time.h> | 33 | #include <plat/time.h> |
35 | #include "common.h" | 34 | #include "common.h" |
@@ -575,23 +574,9 @@ static void __init kirkwood_xor1_init(void) | |||
575 | /***************************************************************************** | 574 | /***************************************************************************** |
576 | * Watchdog | 575 | * Watchdog |
577 | ****************************************************************************/ | 576 | ****************************************************************************/ |
578 | static struct orion_wdt_platform_data kirkwood_wdt_data = { | ||
579 | .tclk = 0, | ||
580 | }; | ||
581 | |||
582 | static struct platform_device kirkwood_wdt_device = { | ||
583 | .name = "orion_wdt", | ||
584 | .id = -1, | ||
585 | .dev = { | ||
586 | .platform_data = &kirkwood_wdt_data, | ||
587 | }, | ||
588 | .num_resources = 0, | ||
589 | }; | ||
590 | |||
591 | static void __init kirkwood_wdt_init(void) | 577 | static void __init kirkwood_wdt_init(void) |
592 | { | 578 | { |
593 | kirkwood_wdt_data.tclk = kirkwood_tclk; | 579 | orion_wdt_init(kirkwood_tclk); |
594 | platform_device_register(&kirkwood_wdt_device); | ||
595 | } | 580 | } |
596 | 581 | ||
597 | 582 | ||