openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Ben Dooks 2006-06-24 21:21:33 +01:00 committed by Russell King
parent 46491c94d3
commit 44cc7c9c15
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-s3c2410/irq.c
View File

@ -275,28 +275,28 @@ s3c_irqext_type(unsigned int irq, unsigned int type)
if ((irq >= IRQ_EINT0) && (irq <= IRQ_EINT3)) if ((irq >= IRQ_EINT0) && (irq <= IRQ_EINT3))
{ {
gpcon_reg = S3C2410_GPFCON; gpcon_reg = S3C2410_GPFCON;
extint_reg = S3C2410_EXTINT0; extint_reg = S3C24XX_EXTINT0;
gpcon_offset = (irq - IRQ_EINT0) * 2; gpcon_offset = (irq - IRQ_EINT0) * 2;
extint_offset = (irq - IRQ_EINT0) * 4; extint_offset = (irq - IRQ_EINT0) * 4;
} }
else if ((irq >= IRQ_EINT4) && (irq <= IRQ_EINT7)) else if ((irq >= IRQ_EINT4) && (irq <= IRQ_EINT7))
{ {
gpcon_reg = S3C2410_GPFCON; gpcon_reg = S3C2410_GPFCON;
extint_reg = S3C2410_EXTINT0; extint_reg = S3C24XX_EXTINT0;
gpcon_offset = (irq - (EXTINT_OFF)) * 2; gpcon_offset = (irq - (EXTINT_OFF)) * 2;
extint_offset = (irq - (EXTINT_OFF)) * 4; extint_offset = (irq - (EXTINT_OFF)) * 4;
} }
else if ((irq >= IRQ_EINT8) && (irq <= IRQ_EINT15)) else if ((irq >= IRQ_EINT8) && (irq <= IRQ_EINT15))
{ {
gpcon_reg = S3C2410_GPGCON; gpcon_reg = S3C2410_GPGCON;
extint_reg = S3C2410_EXTINT1; extint_reg = S3C24XX_EXTINT1;
gpcon_offset = (irq - IRQ_EINT8) * 2; gpcon_offset = (irq - IRQ_EINT8) * 2;
extint_offset = (irq - IRQ_EINT8) * 4; extint_offset = (irq - IRQ_EINT8) * 4;
} }
else if ((irq >= IRQ_EINT16) && (irq <= IRQ_EINT23)) else if ((irq >= IRQ_EINT16) && (irq <= IRQ_EINT23))
{ {
gpcon_reg = S3C2410_GPGCON; gpcon_reg = S3C2410_GPGCON;
extint_reg = S3C2410_EXTINT2; extint_reg = S3C24XX_EXTINT2;
gpcon_offset = (irq - IRQ_EINT8) * 2; gpcon_offset = (irq - IRQ_EINT8) * 2;
extint_offset = (irq - IRQ_EINT16) * 4; extint_offset = (irq - IRQ_EINT16) * 4;
} else } else

6
arch/arm/mach-s3c2410/s3c2410-gpio.c
View File

@ -35,7 +35,7 @@
int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on, int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on,
unsigned int config) unsigned int config)
{ {
void __iomem *reg = S3C2410_EINFLT0; void __iomem *reg = S3C24XX_EINFLT0;
unsigned long flags; unsigned long flags;
unsigned long val; unsigned long val;
@ -58,10 +58,10 @@ int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on,
/* update filter enable */ /* update filter enable */
val = __raw_readl(S3C2410_EXTINT2); val = __raw_readl(S3C24XX_EXTINT2);
val &= ~(1 << ((pin * 4) + 3)); val &= ~(1 << ((pin * 4) + 3));
val |= on << ((pin * 4) + 3); val |= on << ((pin * 4) + 3);
__raw_writel(val, S3C2410_EXTINT2); __raw_writel(val, S3C24XX_EXTINT2);
local_irq_restore(flags); local_irq_restore(flags);