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-orion5x | |
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-orion5x')
-rw-r--r-- | arch/arm/mach-orion5x/common.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c index d2dee431635a..c26e6dbe489b 100644 --- a/arch/arm/mach-orion5x/common.c +++ b/arch/arm/mach-orion5x/common.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <plat/ehci-orion.h> | 30 | #include <plat/ehci-orion.h> |
31 | #include <plat/mv_xor.h> | 31 | #include <plat/mv_xor.h> |
32 | #include <plat/orion_nand.h> | 32 | #include <plat/orion_nand.h> |
33 | #include <plat/orion_wdt.h> | ||
34 | #include <plat/time.h> | 33 | #include <plat/time.h> |
35 | #include <plat/common.h> | 34 | #include <plat/common.h> |
36 | #include "common.h" | 35 | #include "common.h" |
@@ -380,23 +379,9 @@ static int __init orion5x_crypto_init(void) | |||
380 | /***************************************************************************** | 379 | /***************************************************************************** |
381 | * Watchdog | 380 | * Watchdog |
382 | ****************************************************************************/ | 381 | ****************************************************************************/ |
383 | static struct orion_wdt_platform_data orion5x_wdt_data = { | ||
384 | .tclk = 0, | ||
385 | }; | ||
386 | |||
387 | static struct platform_device orion5x_wdt_device = { | ||
388 | .name = "orion_wdt", | ||
389 | .id = -1, | ||
390 | .dev = { | ||
391 | .platform_data = &orion5x_wdt_data, | ||
392 | }, | ||
393 | .num_resources = 0, | ||
394 | }; | ||
395 | |||
396 | void __init orion5x_wdt_init(void) | 382 | void __init orion5x_wdt_init(void) |
397 | { | 383 | { |
398 | orion5x_wdt_data.tclk = orion5x_tclk; | 384 | orion_wdt_init(orion5x_tclk); |
399 | platform_device_register(&orion5x_wdt_device); | ||
400 | } | 385 | } |
401 | 386 | ||
402 | 387 | ||