diff options
author | Ben Dooks <ben-linux@fluff.org> | 2009-05-17 17:32:23 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-05-18 11:26:03 -0400 |
commit | 070276d5d049f385763dee19112bea08f56c9a0d (patch) | |
tree | 5a32a885de72f18476ff067a25d8a159ac01629d /arch/arm/mach-s3c2440/mach-osiris.c | |
parent | 75cbcff3729fe2568dff38d16d6494f8fb7f59fe (diff) |
[ARM] S3C24XX: GPIO: Change to macros for GPIO numbering
Prepare to remove the large number of S3C2410_GPxn defines
by moving to S3C2410_GPx(n) in arch/arm.
The following perl was used to change the files:
perl -pi~ -e 's/S3C2410_GP([A-Z])([0-9]+)([^_^0-9])/S3C2410_GP\1\(\2\)\3/g'
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-osiris.c')
-rw-r--r-- | arch/arm/mach-s3c2440/mach-osiris.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c index ad0fdc4a794a..cba064b49a64 100644 --- a/arch/arm/mach-s3c2440/mach-osiris.c +++ b/arch/arm/mach-s3c2440/mach-osiris.c | |||
@@ -292,8 +292,8 @@ static int osiris_pm_suspend(struct sys_device *sd, pm_message_t state) | |||
292 | __raw_writeb(tmp, OSIRIS_VA_CTRL0); | 292 | __raw_writeb(tmp, OSIRIS_VA_CTRL0); |
293 | 293 | ||
294 | /* ensure that an nRESET is not generated on resume. */ | 294 | /* ensure that an nRESET is not generated on resume. */ |
295 | s3c2410_gpio_setpin(S3C2410_GPA21, 1); | 295 | s3c2410_gpio_setpin(S3C2410_GPA(21), 1); |
296 | s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPIO_OUTPUT); | 296 | s3c2410_gpio_cfgpin(S3C2410_GPA(21), S3C2410_GPIO_OUTPUT); |
297 | 297 | ||
298 | return 0; | 298 | return 0; |
299 | } | 299 | } |
@@ -305,7 +305,7 @@ static int osiris_pm_resume(struct sys_device *sd) | |||
305 | 305 | ||
306 | __raw_writeb(pm_osiris_ctrl0, OSIRIS_VA_CTRL0); | 306 | __raw_writeb(pm_osiris_ctrl0, OSIRIS_VA_CTRL0); |
307 | 307 | ||
308 | s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPA21_nRSTOUT); | 308 | s3c2410_gpio_cfgpin(S3C2410_GPA(21), S3C2410_GPA21_nRSTOUT); |
309 | 309 | ||
310 | return 0; | 310 | return 0; |
311 | } | 311 | } |
@@ -385,7 +385,7 @@ static void __init osiris_map_io(void) | |||
385 | osiris_nand_sets[0].nr_partitions = ARRAY_SIZE(osiris_default_nand_part_large); | 385 | osiris_nand_sets[0].nr_partitions = ARRAY_SIZE(osiris_default_nand_part_large); |
386 | } else { | 386 | } else { |
387 | /* write-protect line to the NAND */ | 387 | /* write-protect line to the NAND */ |
388 | s3c2410_gpio_setpin(S3C2410_GPA0, 1); | 388 | s3c2410_gpio_setpin(S3C2410_GPA(0), 1); |
389 | } | 389 | } |
390 | 390 | ||
391 | /* fix bus configuration (nBE settings wrong on ABLE pre v2.20) */ | 391 | /* fix bus configuration (nBE settings wrong on ABLE pre v2.20) */ |