Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa80581d authored by Scott Wood's avatar Scott Wood
Browse files

powerpc/mpic: Don't init the fsl error int until after mpic init 



Besides other potential problems, if MPIC_NO_RESET is  not set,
the error interrupt will be masked after it is requested.

Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
parent 0c0fc4d3

arch/powerpc/sysdev/mpic.c

+4 −4
Original line number Diff line number Diff line
@@ -1588,10 +1588,6 @@ void __init mpic_init(struct mpic *mpic) 
			num_timers = 8;

	}



	/* FSL mpic error interrupt intialization */

	if (mpic->flags & MPIC_FSL_HAS_EIMR)

		mpic_err_int_init(mpic, MPIC_FSL_ERR_INT);



	/* Initialize timers to our reserved vectors and mask them for now */

	for (i = 0; i < num_timers; i++) {

		unsigned int offset = mpic_tm_offset(mpic, i);
@@ -1675,6 +1671,10 @@ void __init mpic_init(struct mpic *mpic) 
			irq_set_chained_handler(virq, &mpic_cascade);

		}

	}



	/* FSL mpic error interrupt intialization */

	if (mpic->flags & MPIC_FSL_HAS_EIMR)

		mpic_err_int_init(mpic, MPIC_FSL_ERR_INT);

}



void __init mpic_set_clk_ratio(struct mpic *mpic, u32 clock_ratio)