diff options
Diffstat (limited to 'arch/blackfin/mach-common/pm.c')
| -rw-r--r-- | arch/blackfin/mach-common/pm.c | 11 | 
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c index d3d70fd67c1..f48a6aebb49 100644 --- a/arch/blackfin/mach-common/pm.c +++ b/arch/blackfin/mach-common/pm.c @@ -82,10 +82,9 @@ void bfin_pm_suspend_standby_enter(void)  	bfin_pm_standby_restore(); -#if defined(CONFIG_BF54x) || defined(CONFIG_BF52x)  || defined(CONFIG_BF561) || \ -	defined(CONFIG_BF538) || defined(CONFIG_BF539) || defined(CONFIG_BF51x) +#ifdef SIC_IWR0  	bfin_write_SIC_IWR0(IWR_DISABLE_ALL); -#if defined(CONFIG_BF52x) || defined(CONFIG_BF51x) +# ifdef SIC_IWR1  	/* BF52x 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: @@ -95,10 +94,8 @@ void bfin_pm_suspend_standby_enter(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  |