summaryrefslogtreecommitdiffstats
path: root/arch/mips/txx9/jmr3927/setup.c
diff options
context:
space:
mode:
authorAtsushi Nemoto <anemo@mba.ocn.ne.jp>2008-07-23 17:25:18 +0200
committerRalf Baechle <ralf@linux-mips.org>2008-07-30 22:54:39 +0200
commit683147254ef7e69ebbbe55280ba6a3c5ae2325d8 (patch)
tree4f242b09bcd54ab4563e9c6201dc0c8ded351fdc /arch/mips/txx9/jmr3927/setup.c
parent[MIPS] TXx9: Cleanup restart/halt/power_off (diff)
downloadlinux-683147254ef7e69ebbbe55280ba6a3c5ae2325d8.tar.xz
linux-683147254ef7e69ebbbe55280ba6a3c5ae2325d8.zip
[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/jmr3927/setup.c')
-rw-r--r--arch/mips/txx9/jmr3927/setup.c20
1 files changed, 3 insertions, 17 deletions
diff --git a/arch/mips/txx9/jmr3927/setup.c b/arch/mips/txx9/jmr3927/setup.c
index fa0503efc840..ae34e9a4a8ac 100644
--- a/arch/mips/txx9/jmr3927/setup.c
+++ b/arch/mips/txx9/jmr3927/setup.c
@@ -308,30 +308,16 @@ static int __init jmr3927_rtc_init(void)
return IS_ERR(dev) ? PTR_ERR(dev) : 0;
}
-/* Watchdog support */
-
-static int __init txx9_wdt_init(unsigned long base)
-{
- struct resource res = {
- .start = base,
- .end = base + 0x100 - 1,
- .flags = IORESOURCE_MEM,
- };
- struct platform_device *dev =
- platform_device_register_simple("txx9wdt", -1, &res, 1);
- return IS_ERR(dev) ? PTR_ERR(dev) : 0;
-}
-
-static int __init jmr3927_wdt_init(void)
+static void __init tx3927_wdt_init(void)
{
- return txx9_wdt_init(TX3927_TMR_REG(2));
+ txx9_wdt_init(TX3927_TMR_REG(2));
}
static void __init jmr3927_device_init(void)
{
__swizzle_addr_b = jmr3927_swizzle_addr_b;
jmr3927_rtc_init();
- jmr3927_wdt_init();
+ tx3927_wdt_init();
}
struct txx9_board_vec jmr3927_vec __initdata = {