Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / arch / arm / mach-s3c2410 / s3c2410-gpio.c

diff --git a/arch/arm/mach-s3c2410/s3c2410-gpio.c b/arch/arm/mach-s3c2410/s3c2410-gpio.c
index d5e1cae..471a714 100644 (file)
--- a/arch/arm/mach-s3c2410/s3c2410-gpio.c
+++ b/arch/arm/mach-s3c2410/s3c2410-gpio.c
@@ -18,9 +18,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * Changelog
- *     15-Jan-2006  LCVR  Splitted from gpio.c
  */
 
 #include <linux/kernel.h>
@@ -38,7 +35,7 @@
 int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on,
                           unsigned int config)
 {
-       void __iomem *reg = S3C2410_EINFLT0;
+       void __iomem *reg = S3C24XX_EINFLT0;
        unsigned long flags;
        unsigned long val;
 
@@ -47,7 +44,7 @@ int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on,
 
        config &= 0xff;
 
-       pin -= S3C2410_GPG8_EINT16;
+       pin -= S3C2410_GPG8;
        reg += pin & ~3;
 
        local_irq_save(flags);
@@ -61,10 +58,10 @@ int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on,
 
        /* update filter enable */
 
-       val = __raw_readl(S3C2410_EXTINT2);
+       val = __raw_readl(S3C24XX_EXTINT2);
        val &= ~(1 << ((pin * 4) + 3));
        val |= on << ((pin * 4) + 3);
-       __raw_writel(val, S3C2410_EXTINT2);
+       __raw_writel(val, S3C24XX_EXTINT2);
 
        local_irq_restore(flags);
 
@@ -75,7 +72,7 @@ EXPORT_SYMBOL(s3c2410_gpio_irqfilter);
 
 int s3c2410_gpio_getirq(unsigned int pin)
 {
-       if (pin < S3C2410_GPF0 || pin > S3C2410_GPG15_EINT23)
+       if (pin < S3C2410_GPF0 || pin > S3C2410_GPG15)
                return -1;      /* not valid interrupts */
 
        if (pin < S3C2410_GPG0 && pin > S3C2410_GPF7)