Blackfin: dpmc: omit RETE/RETN when hibernating

[pandora-kernel.git] / arch / blackfin / mach-common / dpmc_modes.S

diff --git a/arch/blackfin/mach-common/dpmc_modes.S b/arch/blackfin/mach-common/dpmc_modes.S
index 9cfdd49..bebb019 100644 (file)
--- a/arch/blackfin/mach-common/dpmc_modes.S
+++ b/arch/blackfin/mach-common/dpmc_modes.S
@@ -238,23 +238,19 @@ ENTRY(_unset_dram_srfs)
 ENDPROC(_unset_dram_srfs)
 
 ENTRY(_set_sic_iwr)
-#if defined(CONFIG_BF54x) || defined(CONFIG_BF52x) || defined(CONFIG_BF561) || \
-       defined(CONFIG_BF538) || defined(CONFIG_BF539) || defined(CONFIG_BF51x)
-       P0.H = hi(SIC_IWR0);
-       P0.L = lo(SIC_IWR0);
-       P1.H = hi(SIC_IWR1);
-       P1.L = lo(SIC_IWR1);
-       [P1] = R1;
-#if defined(CONFIG_BF54x)
-       P1.H = hi(SIC_IWR2);
-       P1.L = lo(SIC_IWR2);
-       [P1] = R2;
-#endif
+#ifdef SIC_IWR0
+       P0.H = hi(SYSMMR_BASE);
+       P0.L = lo(SYSMMR_BASE);
+       [P0 + (SIC_IWR0 - SYSMMR_BASE)] = R0;
+       [P0 + (SIC_IWR1 - SYSMMR_BASE)] = R1;
+# ifdef SIC_IWR2
+       [P0 + (SIC_IWR2 - SYSMMR_BASE)] = R2;
+# endif
 #else
        P0.H = hi(SIC_IWR);
        P0.L = lo(SIC_IWR);
-#endif
        [P0] = R0;
+#endif
 
        SSYNC;
        RTS;
@@ -514,8 +510,6 @@ ENTRY(_do_hibernate)
        r0 = RETI;
        [--sp] = r0;
        [--sp] = RETX;
-       [--sp] = RETN;
-       [--sp] = RETE;
        [--sp] = SEQSTAT;
 
        /* Save Magic, return address and Stack Pointer */
@@ -537,8 +531,6 @@ ENTRY(_do_hibernate)
 
        /* Restore Core Registers */
        SEQSTAT = [sp++];
-       RETE = [sp++];
-       RETN = [sp++];
        RETX = [sp++];
        r0 = [sp++];
        RETI = r0;