diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 20:23:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 20:23:46 -0800 |
| commit | f093182d313edde9b1f86dbdaf40ba4da2dbd0e7 (patch) | |
| tree | ecfc614d514bd5b43a98cf4c62fdd2f47d86e33c /include/asm-powerpc/reg.h | |
| parent | d27ba47e7e8c466c18983a1779d611f82d6a354f (diff) | |
| parent | 76c8e25b905f99be5ddbe999597ba7c2c33ec64b (diff) | |
| download | kernel_samsung_smdk4412-f093182d313edde9b1f86dbdaf40ba4da2dbd0e7.tar.gz kernel_samsung_smdk4412-f093182d313edde9b1f86dbdaf40ba4da2dbd0e7.tar.bz2 kernel_samsung_smdk4412-f093182d313edde9b1f86dbdaf40ba4da2dbd0e7.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'include/asm-powerpc/reg.h')
| -rw-r--r-- | include/asm-powerpc/reg.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/asm-powerpc/reg.h b/include/asm-powerpc/reg.h index da848412f11..489cf4c99c2 100644 --- a/include/asm-powerpc/reg.h +++ b/include/asm-powerpc/reg.h @@ -396,6 +396,9 @@ #define SPRN_VRSAVE 0x100 /* Vector Register Save Register */ #define SPRN_XER 0x001 /* Fixed Point Exception Register */ +#define SPRN_SCOMC 0x114 /* SCOM Access Control */ +#define SPRN_SCOMD 0x115 /* SCOM Access DATA */ + /* Performance monitor SPRs */ #ifdef CONFIG_PPC64 #define SPRN_MMCR0 795 @@ -594,7 +597,11 @@ static inline void ppc64_runlatch_off(void) mtspr(SPRN_CTRLT, ctrl); } } -#endif + +extern unsigned long scom970_read(unsigned int address); +extern void scom970_write(unsigned int address, unsigned long value); + +#endif /* CONFIG_PPC64 */ #define __get_SP() ({unsigned long sp; \ asm volatile("mr %0,1": "=r" (sp)); sp;}) |