diff options
Diffstat (limited to 'arch/arm/mach-s3c2410/s3c2410-gpio.c')
-rw-r--r-- | arch/arm/mach-s3c2410/s3c2410-gpio.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/arm/mach-s3c2410/s3c2410-gpio.c b/arch/arm/mach-s3c2410/s3c2410-gpio.c index d5e1caea1d23..471a71490010 100644 --- a/arch/arm/mach-s3c2410/s3c2410-gpio.c +++ b/arch/arm/mach-s3c2410/s3c2410-gpio.c | |||
@@ -18,9 +18,6 @@ | |||
18 | * You should have received a copy of the GNU General Public License | 18 | * You should have received a copy of the GNU General Public License |
19 | * along with this program; if not, write to the Free Software | 19 | * along with this program; if not, write to the Free Software |
20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
21 | * | ||
22 | * Changelog | ||
23 | * 15-Jan-2006 LCVR Splitted from gpio.c | ||
24 | */ | 21 | */ |
25 | 22 | ||
26 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
@@ -38,7 +35,7 @@ | |||
38 | int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on, | 35 | int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on, |
39 | unsigned int config) | 36 | unsigned int config) |
40 | { | 37 | { |
41 | void __iomem *reg = S3C2410_EINFLT0; | 38 | void __iomem *reg = S3C24XX_EINFLT0; |
42 | unsigned long flags; | 39 | unsigned long flags; |
43 | unsigned long val; | 40 | unsigned long val; |
44 | 41 | ||
@@ -47,7 +44,7 @@ int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on, | |||
47 | 44 | ||
48 | config &= 0xff; | 45 | config &= 0xff; |
49 | 46 | ||
50 | pin -= S3C2410_GPG8_EINT16; | 47 | pin -= S3C2410_GPG8; |
51 | reg += pin & ~3; | 48 | reg += pin & ~3; |
52 | 49 | ||
53 | local_irq_save(flags); | 50 | local_irq_save(flags); |
@@ -61,10 +58,10 @@ int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on, | |||
61 | 58 | ||
62 | /* update filter enable */ | 59 | /* update filter enable */ |
63 | 60 | ||
64 | val = __raw_readl(S3C2410_EXTINT2); | 61 | val = __raw_readl(S3C24XX_EXTINT2); |
65 | val &= ~(1 << ((pin * 4) + 3)); | 62 | val &= ~(1 << ((pin * 4) + 3)); |
66 | val |= on << ((pin * 4) + 3); | 63 | val |= on << ((pin * 4) + 3); |
67 | __raw_writel(val, S3C2410_EXTINT2); | 64 | __raw_writel(val, S3C24XX_EXTINT2); |
68 | 65 | ||
69 | local_irq_restore(flags); | 66 | local_irq_restore(flags); |
70 | 67 | ||
@@ -75,7 +72,7 @@ EXPORT_SYMBOL(s3c2410_gpio_irqfilter); | |||
75 | 72 | ||
76 | int s3c2410_gpio_getirq(unsigned int pin) | 73 | int s3c2410_gpio_getirq(unsigned int pin) |
77 | { | 74 | { |
78 | if (pin < S3C2410_GPF0 || pin > S3C2410_GPG15_EINT23) | 75 | if (pin < S3C2410_GPF0 || pin > S3C2410_GPG15) |
79 | return -1; /* not valid interrupts */ | 76 | return -1; /* not valid interrupts */ |
80 | 77 | ||
81 | if (pin < S3C2410_GPG0 && pin > S3C2410_GPF7) | 78 | if (pin < S3C2410_GPG0 && pin > S3C2410_GPF7) |