diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2011-05-15 13:32:47 +0200 |
|---|---|---|
| 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) | |
| download | talos-obmc-linux-5e00d3783dd362a34c9816bb582103c9833e4643.tar.gz talos-obmc-linux-5e00d3783dd362a34c9816bb582103c9833e4643.zip | |
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 @@ #include <plat/ehci-orion.h> #include <plat/mv_xor.h> #include <plat/orion_nand.h> -#include <plat/orion_wdt.h> #include <plat/time.h> #include <plat/common.h> #include "common.h" @@ -380,23 +379,9 @@ static int __init orion5x_crypto_init(void) /***************************************************************************** * Watchdog ****************************************************************************/ -static struct orion_wdt_platform_data orion5x_wdt_data = { - .tclk = 0, -}; - -static struct platform_device orion5x_wdt_device = { - .name = "orion_wdt", - .id = -1, - .dev = { - .platform_data = &orion5x_wdt_data, - }, - .num_resources = 0, -}; - void __init orion5x_wdt_init(void) { - orion5x_wdt_data.tclk = orion5x_tclk; - platform_device_register(&orion5x_wdt_device); + orion_wdt_init(orion5x_tclk); } |
