[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>

diff --git a/arch/arm/mach-s3c2410/irq.c b/arch/arm/mach-s3c2410/irq.c
index 66d8c068e940b9436693361f7bdd5dc5f941bc6e..46465742ed7977d8f4ea73554d5282d15c22a0ae 100644 (file)
--- a/arch/arm/mach-s3c2410/irq.c
+++ b/arch/arm/mach-s3c2410/irq.c
@@ -275,28 +275,28 @@ s3c_irqext_type(unsigned int irq, unsigned int type)
        if ((irq >= IRQ_EINT0) && (irq <= IRQ_EINT3))
        {
                gpcon_reg = S3C2410_GPFCON;
-               extint_reg = S3C2410_EXTINT0;
+               extint_reg = S3C24XX_EXTINT0;
                gpcon_offset = (irq - IRQ_EINT0) * 2;
                extint_offset = (irq - IRQ_EINT0) * 4;
        }
        else if ((irq >= IRQ_EINT4) && (irq <= IRQ_EINT7))
        {
                gpcon_reg = S3C2410_GPFCON;
-               extint_reg = S3C2410_EXTINT0;
+               extint_reg = S3C24XX_EXTINT0;
                gpcon_offset = (irq - (EXTINT_OFF)) * 2;
                extint_offset = (irq - (EXTINT_OFF)) * 4;
        }
        else if ((irq >= IRQ_EINT8) && (irq <= IRQ_EINT15))
        {
                gpcon_reg = S3C2410_GPGCON;
-               extint_reg = S3C2410_EXTINT1;
+               extint_reg = S3C24XX_EXTINT1;
                gpcon_offset = (irq - IRQ_EINT8) * 2;
                extint_offset = (irq - IRQ_EINT8) * 4;
        }
        else if ((irq >= IRQ_EINT16) && (irq <= IRQ_EINT23))
        {
                gpcon_reg = S3C2410_GPGCON;
-               extint_reg = S3C2410_EXTINT2;
+               extint_reg = S3C24XX_EXTINT2;
                gpcon_offset = (irq - IRQ_EINT8) * 2;
                extint_offset = (irq - IRQ_EINT16) * 4;
        } else

diff --git a/arch/arm/mach-s3c2410/s3c2410-gpio.c b/arch/arm/mach-s3c2410/s3c2410-gpio.c
index 17519b3281b22504e576e4534948ab69b4596d6f..471a714900103c55c034d6c396f5c6cb9ad2b082 100644 (file)
--- a/arch/arm/mach-s3c2410/s3c2410-gpio.c
+++ b/arch/arm/mach-s3c2410/s3c2410-gpio.c
@@ -35,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;
 
@@ -58,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);