From 0ec8f32f5de26f53dfdd289a694e6612c3f0c2f7 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Thu, 4 Oct 2007 23:18:08 +0100 Subject: [PATCH] --- yaml --- r: 65297 b: refs/heads/master c: 4afcddae4cc7d8bb36c1d47967d6ede29ea45e1a h: refs/heads/master i: 65295: 69f0cfafe6ec52c73e11c4bed1491b68c1e85b11 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s3c2440/mach-osiris.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index db9fe6c614ed..cbcc259cb08e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28047eced817b3b7cd404fac4b26f29fcf04f1f7 +refs/heads/master: 4afcddae4cc7d8bb36c1d47967d6ede29ea45e1a diff --git a/trunk/arch/arm/mach-s3c2440/mach-osiris.c b/trunk/arch/arm/mach-s3c2440/mach-osiris.c index be5377f128c4..c326983f4a8f 100644 --- a/trunk/arch/arm/mach-s3c2440/mach-osiris.c +++ b/trunk/arch/arm/mach-s3c2440/mach-osiris.c @@ -287,6 +287,10 @@ static int osiris_pm_suspend(struct sys_device *sd, pm_message_t state) __raw_writeb(tmp, OSIRIS_VA_CTRL0); + /* ensure that an nRESET is not generated on resume. */ + s3c2410_gpio_setpin(S3C2410_GPA21, 1); + s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPA21_OUT); + return 0; } @@ -297,6 +301,8 @@ static int osiris_pm_resume(struct sys_device *sd) __raw_writeb(pm_osiris_ctrl0, OSIRIS_VA_CTRL0); + s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPA21_nRSTOUT); + return 0; }