summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoschung, Rainer <Rainer.Boschung@keymile.com>2014-06-03 09:05:12 +0200
committerYork Sun <yorksun@freescale.com>2014-08-01 14:17:44 -0700
commit3345d18d5baad05807ecac36bc4125dbc74d288f (patch)
treebc3b9f67af78dc490ae7068610f411634ad2d95c
parentfb5368789a45ca5ee4396cbbf563a8f16ab24f9c (diff)
downloadu-boot-imx-3345d18d5baad05807ecac36bc4125dbc74d288f.zip
u-boot-imx-3345d18d5baad05807ecac36bc4125dbc74d288f.tar.gz
u-boot-imx-3345d18d5baad05807ecac36bc4125dbc74d288f.tar.bz2
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 <rainer.boschung@keymile.com> Reviewed-by: York Sun <yorksun@freescale.com>
-rw-r--r--arch/powerpc/cpu/mpc85xx/interrupts.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/interrupts.c b/arch/powerpc/cpu/mpc85xx/interrupts.c
index a36a4af..daf46a9 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 */