diff options
| author |   Michael Hennerich <michael.hennerich@analog.com> | 2008-02-25 14:39:50 +0800 |
|---|---|---|
| committer |   Bryan Wu <cooloney@kernel.org> | 2008-02-25 14:39:50 +0800 |
| commit | 3927819d511f5b5855e6f2345f24e7b04e4fd2f5 (patch) | |
| tree | e3a25b247fe092400649298891325c7681e9094b /arch/blackfin | |
| parent | [Blackfin] arch: Remove DPMC char driver option (diff) | |
| download | linux-dev-3927819d511f5b5855e6f2345f24e7b04e4fd2f5.tar.xz linux-dev-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.S | 6 |
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 |