diff options
| author | Lucas Correia Villa Real <lucasvr@gobolinux.org> | 2006-01-26 16:20:50 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-26 16:20:50 +0100 |
| commit | 0367a8d37af6028b64127ac70922717575b81113 (patch) | |
| tree | c61c592d68ce6a582a3508220bec1bd004764c0a /arch/arm/mach-s3c2410/sleep.S | |
| parent | [ARM] amba-clcd: Allow RGB555 and RGB565 with 16bpp (diff) | |
| download | linux-0367a8d37af6028b64127ac70922717575b81113.tar.xz linux-0367a8d37af6028b64127ac70922717575b81113.zip | |
[ARM] 3266/1: S3C2400 - adds macro S3C24XX
Patch from Lucas Correia Villa Real
This patch defines S3C2400 memory map and adds a S3C24XX macro for
common resources between S3C2400, S3C2410 and S3C2440 cpus.
Signed-off-by: Lucas Correia Villa Real <lucasvr@gobolinux.org>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-s3c2410/sleep.S')
| -rw-r--r-- | arch/arm/mach-s3c2410/sleep.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/sleep.S b/arch/arm/mach-s3c2410/sleep.S index 61768dac7fee..e9a055b779b7 100644 --- a/arch/arm/mach-s3c2410/sleep.S +++ b/arch/arm/mach-s3c2410/sleep.S @@ -133,12 +133,12 @@ ENTRY(s3c2410_cpu_resume) @@ load UART to allow us to print the two characters for @@ resume debug - mov r2, #S3C2410_PA_UART & 0xff000000 - orr r2, r2, #S3C2410_PA_UART & 0xff000 + mov r2, #S3C24XX_PA_UART & 0xff000000 + orr r2, r2, #S3C24XX_PA_UART & 0xff000 #if 0 /* SMDK2440 LED set */ - mov r14, #S3C2410_PA_GPIO + mov r14, #S3C24XX_PA_GPIO ldr r12, [ r14, #0x54 ] bic r12, r12, #3<<4 orr r12, r12, #1<<7 |