diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 20:12:03 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 20:12:03 -0500 |
commit | 1197ab2942f920f261952de0c392ac749a35796b (patch) | |
tree | 4922ccc8a6061e5ece6ac7420001f3bf4524ea92 /arch/powerpc/include/asm/firmware.h | |
parent | ec773e99ab4abce07b1ae23117179c2861831964 (diff) | |
parent | 96cc017c5b7ec095ef047d3c1952b6b6bbf98943 (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: (106 commits)
powerpc/p3060qds: Add support for P3060QDS board
powerpc/83xx: Add shutdown request support to MCU handling on MPC8349 MITX
powerpc/85xx: Make kexec to interate over online cpus
powerpc/fsl_booke: Fix comment in head_fsl_booke.S
powerpc/85xx: issue 15 EOI after core reset for FSL CoreNet devices
powerpc/8xxx: Fix interrupt handling in MPC8xxx GPIO driver
powerpc/85xx: Add 'fsl,pq3-gpio' compatiable for GPIO driver
powerpc/86xx: Correct Gianfar support for GE boards
powerpc/cpm: Clear muram before it is in use.
drivers/virt: add ioctl for 32-bit compat on 64-bit to fsl-hv-manager
powerpc/fsl_msi: add support for "msi-address-64" property
powerpc/85xx: Setup secondary cores PIR with hard SMP id
powerpc/fsl-booke: Fix settlbcam for 64-bit
powerpc/85xx: Adding DCSR node to dtsi device trees
powerpc/85xx: clean up FPGA device tree nodes for Freecsale QorIQ boards
powerpc/85xx: fix PHYS_64BIT selection for P1022DS
powerpc/fsl-booke: Fix setup_initial_memory_limit to not blindly map
powerpc: respect mem= setting for early memory limit setup
powerpc: Update corenet64_smp_defconfig
powerpc: Update mpc85xx/corenet 32-bit defconfigs
...
Fix up trivial conflicts in:
- arch/powerpc/configs/40x/hcu4_defconfig
removed stale file, edited elsewhere
- arch/powerpc/include/asm/udbg.h, arch/powerpc/kernel/udbg.c:
added opal and gelic drivers vs added ePAPR driver
- drivers/tty/serial/8250.c
moved UPIO_TSI to powerpc vs removed UPIO_DWAPB support
Diffstat (limited to 'arch/powerpc/include/asm/firmware.h')
-rw-r--r-- | arch/powerpc/include/asm/firmware.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/firmware.h b/arch/powerpc/include/asm/firmware.h index 3a6c586c4e4..14db29b18d0 100644 --- a/arch/powerpc/include/asm/firmware.h +++ b/arch/powerpc/include/asm/firmware.h | |||
@@ -48,6 +48,8 @@ | |||
48 | #define FW_FEATURE_CMO ASM_CONST(0x0000000002000000) | 48 | #define FW_FEATURE_CMO ASM_CONST(0x0000000002000000) |
49 | #define FW_FEATURE_VPHN ASM_CONST(0x0000000004000000) | 49 | #define FW_FEATURE_VPHN ASM_CONST(0x0000000004000000) |
50 | #define FW_FEATURE_XCMO ASM_CONST(0x0000000008000000) | 50 | #define FW_FEATURE_XCMO ASM_CONST(0x0000000008000000) |
51 | #define FW_FEATURE_OPAL ASM_CONST(0x0000000010000000) | ||
52 | #define FW_FEATURE_OPALv2 ASM_CONST(0x0000000020000000) | ||
51 | 53 | ||
52 | #ifndef __ASSEMBLY__ | 54 | #ifndef __ASSEMBLY__ |
53 | 55 | ||
@@ -65,6 +67,8 @@ enum { | |||
65 | FW_FEATURE_PSERIES_ALWAYS = 0, | 67 | FW_FEATURE_PSERIES_ALWAYS = 0, |
66 | FW_FEATURE_ISERIES_POSSIBLE = FW_FEATURE_ISERIES | FW_FEATURE_LPAR, | 68 | FW_FEATURE_ISERIES_POSSIBLE = FW_FEATURE_ISERIES | FW_FEATURE_LPAR, |
67 | FW_FEATURE_ISERIES_ALWAYS = FW_FEATURE_ISERIES | FW_FEATURE_LPAR, | 69 | FW_FEATURE_ISERIES_ALWAYS = FW_FEATURE_ISERIES | FW_FEATURE_LPAR, |
70 | FW_FEATURE_POWERNV_POSSIBLE = FW_FEATURE_OPAL | FW_FEATURE_OPALv2, | ||
71 | FW_FEATURE_POWERNV_ALWAYS = 0, | ||
68 | FW_FEATURE_PS3_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1, | 72 | FW_FEATURE_PS3_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1, |
69 | FW_FEATURE_PS3_ALWAYS = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1, | 73 | FW_FEATURE_PS3_ALWAYS = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1, |
70 | FW_FEATURE_CELLEB_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_BEAT, | 74 | FW_FEATURE_CELLEB_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_BEAT, |
@@ -78,6 +82,9 @@ enum { | |||
78 | #ifdef CONFIG_PPC_ISERIES | 82 | #ifdef CONFIG_PPC_ISERIES |
79 | FW_FEATURE_ISERIES_POSSIBLE | | 83 | FW_FEATURE_ISERIES_POSSIBLE | |
80 | #endif | 84 | #endif |
85 | #ifdef CONFIG_PPC_POWERNV | ||
86 | FW_FEATURE_POWERNV_POSSIBLE | | ||
87 | #endif | ||
81 | #ifdef CONFIG_PPC_PS3 | 88 | #ifdef CONFIG_PPC_PS3 |
82 | FW_FEATURE_PS3_POSSIBLE | | 89 | FW_FEATURE_PS3_POSSIBLE | |
83 | #endif | 90 | #endif |
@@ -95,6 +102,9 @@ enum { | |||
95 | #ifdef CONFIG_PPC_ISERIES | 102 | #ifdef CONFIG_PPC_ISERIES |
96 | FW_FEATURE_ISERIES_ALWAYS & | 103 | FW_FEATURE_ISERIES_ALWAYS & |
97 | #endif | 104 | #endif |
105 | #ifdef CONFIG_PPC_POWERNV | ||
106 | FW_FEATURE_POWERNV_ALWAYS & | ||
107 | #endif | ||
98 | #ifdef CONFIG_PPC_PS3 | 108 | #ifdef CONFIG_PPC_PS3 |
99 | FW_FEATURE_PS3_ALWAYS & | 109 | FW_FEATURE_PS3_ALWAYS & |
100 | #endif | 110 | #endif |