evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

Signed-off-by: Scott Wood <scottwood@freescale.com>
This commit is contained in:
Scott Wood 2014-05-20 20:26:01 -05:00
parent 0c0fc4d3a9
commit aa80581da1
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/powerpc/sysdev/mpic.c
View file

@ -1588,10 +1588,6 @@ void __init mpic_init(struct mpic *mpic)
num_timers = 8; 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 */ /* Initialize timers to our reserved vectors and mask them for now */
for (i = 0; i < num_timers; i++) { for (i = 0; i < num_timers; i++) {
unsigned int offset = mpic_tm_offset(mpic, 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); 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) void __init mpic_set_clk_ratio(struct mpic *mpic, u32 clock_ratio)