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 /include/asm-mips | |
| 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 'include/asm-mips')
| -rw-r--r-- | include/asm-mips/txx9/generic.h | 1 | ||||
| -rw-r--r-- | include/asm-mips/txx9/tx4927.h | 2 | ||||
| -rw-r--r-- | include/asm-mips/txx9/tx4938.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-mips/txx9/generic.h b/include/asm-mips/txx9/generic.h index cbae37ec3d88..2b34d09e34c8 100644 --- a/include/asm-mips/txx9/generic.h +++ b/include/asm-mips/txx9/generic.h | |||
| @@ -44,5 +44,6 @@ extern struct txx9_board_vec *txx9_board_vec; | |||
| 44 | extern int (*txx9_irq_dispatch)(int pending); | 44 | extern int (*txx9_irq_dispatch)(int pending); |
| 45 | void prom_init_cmdline(void); | 45 | void prom_init_cmdline(void); |
| 46 | char *prom_getcmdline(void); | 46 | char *prom_getcmdline(void); |
| 47 | void txx9_wdt_init(unsigned long base); | ||
| 47 | 48 | ||
| 48 | #endif /* __ASM_TXX9_GENERIC_H */ | 49 | #endif /* __ASM_TXX9_GENERIC_H */ |
diff --git a/include/asm-mips/txx9/tx4927.h b/include/asm-mips/txx9/tx4927.h index 2c26fd17cb4a..3d9fd7dcb33f 100644 --- a/include/asm-mips/txx9/tx4927.h +++ b/include/asm-mips/txx9/tx4927.h | |||
| @@ -243,7 +243,7 @@ static inline void tx4927_ccfg_change(__u64 change, __u64 new) | |||
| 243 | } | 243 | } |
| 244 | 244 | ||
| 245 | unsigned int tx4927_get_mem_size(void); | 245 | unsigned int tx4927_get_mem_size(void); |
| 246 | void tx4927_wdr_init(void); | 246 | void tx4927_wdt_init(void); |
| 247 | void tx4927_setup(void); | 247 | void tx4927_setup(void); |
| 248 | void tx4927_time_init(unsigned int tmrnr); | 248 | void tx4927_time_init(unsigned int tmrnr); |
| 249 | void tx4927_setup_serial(void); | 249 | void tx4927_setup_serial(void); |
diff --git a/include/asm-mips/txx9/tx4938.h b/include/asm-mips/txx9/tx4938.h index 4fff1c9e08d4..d5d7cef7ee8d 100644 --- a/include/asm-mips/txx9/tx4938.h +++ b/include/asm-mips/txx9/tx4938.h | |||
| @@ -276,7 +276,7 @@ struct tx4938_ccfg_reg { | |||
| 276 | #define TX4938_EBUSC_SIZE(ch) TX4927_EBUSC_SIZE(ch) | 276 | #define TX4938_EBUSC_SIZE(ch) TX4927_EBUSC_SIZE(ch) |
| 277 | 277 | ||
| 278 | #define tx4938_get_mem_size() tx4927_get_mem_size() | 278 | #define tx4938_get_mem_size() tx4927_get_mem_size() |
| 279 | void tx4938_wdr_init(void); | 279 | void tx4938_wdt_init(void); |
| 280 | void tx4938_setup(void); | 280 | void tx4938_setup(void); |
| 281 | void tx4938_time_init(unsigned int tmrnr); | 281 | void tx4938_time_init(unsigned int tmrnr); |
| 282 | void tx4938_setup_serial(void); | 282 | void tx4938_setup_serial(void); |
