From b2201f0753e06447785d2b2c56371e57d0563049 Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Fri, 13 Jul 2012 18:05:00 +0900 Subject: [PATCH] --- yaml --- r: 313116 b: refs/heads/master c: 949117356e84ef0922a99e56343894ca2ddaea83 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s3c24xx/pm-s3c2410.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ead006eca4cc..c2b8ef4b4b24 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c9fb56b456eb4ebb82adfcad2edeb3c4821925a +refs/heads/master: 949117356e84ef0922a99e56343894ca2ddaea83 diff --git a/trunk/arch/arm/mach-s3c24xx/pm-s3c2410.c b/trunk/arch/arm/mach-s3c24xx/pm-s3c2410.c index 03f706dd6009..949ae05e07c5 100644 --- a/trunk/arch/arm/mach-s3c24xx/pm-s3c2410.c +++ b/trunk/arch/arm/mach-s3c24xx/pm-s3c2410.c @@ -77,8 +77,10 @@ static void s3c2410_pm_prepare(void) __raw_writel(calc, phys_to_virt(H1940_SUSPEND_CHECKSUM)); } - if ( machine_is_aml_m5900() ) - s3c2410_gpio_setpin(S3C2410_GPF(2), 1); + if (machine_is_aml_m5900()) { + gpio_request_one(S3C2410_GPF(2), GPIOF_OUT_INIT_HIGH, NULL); + gpio_free(S3C2410_GPF(2)); + } if (machine_is_rx1950()) { /* According to S3C2442 user's manual, page 7-17, @@ -103,8 +105,10 @@ static void s3c2410_pm_resume(void) tmp &= S3C2410_GSTATUS2_OFFRESET; __raw_writel(tmp, S3C2410_GSTATUS2); - if ( machine_is_aml_m5900() ) - s3c2410_gpio_setpin(S3C2410_GPF(2), 0); + if (machine_is_aml_m5900()) { + gpio_request_one(S3C2410_GPF(2), GPIOF_OUT_INIT_LOW, NULL); + gpio_free(S3C2410_GPF(2)); + } } struct syscore_ops s3c2410_pm_syscore_ops = {