aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
diff options
context:
space:
mode:
authorKyle Moffett <Kyle.D.Moffett@boeing.com>2011-12-22 05:19:14 -0500
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-02-22 18:50:00 -0500
commite55d7f737d3daf4aaf41945c1829138c608662e9 (patch)
tree90c01c8d5adb7715a233391f35ae8ee99066171e /arch/powerpc/platforms/85xx/mpc85xx_rdb.c
parentc1b8d45db4dbc64cc6015f97922f767fdf782f64 (diff)
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/mpc85xx_rdb.c')
-rw-r--r--arch/powerpc/platforms/85xx/mpc85xx_rdb.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
index a23f6f30993c..407c7391e360 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
@@ -48,13 +48,12 @@ void __init mpc85xx_rdb_pic_init(void)
48 unsigned long root = of_get_flat_dt_root(); 48 unsigned long root = of_get_flat_dt_root();
49 49
50 if (of_flat_dt_is_compatible(root, "fsl,MPC85XXRDB-CAMP")) { 50 if (of_flat_dt_is_compatible(root, "fsl,MPC85XXRDB-CAMP")) {
51 mpic = mpic_alloc(NULL, 0, 51 mpic = mpic_alloc(NULL, 0, MPIC_NO_RESET |
52 MPIC_BIG_ENDIAN | 52 MPIC_BIG_ENDIAN |
53 MPIC_SINGLE_DEST_CPU, 53 MPIC_SINGLE_DEST_CPU,
54 0, 256, " OpenPIC "); 54 0, 256, " OpenPIC ");
55 } else { 55 } else {
56 mpic = mpic_alloc(NULL, 0, 56 mpic = mpic_alloc(NULL, 0,
57 MPIC_WANTS_RESET |
58 MPIC_BIG_ENDIAN | 57 MPIC_BIG_ENDIAN |
59 MPIC_SINGLE_DEST_CPU, 58 MPIC_SINGLE_DEST_CPU,
60 0, 256, " OpenPIC "); 59 0, 256, " OpenPIC ");