git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin' into secretlab/next-spi
[safe/jmp/linux-2.6]
/
arch
/
arm
/
plat-s3c24xx
/
pm.c
diff --git
a/arch/arm/plat-s3c24xx/pm.c
b/arch/arm/plat-s3c24xx/pm.c
index
5135c40
..
60627e6
100644
(file)
--- a/
arch/arm/plat-s3c24xx/pm.c
+++ b/
arch/arm/plat-s3c24xx/pm.c
@@
-1,6
+1,6
@@
/* linux/arch/arm/plat-s3c24xx/pm.c
*
/* linux/arch/arm/plat-s3c24xx/pm.c
*
- * Copyright (c) 2004
,
2006 Simtec Electronics
+ * Copyright (c) 2004
-
2006 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk>
*
* S3C24XX Power Manager (Suspend-To-RAM) support
* Ben Dooks <ben@simtec.co.uk>
*
* S3C24XX Power Manager (Suspend-To-RAM) support
@@
-30,6
+30,7
@@
#include <linux/suspend.h>
#include <linux/errno.h>
#include <linux/time.h>
#include <linux/suspend.h>
#include <linux/errno.h>
#include <linux/time.h>
+#include <linux/gpio.h>
#include <linux/interrupt.h>
#include <linux/serial_core.h>
#include <linux/io.h>
#include <linux/interrupt.h>
#include <linux/serial_core.h>
#include <linux/io.h>
@@
-42,6
+43,7
@@
#include <asm/mach/time.h>
#include <asm/mach/time.h>
+#include <plat/gpio-cfg.h>
#include <plat/pm.h>
#define PFX "s3c24xx-pm: "
#include <plat/pm.h>
#define PFX "s3c24xx-pm: "
@@
-89,22
+91,22
@@
static void s3c_pm_check_resume_pin(unsigned int pin, unsigned int irqoffs)
{
unsigned long irqstate;
unsigned long pinstate;
{
unsigned long irqstate;
unsigned long pinstate;
- int irq =
s3c2410_gpio_get
irq(pin);
+ int irq =
gpio_to_
irq(pin);
if (irqoffs < 4)
irqstate = s3c_irqwake_intmask & (1L<<irqoffs);
else
irqstate = s3c_irqwake_eintmask & (1L<<irqoffs);
if (irqoffs < 4)
irqstate = s3c_irqwake_intmask & (1L<<irqoffs);
else
irqstate = s3c_irqwake_eintmask & (1L<<irqoffs);
- pinstate = s3c
2410
_gpio_getcfg(pin);
+ pinstate = s3c_gpio_getcfg(pin);
if (!irqstate) {
if (pinstate == S3C2410_GPIO_IRQ)
if (!irqstate) {
if (pinstate == S3C2410_GPIO_IRQ)
- S3C_PMDBG("Leaving IRQ %d (pin %d)
enabled
\n", irq, pin);
+ S3C_PMDBG("Leaving IRQ %d (pin %d)
as is
\n", irq, pin);
} else {
if (pinstate == S3C2410_GPIO_IRQ) {
S3C_PMDBG("Disabling IRQ %d (pin %d)\n", irq, pin);
} else {
if (pinstate == S3C2410_GPIO_IRQ) {
S3C_PMDBG("Disabling IRQ %d (pin %d)\n", irq, pin);
- s3c
2410
_gpio_cfgpin(pin, S3C2410_GPIO_INPUT);
+ s3c_gpio_cfgpin(pin, S3C2410_GPIO_INPUT);
}
}
}
}
}
}
@@
-123,12
+125,12
@@
void s3c_pm_configure_extint(void)
* and then configure it as an input if it is not
*/
* and then configure it as an input if it is not
*/
- for (pin = S3C2410_GPF
0; pin <= S3C2410_GPF7
; pin++) {
- s3c_pm_check_resume_pin(pin, pin - S3C2410_GPF
0
);
+ for (pin = S3C2410_GPF
(0); pin <= S3C2410_GPF(7)
; pin++) {
+ s3c_pm_check_resume_pin(pin, pin - S3C2410_GPF
(0)
);
}
}
- for (pin = S3C2410_GPG
0; pin <= S3C2410_GPG7
; pin++) {
- s3c_pm_check_resume_pin(pin, (pin - S3C2410_GPG
0
)+8);
+ for (pin = S3C2410_GPG
(0); pin <= S3C2410_GPG(7)
; pin++) {
+ s3c_pm_check_resume_pin(pin, (pin - S3C2410_GPG
(0)
)+8);
}
}
}
}