diff options
author | Ben Dooks <ben-linux@fluff.org> | 2006-06-24 16:21:33 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-06-24 16:21:33 -0400 |
commit | 44cc7c9c15124c4506da96304e5f9eb88200fc35 (patch) | |
tree | 911dcdfc55ed609a79f7c1c23c918e709b6e3cdf /arch/arm/mach-s3c2410/s3c2410-gpio.c | |
parent | 46491c94d39a519178ba8c6b5b5d6a839210124d (diff) |
[ARM] 3641/1: S3C2412: Fixup gpio register naming
Patch from Ben Dooks
The current S3C2412 has used to moving S3C24XX_
for the generic form of an register has been
moved from the S3C2410.
Fixup S3C2410_EXTINTx and S3C2410_EINFLTx to
S3C24XX_EXTINTx and S3C24XX_EXTINTx
Depends on Patch #3635/1, Patch #3640/1
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-s3c2410/s3c2410-gpio.c')
-rw-r--r-- | arch/arm/mach-s3c2410/s3c2410-gpio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/s3c2410-gpio.c b/arch/arm/mach-s3c2410/s3c2410-gpio.c index 17519b3281b2..471a71490010 100644 --- a/arch/arm/mach-s3c2410/s3c2410-gpio.c +++ b/arch/arm/mach-s3c2410/s3c2410-gpio.c | |||
@@ -35,7 +35,7 @@ | |||
35 | int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on, | 35 | int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on, |
36 | unsigned int config) | 36 | unsigned int config) |
37 | { | 37 | { |
38 | void __iomem *reg = S3C2410_EINFLT0; | 38 | void __iomem *reg = S3C24XX_EINFLT0; |
39 | unsigned long flags; | 39 | unsigned long flags; |
40 | unsigned long val; | 40 | unsigned long val; |
41 | 41 | ||
@@ -58,10 +58,10 @@ int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on, | |||
58 | 58 | ||
59 | /* update filter enable */ | 59 | /* update filter enable */ |
60 | 60 | ||
61 | val = __raw_readl(S3C2410_EXTINT2); | 61 | val = __raw_readl(S3C24XX_EXTINT2); |
62 | val &= ~(1 << ((pin * 4) + 3)); | 62 | val &= ~(1 << ((pin * 4) + 3)); |
63 | val |= on << ((pin * 4) + 3); | 63 | val |= on << ((pin * 4) + 3); |
64 | __raw_writel(val, S3C2410_EXTINT2); | 64 | __raw_writel(val, S3C24XX_EXTINT2); |
65 | 65 | ||
66 | local_irq_restore(flags); | 66 | local_irq_restore(flags); |
67 | 67 | ||