summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/85xx/p1023_rds.c
diff options
context:
space:
mode:
authorKyle Moffett2011-12-22 11:19:14 +0100
committerBenjamin Herrenschmidt2012-02-23 00:50:00 +0100
commite55d7f737d3daf4aaf41945c1829138c608662e9 (patch)
tree90c01c8d5adb7715a233391f35ae8ee99066171e /arch/powerpc/platforms/85xx/p1023_rds.c
parentpowerpc/mpic: Add "last-interrupt-source" property to override hardware (diff)
downloadkernel-qcow2-linux-e55d7f737d3daf4aaf41945c1829138c608662e9.tar.gz
kernel-qcow2-linux-e55d7f737d3daf4aaf41945c1829138c608662e9.tar.xz
kernel-qcow2-linux-e55d7f737d3daf4aaf41945c1829138c608662e9.zip
powerpc/mpic: Remove duplicate MPIC_WANTS_RESET flag
There are two separate flags controlling whether or not the MPIC is reset during initialization, which is completely unnecessary, and only one of them can be specified in the device tree. Also, most platforms in-tree right now do actually want to reset the MPIC during initialization anyways, which means lots of duplicate code passing the MPIC_WANTS_RESET flag. Fix all of the callers which currently do not pass the MPIC_WANTS_RESET flag to pass the MPIC_NO_RESET flag, then remove the MPIC_WANTS_RESET flag and make the code reset the MPIC by default. Signed-off-by: Kyle Moffett <Kyle.D.Moffett@boeing.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/85xx/p1023_rds.c')
-rw-r--r--arch/powerpc/platforms/85xx/p1023_rds.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/85xx/p1023_rds.c b/arch/powerpc/platforms/85xx/p1023_rds.c
index b1cd6a28901f..6b07398e4369 100644
--- a/arch/powerpc/platforms/85xx/p1023_rds.c
+++ b/arch/powerpc/platforms/85xx/p1023_rds.c
@@ -93,8 +93,7 @@ machine_device_initcall(p1023_rds, mpc85xx_common_publish_devices);
static void __init mpc85xx_rds_pic_init(void)
{
- struct mpic *mpic = mpic_alloc(NULL, 0,
- MPIC_WANTS_RESET | MPIC_BIG_ENDIAN |
+ struct mpic *mpic = mpic_alloc(NULL, 0, MPIC_BIG_ENDIAN |
MPIC_SINGLE_DEST_CPU,
0, 256, " OpenPIC ");