Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 191996
b: refs/heads/master
c: 192ff91
h: refs/heads/master
v: v3
  • Loading branch information
Vasily Khoruzhick authored and Ben Dooks committed May 12, 2010
1 parent 346934a commit 7a87f8f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0741b7d2699d1e7b4ceab27522c9e5518b2dbd2c
refs/heads/master: 192ff91fc84e067a3babfddb96114a51c939548e
11 changes: 11 additions & 0 deletions trunk/arch/arm/mach-s3c2410/pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,17 @@ static void s3c2410_pm_prepare(void)
if ( machine_is_aml_m5900() )
s3c2410_gpio_setpin(S3C2410_GPF(2), 1);

if (machine_is_rx1950()) {
/* According to S3C2442 user's manual, page 7-17,
* when the system is operating in NAND boot mode,
* the hardware pin configuration - EINT[23:21] –
* must be set as input for starting up after
* wakeup from sleep mode
*/
s3c_gpio_cfgpin(S3C2410_GPG(13), S3C2410_GPIO_INPUT);
s3c_gpio_cfgpin(S3C2410_GPG(14), S3C2410_GPIO_INPUT);
s3c_gpio_cfgpin(S3C2410_GPG(15), S3C2410_GPIO_INPUT);
}
}

static int s3c2410_pm_resume(struct sys_device *dev)
Expand Down

0 comments on commit 7a87f8f

Please sign in to comment.