diff options
Diffstat (limited to 'arch/blackfin/mach-common/ints-priority.c')
| -rw-r--r-- | arch/blackfin/mach-common/ints-priority.c | 11 | 
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c index 1bba6030dce..202494568c6 100644 --- a/arch/blackfin/mach-common/ints-priority.c +++ b/arch/blackfin/mach-common/ints-priority.c @@ -1101,10 +1101,9 @@ int __init init_arch_irq(void)  	    IMASK_IVG14 | IMASK_IVG13 | IMASK_IVG12 | IMASK_IVG11 |  	    IMASK_IVG10 | IMASK_IVG9 | IMASK_IVG8 | IMASK_IVG7 | IMASK_IVGHW; -#if defined(CONFIG_BF54x) || defined(CONFIG_BF52x) || defined(CONFIG_BF561) \ -	|| defined(BF538_FAMILY) || defined(CONFIG_BF51x) +#ifdef SIC_IWR0  	bfin_write_SIC_IWR0(IWR_DISABLE_ALL); -#if defined(CONFIG_BF52x) || defined(CONFIG_BF51x) +# ifdef SIC_IWR1  	/* BF52x/BF51x system reset does not properly reset SIC_IWR1 which  	 * will screw up the bootrom as it relies on MDMA0/1 waking it  	 * up from IDLE instructions.  See this report for more info: @@ -1114,10 +1113,8 @@ int __init init_arch_irq(void)  		bfin_write_SIC_IWR1(IWR_ENABLE(10) | IWR_ENABLE(11));  	else  		bfin_write_SIC_IWR1(IWR_DISABLE_ALL); -#else -	bfin_write_SIC_IWR1(IWR_DISABLE_ALL); -#endif -# ifdef CONFIG_BF54x +# endif +# ifdef SIC_IWR2  	bfin_write_SIC_IWR2(IWR_DISABLE_ALL);  # endif  #else  |