diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-30 21:37:27 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-30 21:37:27 -0500 |
| commit | 8af03e782cae1e0a0f530ddd22301cdd12cf9dc0 (patch) | |
| tree | c4af13a38bd3cc1a811a37f2358491f171052070 /include/asm-powerpc/ipic.h | |
| parent | 6232665040f9a23fafd9d94d4ae8d5a2dc850f65 (diff) | |
| parent | 99e139126ab2e84be67969650f92eb37c12ab5cd (diff) | |
Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (454 commits)
[POWERPC] Cell IOMMU fixed mapping support
[POWERPC] Split out the ioid fetching/checking logic
[POWERPC] Add support to cell_iommu_setup_page_tables() for multiple windows
[POWERPC] Split out the IOMMU logic from cell_dma_dev_setup()
[POWERPC] Split cell_iommu_setup_hardware() into two parts
[POWERPC] Split out the logic that allocates struct iommus
[POWERPC] Allocate the hash table under 1G on cell
[POWERPC] Add set_dma_ops() to match get_dma_ops()
[POWERPC] 83xx: Clean up / convert mpc83xx board DTS files to v1 format.
[POWERPC] 85xx: Only invalidate TLB0 and TLB1
[POWERPC] 83xx: Fix typo in mpc837x compatible entries
[POWERPC] 85xx: convert sbc85* boards to use machine_device_initcall
[POWERPC] 83xx: rework platform Kconfig
[POWERPC] 85xx: rework platform Kconfig
[POWERPC] 86xx: Remove unused IRQ defines
[POWERPC] QE: Explicitly set address-cells and size cells for muram
[POWERPC] Convert StorCenter DTS file to /dts-v1/ format.
[POWERPC] 86xx: Convert all 86xx DTS files to /dts-v1/ format.
[PPC] Remove 85xx from arch/ppc
[PPC] Remove 83xx from arch/ppc
...
Diffstat (limited to 'include/asm-powerpc/ipic.h')
| -rw-r--r-- | include/asm-powerpc/ipic.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/asm-powerpc/ipic.h b/include/asm-powerpc/ipic.h index edec79dcb7c1..8ff08be00146 100644 --- a/include/asm-powerpc/ipic.h +++ b/include/asm-powerpc/ipic.h | |||
| @@ -20,11 +20,13 @@ | |||
| 20 | 20 | ||
| 21 | /* Flags when we init the IPIC */ | 21 | /* Flags when we init the IPIC */ |
| 22 | #define IPIC_SPREADMODE_GRP_A 0x00000001 | 22 | #define IPIC_SPREADMODE_GRP_A 0x00000001 |
| 23 | #define IPIC_SPREADMODE_GRP_D 0x00000002 | 23 | #define IPIC_SPREADMODE_GRP_B 0x00000002 |
| 24 | #define IPIC_SPREADMODE_MIX_A 0x00000004 | 24 | #define IPIC_SPREADMODE_GRP_C 0x00000004 |
| 25 | #define IPIC_SPREADMODE_MIX_B 0x00000008 | 25 | #define IPIC_SPREADMODE_GRP_D 0x00000008 |
| 26 | #define IPIC_DISABLE_MCP_OUT 0x00000010 | 26 | #define IPIC_SPREADMODE_MIX_A 0x00000010 |
| 27 | #define IPIC_IRQ0_MCP 0x00000020 | 27 | #define IPIC_SPREADMODE_MIX_B 0x00000020 |
| 28 | #define IPIC_DISABLE_MCP_OUT 0x00000040 | ||
| 29 | #define IPIC_IRQ0_MCP 0x00000080 | ||
| 28 | 30 | ||
| 29 | /* IPIC registers offsets */ | 31 | /* IPIC registers offsets */ |
| 30 | #define IPIC_SICFR 0x00 /* System Global Interrupt Configuration Register */ | 32 | #define IPIC_SICFR 0x00 /* System Global Interrupt Configuration Register */ |