From: Boschung, Rainer Date: Tue, 3 Jun 2014 07:05:12 +0000 (+0200) Subject: mpc85xx: fix interrupt init to not affect watchdog X-Git-Tag: v2014.10-rc1~7^2~8 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3345d18d5baad05807ecac36bc4125dbc74d288f;p=oweals%2Fu-boot.git mpc85xx: fix interrupt init to not affect watchdog TCR watchdog bit are overwritten when dec interrupt is enabled. This has been fixed with this patch. Signed-off-by: Rainer Boschung Reviewed-by: York Sun --- diff --git a/arch/powerpc/cpu/mpc85xx/interrupts.c b/arch/powerpc/cpu/mpc85xx/interrupts.c index a36a4af9da..daf46a9ba8 100644 --- a/arch/powerpc/cpu/mpc85xx/interrupts.c +++ b/arch/powerpc/cpu/mpc85xx/interrupts.c @@ -42,7 +42,7 @@ int interrupt_init_cpu(unsigned int *decrementer_count) *decrementer_count = get_tbclk() / CONFIG_SYS_HZ; /* PIE is same as DIE, dec interrupt enable */ - mtspr(SPRN_TCR, TCR_PIE); + mtspr(SPRN_TCR, mfspr(SPRN_TCR) | TCR_PIE); #ifdef CONFIG_INTERRUPTS pic->iivpr1 = 0x810001; /* 50220 enable ecm interrupts */