summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSonic Zhang <sonic.zhang@analog.com>2012-05-09 17:06:48 +0800
committerBob Liu <lliubbo@gmail.com>2012-05-21 14:54:44 +0800
commit364130227d6d3a2f197d099d4bc0134acbd4dcb3 (patch)
tree5c249a3277eed7f2e4640fb779ba6b05fba37859
parent5b8163a3f906a007ecb0d261fe6e943ebfe6f14b (diff)
downloadop-kernel-dev-364130227d6d3a2f197d099d4bc0134acbd4dcb3.zip
op-kernel-dev-364130227d6d3a2f197d099d4bc0134acbd4dcb3.tar.gz
blackfin: remove redundant CONFIG_BF60x macro
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
-rw-r--r--arch/blackfin/mach-common/dpmc_modes.S6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/blackfin/mach-common/dpmc_modes.S b/arch/blackfin/mach-common/dpmc_modes.S
index 2bec509..cfb7c3c 100644
--- a/arch/blackfin/mach-common/dpmc_modes.S
+++ b/arch/blackfin/mach-common/dpmc_modes.S
@@ -10,7 +10,6 @@
#include <asm/dpmc.h>
.section .l1.text
-#ifndef CONFIG_BF60x
ENTRY(_sleep_mode)
[--SP] = (R7:4, P5:3);
[--SP] = RETS;
@@ -49,7 +48,6 @@ ENTRY(_sleep_mode)
(R7:4, P5:3) = [SP++];
RTS;
ENDPROC(_sleep_mode)
-#endif
/*
* This func never returns as it puts the part into hibernate, and
@@ -64,7 +62,6 @@ ENTRY(_hibernate_mode)
/* Save/setup the regs we need early for minor pipeline optimization */
R4 = R0;
-#ifndef CONFIG_BF60x
P3.H = hi(VR_CTL);
P3.L = lo(VR_CTL);
/* Disable all wakeup sources */
@@ -74,7 +71,6 @@ ENTRY(_hibernate_mode)
call _set_sic_iwr;
call _set_dram_srfs;
SSYNC;
-#endif
/* Finally, we climb into our cave to hibernate */
W[P3] = R4.L;
@@ -84,7 +80,6 @@ ENTRY(_hibernate_mode)
jump .Lforever;
ENDPROC(_hibernate_mode)
-#ifndef CONFIG_BF60x
ENTRY(_sleep_deeper)
[--SP] = (R7:4, P5:3);
[--SP] = RETS;
@@ -279,7 +274,6 @@ ENTRY(_test_pll_locked)
IF !CC JUMP 1b;
RTS;
ENDPROC(_test_pll_locked)
-#endif
.section .text
ENTRY(_do_hibernate)
OpenPOWER on IntegriCloud