diff options
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-osiris.c')
-rw-r--r-- | arch/arm/mach-s3c2440/mach-osiris.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c index c8a46685ce38..cba064b49a64 100644 --- a/arch/arm/mach-s3c2440/mach-osiris.c +++ b/arch/arm/mach-s3c2440/mach-osiris.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <linux/list.h> | 15 | #include <linux/list.h> |
16 | #include <linux/timer.h> | 16 | #include <linux/timer.h> |
17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
18 | #include <linux/gpio.h> | ||
18 | #include <linux/device.h> | 19 | #include <linux/device.h> |
19 | #include <linux/sysdev.h> | 20 | #include <linux/sysdev.h> |
20 | #include <linux/serial_core.h> | 21 | #include <linux/serial_core.h> |
@@ -291,8 +292,8 @@ static int osiris_pm_suspend(struct sys_device *sd, pm_message_t state) | |||
291 | __raw_writeb(tmp, OSIRIS_VA_CTRL0); | 292 | __raw_writeb(tmp, OSIRIS_VA_CTRL0); |
292 | 293 | ||
293 | /* ensure that an nRESET is not generated on resume. */ | 294 | /* ensure that an nRESET is not generated on resume. */ |
294 | s3c2410_gpio_setpin(S3C2410_GPA21, 1); | 295 | s3c2410_gpio_setpin(S3C2410_GPA(21), 1); |
295 | s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPA21_OUT); | 296 | s3c2410_gpio_cfgpin(S3C2410_GPA(21), S3C2410_GPIO_OUTPUT); |
296 | 297 | ||
297 | return 0; | 298 | return 0; |
298 | } | 299 | } |
@@ -304,7 +305,7 @@ static int osiris_pm_resume(struct sys_device *sd) | |||
304 | 305 | ||
305 | __raw_writeb(pm_osiris_ctrl0, OSIRIS_VA_CTRL0); | 306 | __raw_writeb(pm_osiris_ctrl0, OSIRIS_VA_CTRL0); |
306 | 307 | ||
307 | s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPA21_nRSTOUT); | 308 | s3c2410_gpio_cfgpin(S3C2410_GPA(21), S3C2410_GPA21_nRSTOUT); |
308 | 309 | ||
309 | return 0; | 310 | return 0; |
310 | } | 311 | } |
@@ -384,7 +385,7 @@ static void __init osiris_map_io(void) | |||
384 | 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); |
385 | } else { | 386 | } else { |
386 | /* write-protect line to the NAND */ | 387 | /* write-protect line to the NAND */ |
387 | s3c2410_gpio_setpin(S3C2410_GPA0, 1); | 388 | s3c2410_gpio_setpin(S3C2410_GPA(0), 1); |
388 | } | 389 | } |
389 | 390 | ||
390 | /* fix bus configuration (nBE settings wrong on ABLE pre v2.20) */ | 391 | /* fix bus configuration (nBE settings wrong on ABLE pre v2.20) */ |