aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/txx9/rbtx4938
diff options
context:
space:
mode:
authorAtsushi Nemoto <anemo@mba.ocn.ne.jp>2008-07-23 11:25:18 -0400
committerRalf Baechle <ralf@linux-mips.org>2008-07-30 16:54:39 -0400
commit683147254ef7e69ebbbe55280ba6a3c5ae2325d8 (patch)
tree4f242b09bcd54ab4563e9c6201dc0c8ded351fdc /arch/mips/txx9/rbtx4938
parenta49297e8fc8a9a835ac4ec124aa83028abdcc7d5 (diff)
[MIPS] TXx9: Cleanup watchdog
Unify registration of txx9wdt platform device. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/txx9/rbtx4938')
-rw-r--r--arch/mips/txx9/rbtx4938/setup.c21
1 files changed, 1 insertions, 20 deletions
diff --git a/arch/mips/txx9/rbtx4938/setup.c b/arch/mips/txx9/rbtx4938/setup.c
index e1177b3b9103..ff5fda2151f2 100644
--- a/arch/mips/txx9/rbtx4938/setup.c
+++ b/arch/mips/txx9/rbtx4938/setup.c
@@ -352,30 +352,11 @@ static void __init rbtx4938_arch_init(void)
352 rbtx4938_spi_init(); 352 rbtx4938_spi_init();
353} 353}
354 354
355/* Watchdog support */
356
357static int __init txx9_wdt_init(unsigned long base)
358{
359 struct resource res = {
360 .start = base,
361 .end = base + 0x100 - 1,
362 .flags = IORESOURCE_MEM,
363 };
364 struct platform_device *dev =
365 platform_device_register_simple("txx9wdt", -1, &res, 1);
366 return IS_ERR(dev) ? PTR_ERR(dev) : 0;
367}
368
369static int __init rbtx4938_wdt_init(void)
370{
371 return txx9_wdt_init(TX4938_TMR_REG(2) & 0xfffffffffULL);
372}
373
374static void __init rbtx4938_device_init(void) 355static void __init rbtx4938_device_init(void)
375{ 356{
376 rbtx4938_ethaddr_init(); 357 rbtx4938_ethaddr_init();
377 rbtx4938_ne_init(); 358 rbtx4938_ne_init();
378 rbtx4938_wdt_init(); 359 tx4938_wdt_init();
379} 360}
380 361
381struct txx9_board_vec rbtx4938_vec __initdata = { 362struct txx9_board_vec rbtx4938_vec __initdata = {