diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 18:50:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 18:50:49 -0400 |
| commit | 9a64388d83f6ef08dfff405a9d122e3dbcb6bf38 (patch) | |
| tree | a77532ce4d6d56be6c6c7f405cd901a0184250fb /include/asm-powerpc/cpm2.h | |
| parent | e80ab411e589e00550e2e6e5a6a02d59cc730357 (diff) | |
| parent | 14b3ca4022f050f8622ed282b734ddf445464583 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (202 commits)
[POWERPC] Fix compile breakage for 64-bit UP configs
[POWERPC] Define copy_siginfo_from_user32
[POWERPC] Add compat handler for PTRACE_GETSIGINFO
[POWERPC] i2c: Fix build breakage introduced by OF helpers
[POWERPC] Optimize fls64() on 64-bit processors
[POWERPC] irqtrace support for 64-bit powerpc
[POWERPC] Stacktrace support for lockdep
[POWERPC] Move stackframe definitions to common header
[POWERPC] Fix device-tree locking vs. interrupts
[POWERPC] Make pci_bus_to_host()'s struct pci_bus * argument const
[POWERPC] Remove unused __max_memory variable
[POWERPC] Simplify xics direct/lpar irq_host setup
[POWERPC] Use pseries_setup_i8259_cascade() in pseries_mpic_init_IRQ()
[POWERPC] Turn xics_setup_8259_cascade() into a generic pseries_setup_i8259_cascade()
[POWERPC] Move xics_setup_8259_cascade() into platforms/pseries/setup.c
[POWERPC] Use asm-generic/bitops/find.h in bitops.h
[POWERPC] 83xx: mpc8315 - fix USB UTMI Host setup
[POWERPC] 85xx: Fix the size of qe muram for MPC8568E
[POWERPC] 86xx: mpc86xx_hpcn - Temporarily accept old dts node identifier.
[POWERPC] 86xx: mark functions static, other minor cleanups
...
Diffstat (limited to 'include/asm-powerpc/cpm2.h')
| -rw-r--r-- | include/asm-powerpc/cpm2.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/asm-powerpc/cpm2.h b/include/asm-powerpc/cpm2.h index b93a53eb55c1..4c85ed9cd43f 100644 --- a/include/asm-powerpc/cpm2.h +++ b/include/asm-powerpc/cpm2.h | |||
| @@ -71,18 +71,9 @@ | |||
| 71 | 71 | ||
| 72 | #define CPM_CR_FCC_PAGE(x) (x + 0x04) | 72 | #define CPM_CR_FCC_PAGE(x) (x + 0x04) |
| 73 | 73 | ||
| 74 | /* Some opcodes (there are more...later) | 74 | /* CPM2-specific opcodes (see cpm.h for common opcodes) |
| 75 | */ | 75 | */ |
| 76 | #define CPM_CR_INIT_TRX ((ushort)0x0000) | ||
| 77 | #define CPM_CR_INIT_RX ((ushort)0x0001) | ||
| 78 | #define CPM_CR_INIT_TX ((ushort)0x0002) | ||
| 79 | #define CPM_CR_HUNT_MODE ((ushort)0x0003) | ||
| 80 | #define CPM_CR_STOP_TX ((ushort)0x0004) | ||
| 81 | #define CPM_CR_GRA_STOP_TX ((ushort)0x0005) | ||
| 82 | #define CPM_CR_RESTART_TX ((ushort)0x0006) | ||
| 83 | #define CPM_CR_SET_GADDR ((ushort)0x0008) | ||
| 84 | #define CPM_CR_START_IDMA ((ushort)0x0009) | 76 | #define CPM_CR_START_IDMA ((ushort)0x0009) |
| 85 | #define CPM_CR_STOP_IDMA ((ushort)0x000b) | ||
| 86 | 77 | ||
| 87 | #define mk_cr_cmd(PG, SBC, MCN, OP) \ | 78 | #define mk_cr_cmd(PG, SBC, MCN, OP) \ |
| 88 | ((PG << 26) | (SBC << 21) | (MCN << 6) | OP) | 79 | ((PG << 26) | (SBC << 21) | (MCN << 6) | OP) |