summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410
diff options
context:
space:
mode:
authorVasily Khoruzhick <anarsoul@gmail.com>2010-05-11 08:55:10 +0200
committerBen Dooks <ben-linux@fluff.org>2010-05-12 02:19:54 +0200
commit0741b7d2699d1e7b4ceab27522c9e5518b2dbd2c (patch)
tree8b5b3dc90af2ce6358f44a18aa80a70ae773569c /arch/arm/mach-s3c2410
parentARM: S3C24XX: Locate kernel at 0x30108000 if PM_H1940 is enabled (diff)
downloadlinux-0741b7d2699d1e7b4ceab27522c9e5518b2dbd2c.tar.xz
linux-0741b7d2699d1e7b4ceab27522c9e5518b2dbd2c.zip
ARM: RX1950: Add suspend/resume support for RX1950
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s3c2410')
-rw-r--r--arch/arm/mach-s3c2410/pm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c
index 966119c8efee..6a61486ca755 100644
--- a/arch/arm/mach-s3c2410/pm.c
+++ b/arch/arm/mach-s3c2410/pm.c
@@ -60,10 +60,10 @@ static void s3c2410_pm_prepare(void)
__raw_writel(calc, phys_to_virt(H1940_SUSPEND_CHECKSUM));
}
- /* the RX3715 uses similar code and the same H1940 and the
+ /* RX3715 and RX1950 use similar to H1940 code and the
* same offsets for resume and checksum pointers */
- if (machine_is_rx3715()) {
+ if (machine_is_rx3715() || machine_is_rx1950()) {
void *base = phys_to_virt(H1940_SUSPEND_CHECK);
unsigned long ptr;
unsigned long calc = 0;