summaryrefslogtreecommitdiffstats
path: root/arch/blackfin
diff options
context:
space:
mode:
authorMichael Hennerich <michael.hennerich@analog.com>2008-02-25 14:39:50 +0800
committerBryan Wu <cooloney@kernel.org>2008-02-25 14:39:50 +0800
commit3927819d511f5b5855e6f2345f24e7b04e4fd2f5 (patch)
treee3a25b247fe092400649298891325c7681e9094b /arch/blackfin
parent9253d02041c60d732713c40c59b49fbde8f3bc1c (diff)
downloadblackbird-op-linux-3927819d511f5b5855e6f2345f24e7b04e4fd2f5.tar.gz
blackbird-op-linux-3927819d511f5b5855e6f2345f24e7b04e4fd2f5.zip
[Blackfin] arch: Fix CONFIG_PM support for BF561
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin')
-rw-r--r--arch/blackfin/mach-common/dpmc.S6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/blackfin/mach-common/dpmc.S b/arch/blackfin/mach-common/dpmc.S
index fc9f6eb9018b..9d45aa3265b1 100644
--- a/arch/blackfin/mach-common/dpmc.S
+++ b/arch/blackfin/mach-common/dpmc.S
@@ -31,9 +31,6 @@
#include <asm/blackfin.h>
#include <asm/mach/irq.h>
-.text
-
-#if !defined(CONFIG_BF561)
.section .l1.text
@@ -328,10 +325,12 @@ ENTRY(_set_sic_iwr)
RTS;
ENTRY(_set_rtc_istat)
+#ifndef CONFIG_BF561
P0.H = hi(RTC_ISTAT);
P0.L = lo(RTC_ISTAT);
w[P0] = R0.L;
SSYNC;
+#endif
RTS;
ENTRY(_test_pll_locked)
@@ -342,4 +341,3 @@ ENTRY(_test_pll_locked)
CC = BITTST(R0,5);
IF !CC JUMP 1b;
RTS;
-#endif
OpenPOWER on IntegriCloud