[U-Boot] [PATCH 1/9] mpc85xx: fix interrupt init to not affect watchdog

[Scott Wood]

On Tue, 2014-06-03 at 09:05 +0200, Rainer Boschung wrote:
> TCR watchdog bit are overwritten when dec interrupt is enabled.
> This has been fixed with this patch.
> 
> Signed-off-by: Rainer Boschung <rainer.boschung at keymile.com>
> ---
>  arch/powerpc/cpu/mpc85xx/interrupts.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 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);

It would be nice if we could call this bit by its proper name as per the
ISA...

-Scott