diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-10-23 08:45:23 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-10-23 08:45:23 +1000 |
| commit | 3cfa8f6c542467bd046aedb9d2e394b3d0e8467f (patch) | |
| tree | fe8e6c5e4ad1bfb51bc1896b6dd8f616f266eb76 /include | |
| parent | 55b70a0300b873c0ec7ea6e33752af56f41250ce (diff) | |
| parent | 9dda78b711ca4d507251a7e896b2f41ec019fc58 (diff) | |
Merge branch 'for-2.6.24' of git://git.secretlab.ca/git/linux-2.6-mpc52xx
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-powerpc/mpc52xx.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/asm-powerpc/mpc52xx.h b/include/asm-powerpc/mpc52xx.h index 568135fe52ea..fcb2ebbfddbc 100644 --- a/include/asm-powerpc/mpc52xx.h +++ b/include/asm-powerpc/mpc52xx.h @@ -20,6 +20,11 @@ #include <linux/suspend.h> +/* Variants of the 5200(B) */ +#define MPC5200_SVR 0x80110010 +#define MPC5200_SVR_MASK 0xfffffff0 +#define MPC5200B_SVR 0x80110020 +#define MPC5200B_SVR_MASK 0xfffffff0 /* ======================================================================== */ /* Structures mapping of some unit register set */ @@ -244,6 +249,7 @@ struct mpc52xx_cdm { #ifndef __ASSEMBLY__ extern void __iomem * mpc52xx_find_and_map(const char *); +extern void __iomem * mpc52xx_find_and_map_path(const char *path); extern unsigned int mpc52xx_find_ipb_freq(struct device_node *node); extern void mpc5200_setup_xlb_arbiter(void); extern void mpc52xx_declare_of_platform_devices(void); @@ -253,6 +259,9 @@ extern unsigned int mpc52xx_get_irq(void); extern int __init mpc52xx_add_bridge(struct device_node *node); +extern void __init mpc52xx_map_wdt(void); +extern void mpc52xx_restart(char *cmd); + #endif /* __ASSEMBLY__ */ #ifdef CONFIG_PM |