diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-06 20:58:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-06 20:58:22 -0500 |
| commit | e4e88f31bcb5f05f24b9ae518d4ecb44e1a7774d (patch) | |
| tree | 9eef6998f5bbd1a2c999011d9e0151f00c6e7297 /arch/powerpc/include/asm/mpic.h | |
| parent | 9753dfe19a85e7e45a34a56f4cb2048bb4f50e27 (diff) | |
| parent | ef88e3911c0e0301e73fa3b3b2567aabdbe17cc4 (diff) | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (185 commits)
powerpc: fix compile error with 85xx/p1010rdb.c
powerpc: fix compile error with 85xx/p1023_rds.c
powerpc/fsl: add MSI support for the Freescale hypervisor
arch/powerpc/sysdev/fsl_rmu.c: introduce missing kfree
powerpc/fsl: Add support for Integrated Flash Controller
powerpc/fsl: update compatiable on fsl 16550 uart nodes
powerpc/85xx: fix PCI and localbus properties in p1022ds.dts
powerpc/85xx: re-enable ePAPR byte channel driver in corenet32_smp_defconfig
powerpc/fsl: Update defconfigs to enable some standard FSL HW features
powerpc: Add TBI PHY node to first MDIO bus
sbc834x: put full compat string in board match check
powerpc/fsl-pci: Allow 64-bit PCIe devices to DMA to any memory address
powerpc: Fix unpaired probe_hcall_entry and probe_hcall_exit
offb: Fix setting of the pseudo-palette for >8bpp
offb: Add palette hack for qemu "standard vga" framebuffer
offb: Fix bug in calculating requested vram size
powerpc/boot: Change the WARN to INFO for boot wrapper overlap message
powerpc/44x: Fix build error on currituck platform
powerpc/boot: Change the load address for the wrapper to fit the kernel
powerpc/44x: Enable CRASH_DUMP for 440x
...
Fix up a trivial conflict in arch/powerpc/include/asm/cputime.h due to
the additional sparse-checking code for cputime_t.
Diffstat (limited to 'arch/powerpc/include/asm/mpic.h')
| -rw-r--r-- | arch/powerpc/include/asm/mpic.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/arch/powerpc/include/asm/mpic.h b/arch/powerpc/include/asm/mpic.h index e6fae49e0b74..67b4d9837236 100644 --- a/arch/powerpc/include/asm/mpic.h +++ b/arch/powerpc/include/asm/mpic.h | |||
| @@ -251,6 +251,9 @@ struct mpic_irq_save { | |||
| 251 | /* The instance data of a given MPIC */ | 251 | /* The instance data of a given MPIC */ |
| 252 | struct mpic | 252 | struct mpic |
| 253 | { | 253 | { |
| 254 | /* The OpenFirmware dt node for this MPIC */ | ||
| 255 | struct device_node *node; | ||
| 256 | |||
| 254 | /* The remapper for this MPIC */ | 257 | /* The remapper for this MPIC */ |
| 255 | struct irq_host *irqhost; | 258 | struct irq_host *irqhost; |
| 256 | 259 | ||
| @@ -293,6 +296,9 @@ struct mpic | |||
| 293 | /* Register access method */ | 296 | /* Register access method */ |
| 294 | enum mpic_reg_type reg_type; | 297 | enum mpic_reg_type reg_type; |
| 295 | 298 | ||
| 299 | /* The physical base address of the MPIC */ | ||
| 300 | phys_addr_t paddr; | ||
| 301 | |||
| 296 | /* The various ioremap'ed bases */ | 302 | /* The various ioremap'ed bases */ |
| 297 | struct mpic_reg_bank gregs; | 303 | struct mpic_reg_bank gregs; |
| 298 | struct mpic_reg_bank tmregs; | 304 | struct mpic_reg_bank tmregs; |
| @@ -331,11 +337,11 @@ struct mpic | |||
| 331 | * Note setting any ID (leaving those bits to 0) means standard MPIC | 337 | * Note setting any ID (leaving those bits to 0) means standard MPIC |
| 332 | */ | 338 | */ |
| 333 | 339 | ||
| 334 | /* This is the primary controller, only that one has IPIs and | 340 | /* |
| 335 | * has afinity control. A non-primary MPIC always uses CPU0 | 341 | * This is a secondary ("chained") controller; it only uses the CPU0 |
| 336 | * registers only | 342 | * registers. Primary controllers have IPIs and affinity control. |
| 337 | */ | 343 | */ |
| 338 | #define MPIC_PRIMARY 0x00000001 | 344 | #define MPIC_SECONDARY 0x00000001 |
| 339 | 345 | ||
| 340 | /* Set this for a big-endian MPIC */ | 346 | /* Set this for a big-endian MPIC */ |
| 341 | #define MPIC_BIG_ENDIAN 0x00000002 | 347 | #define MPIC_BIG_ENDIAN 0x00000002 |