diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-05-18 09:59:36 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-06-02 14:33:27 -0400 |
commit | 0b0a9df6038752674e54e333cd247c877d29aab8 (patch) | |
tree | e37fc9e517d8201b180aa88d70ec5f215a0ca285 /arch/arm/mach-pxa/trizeps4.c | |
parent | bc3a595988468b8a9c2526b9fb8d7bcaa27cc1a7 (diff) |
[ARM] pxa: separate out power manager and clock registers
The power manager and core clock registers aren't present in PXA3
CPUs. Move them out of pxa-regs.h into pxa2xx-regs.h, and include
pxa2xx-regs.h where necessary.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/trizeps4.c')
-rw-r--r-- | arch/arm/mach-pxa/trizeps4.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c index 931885d86b91..bc7c465ef32b 100644 --- a/arch/arm/mach-pxa/trizeps4.c +++ b/arch/arm/mach-pxa/trizeps4.c | |||
@@ -41,6 +41,7 @@ | |||
41 | #include <asm/mach/flash.h> | 41 | #include <asm/mach/flash.h> |
42 | 42 | ||
43 | #include <asm/arch/pxa-regs.h> | 43 | #include <asm/arch/pxa-regs.h> |
44 | #include <asm/arch/pxa2xx-regs.h> | ||
44 | #include <asm/arch/pxa2xx-gpio.h> | 45 | #include <asm/arch/pxa2xx-gpio.h> |
45 | #include <asm/arch/trizeps4.h> | 46 | #include <asm/arch/trizeps4.h> |
46 | #include <asm/arch/audio.h> | 47 | #include <asm/arch/audio.h> |
@@ -487,6 +488,7 @@ static void __init trizeps4_map_io(void) | |||
487 | ConXS_BCR = trizeps_conxs_bcr; | 488 | ConXS_BCR = trizeps_conxs_bcr; |
488 | #endif | 489 | #endif |
489 | 490 | ||
491 | #warning FIXME - accessing PM registers directly is deprecated | ||
490 | PWER = 0x00000002; | 492 | PWER = 0x00000002; |
491 | PFER = 0x00000000; | 493 | PFER = 0x00000000; |
492 | PRER = 0x00000002; | 494 | PRER = 0x00000002; |