diff options
author | Sylwester Nawrocki <sylvester.nawrocki@gmail.com> | 2012-07-13 05:05:00 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-07-13 05:05:00 -0400 |
commit | 949117356e84ef0922a99e56343894ca2ddaea83 (patch) | |
tree | 04cf59ccd35bf3e3907b661cc3fd2829f416bb0d /arch/arm/mach-s3c24xx/pm-s3c2410.c | |
parent | 5c9fb56b456eb4ebb82adfcad2edeb3c4821925a (diff) |
ARM: S3C24XX: Convert the PM code to gpiolib API
Replace deprecated functions with the gpiolib ones.
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s3c24xx/pm-s3c2410.c')
-rw-r--r-- | arch/arm/mach-s3c24xx/pm-s3c2410.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c24xx/pm-s3c2410.c b/arch/arm/mach-s3c24xx/pm-s3c2410.c index 03f706dd6009..949ae05e07c5 100644 --- a/arch/arm/mach-s3c24xx/pm-s3c2410.c +++ b/arch/arm/mach-s3c24xx/pm-s3c2410.c | |||
@@ -77,8 +77,10 @@ static void s3c2410_pm_prepare(void) | |||
77 | __raw_writel(calc, phys_to_virt(H1940_SUSPEND_CHECKSUM)); | 77 | __raw_writel(calc, phys_to_virt(H1940_SUSPEND_CHECKSUM)); |
78 | } | 78 | } |
79 | 79 | ||
80 | if ( machine_is_aml_m5900() ) | 80 | if (machine_is_aml_m5900()) { |
81 | s3c2410_gpio_setpin(S3C2410_GPF(2), 1); | 81 | gpio_request_one(S3C2410_GPF(2), GPIOF_OUT_INIT_HIGH, NULL); |
82 | gpio_free(S3C2410_GPF(2)); | ||
83 | } | ||
82 | 84 | ||
83 | if (machine_is_rx1950()) { | 85 | if (machine_is_rx1950()) { |
84 | /* According to S3C2442 user's manual, page 7-17, | 86 | /* According to S3C2442 user's manual, page 7-17, |
@@ -103,8 +105,10 @@ static void s3c2410_pm_resume(void) | |||
103 | tmp &= S3C2410_GSTATUS2_OFFRESET; | 105 | tmp &= S3C2410_GSTATUS2_OFFRESET; |
104 | __raw_writel(tmp, S3C2410_GSTATUS2); | 106 | __raw_writel(tmp, S3C2410_GSTATUS2); |
105 | 107 | ||
106 | if ( machine_is_aml_m5900() ) | 108 | if (machine_is_aml_m5900()) { |
107 | s3c2410_gpio_setpin(S3C2410_GPF(2), 0); | 109 | gpio_request_one(S3C2410_GPF(2), GPIOF_OUT_INIT_LOW, NULL); |
110 | gpio_free(S3C2410_GPF(2)); | ||
111 | } | ||
108 | } | 112 | } |
109 | 113 | ||
110 | struct syscore_ops s3c2410_pm_syscore_ops = { | 114 | struct syscore_ops s3c2410_pm_syscore_ops = { |