diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-10 17:40:55 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-10 17:41:06 -0400 |
commit | 547c32aeb5a24178ef20488ae0508efcc32ae8e4 (patch) | |
tree | fdc33154820cfddc845cef2f67380dace655b28f /arch/arm/mach-s3c2410/mach-bast.c | |
parent | b0efb42478c81ed0ed9aa0dc444db200c32624f0 (diff) | |
parent | 99ae99533a059750c4b0f76295625b8ac5ea751a (diff) |
Merge branch for-rmk-devel of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-bast.c')
-rw-r--r-- | arch/arm/mach-s3c2410/mach-bast.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c index 8637dea5e150..ce3baba2cd7f 100644 --- a/arch/arm/mach-s3c2410/mach-bast.c +++ b/arch/arm/mach-s3c2410/mach-bast.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/list.h> | 16 | #include <linux/list.h> |
17 | #include <linux/timer.h> | 17 | #include <linux/timer.h> |
18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
19 | #include <linux/gpio.h> | ||
19 | #include <linux/sysdev.h> | 20 | #include <linux/sysdev.h> |
20 | #include <linux/serial_core.h> | 21 | #include <linux/serial_core.h> |
21 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
@@ -212,15 +213,15 @@ static struct s3c2410_uartcfg bast_uartcfgs[] __initdata = { | |||
212 | static int bast_pm_suspend(struct sys_device *sd, pm_message_t state) | 213 | static int bast_pm_suspend(struct sys_device *sd, pm_message_t state) |
213 | { | 214 | { |
214 | /* ensure that an nRESET is not generated on resume. */ | 215 | /* ensure that an nRESET is not generated on resume. */ |
215 | s3c2410_gpio_setpin(S3C2410_GPA21, 1); | 216 | s3c2410_gpio_setpin(S3C2410_GPA(21), 1); |
216 | s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPA21_OUT); | 217 | s3c2410_gpio_cfgpin(S3C2410_GPA(21), S3C2410_GPIO_OUTPUT); |
217 | 218 | ||
218 | return 0; | 219 | return 0; |
219 | } | 220 | } |
220 | 221 | ||
221 | static int bast_pm_resume(struct sys_device *sd) | 222 | static int bast_pm_resume(struct sys_device *sd) |
222 | { | 223 | { |
223 | s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPA21_nRSTOUT); | 224 | s3c2410_gpio_cfgpin(S3C2410_GPA(21), S3C2410_GPA21_nRSTOUT); |
224 | return 0; | 225 | return 0; |
225 | } | 226 | } |
226 | 227 | ||
@@ -591,8 +592,6 @@ static void __init bast_map_io(void) | |||
591 | s3c24xx_init_io(bast_iodesc, ARRAY_SIZE(bast_iodesc)); | 592 | s3c24xx_init_io(bast_iodesc, ARRAY_SIZE(bast_iodesc)); |
592 | s3c24xx_init_clocks(0); | 593 | s3c24xx_init_clocks(0); |
593 | s3c24xx_init_uarts(bast_uartcfgs, ARRAY_SIZE(bast_uartcfgs)); | 594 | s3c24xx_init_uarts(bast_uartcfgs, ARRAY_SIZE(bast_uartcfgs)); |
594 | |||
595 | usb_simtec_init(); | ||
596 | } | 595 | } |
597 | 596 | ||
598 | static void __init bast_init(void) | 597 | static void __init bast_init(void) |
@@ -607,6 +606,7 @@ static void __init bast_init(void) | |||
607 | i2c_register_board_info(0, bast_i2c_devs, | 606 | i2c_register_board_info(0, bast_i2c_devs, |
608 | ARRAY_SIZE(bast_i2c_devs)); | 607 | ARRAY_SIZE(bast_i2c_devs)); |
609 | 608 | ||
609 | usb_simtec_init(); | ||
610 | nor_simtec_init(); | 610 | nor_simtec_init(); |
611 | } | 611 | } |
612 | 612 | ||