diff options
author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2008-07-23 11:25:18 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-07-30 16:54:39 -0400 |
commit | 683147254ef7e69ebbbe55280ba6a3c5ae2325d8 (patch) | |
tree | 4f242b09bcd54ab4563e9c6201dc0c8ded351fdc /arch/mips/txx9/jmr3927 | |
parent | a49297e8fc8a9a835ac4ec124aa83028abdcc7d5 (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/jmr3927')
-rw-r--r-- | arch/mips/txx9/jmr3927/setup.c | 20 |
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) | |||
308 | return IS_ERR(dev) ? PTR_ERR(dev) : 0; | 308 | return IS_ERR(dev) ? PTR_ERR(dev) : 0; |
309 | } | 309 | } |
310 | 310 | ||
311 | /* Watchdog support */ | 311 | static void __init tx3927_wdt_init(void) |
312 | |||
313 | static int __init txx9_wdt_init(unsigned long base) | ||
314 | { | ||
315 | struct resource res = { | ||
316 | .start = base, | ||
317 | .end = base + 0x100 - 1, | ||
318 | .flags = IORESOURCE_MEM, | ||
319 | }; | ||
320 | struct platform_device *dev = | ||
321 | platform_device_register_simple("txx9wdt", -1, &res, 1); | ||
322 | return IS_ERR(dev) ? PTR_ERR(dev) : 0; | ||
323 | } | ||
324 | |||
325 | static int __init jmr3927_wdt_init(void) | ||
326 | { | 312 | { |
327 | return txx9_wdt_init(TX3927_TMR_REG(2)); | 313 | txx9_wdt_init(TX3927_TMR_REG(2)); |
328 | } | 314 | } |
329 | 315 | ||
330 | static void __init jmr3927_device_init(void) | 316 | static void __init jmr3927_device_init(void) |
331 | { | 317 | { |
332 | __swizzle_addr_b = jmr3927_swizzle_addr_b; | 318 | __swizzle_addr_b = jmr3927_swizzle_addr_b; |
333 | jmr3927_rtc_init(); | 319 | jmr3927_rtc_init(); |
334 | jmr3927_wdt_init(); | 320 | tx3927_wdt_init(); |
335 | } | 321 | } |
336 | 322 | ||
337 | struct txx9_board_vec jmr3927_vec __initdata = { | 323 | struct txx9_board_vec jmr3927_vec __initdata = { |