diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2007-10-04 23:18:08 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-10-05 21:21:43 +0100 |
| commit | 4afcddae4cc7d8bb36c1d47967d6ede29ea45e1a (patch) | |
| tree | cb7f85b1b1e710c8b3836bb9b8d45ec844175e6d /arch/arm | |
| parent | 28047eced817b3b7cd404fac4b26f29fcf04f1f7 (diff) | |
| download | kernel-mfld-blackbay-4afcddae4cc7d8bb36c1d47967d6ede29ea45e1a.tar.gz kernel-mfld-blackbay-4afcddae4cc7d8bb36c1d47967d6ede29ea45e1a.tar.bz2 kernel-mfld-blackbay-4afcddae4cc7d8bb36c1d47967d6ede29ea45e1a.zip | |
[ARM] 4598/2: OSIRIS: Ensure we do not get nRSTOUT during suspend
Ensure nRSTOUT is not asserted during or on resume.
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')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-osiris.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c index be5377f128c..c326983f4a8 100644 --- a/arch/arm/mach-s3c2440/mach-osiris.c +++ b/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; } |