aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin
diff options
context:
space:
mode:
authorMichael Hennerich <michael.hennerich@analog.com>2008-02-25 01:39:50 -0500
committerBryan Wu <cooloney@kernel.org>2008-02-25 01:39:50 -0500
commit3927819d511f5b5855e6f2345f24e7b04e4fd2f5 (patch)
treee3a25b247fe092400649298891325c7681e9094b /arch/blackfin
parent9253d02041c60d732713c40c59b49fbde8f3bc1c (diff)
[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 @@
31#include <asm/blackfin.h> 31#include <asm/blackfin.h>
32#include <asm/mach/irq.h> 32#include <asm/mach/irq.h>
33 33
34.text
35
36#if !defined(CONFIG_BF561)
37 34
38.section .l1.text 35.section .l1.text
39 36
@@ -328,10 +325,12 @@ ENTRY(_set_sic_iwr)
328 RTS; 325 RTS;
329 326
330ENTRY(_set_rtc_istat) 327ENTRY(_set_rtc_istat)
328#ifndef CONFIG_BF561
331 P0.H = hi(RTC_ISTAT); 329 P0.H = hi(RTC_ISTAT);
332 P0.L = lo(RTC_ISTAT); 330 P0.L = lo(RTC_ISTAT);
333 w[P0] = R0.L; 331 w[P0] = R0.L;
334 SSYNC; 332 SSYNC;
333#endif
335 RTS; 334 RTS;
336 335
337ENTRY(_test_pll_locked) 336ENTRY(_test_pll_locked)
@@ -342,4 +341,3 @@ ENTRY(_test_pll_locked)
342 CC = BITTST(R0,5); 341 CC = BITTST(R0,5);
343 IF !CC JUMP 1b; 342 IF !CC JUMP 1b;
344 RTS; 343 RTS;
345#endif