luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: S3C64XX: add support for all group 0 external interrupts

Browse Source 
Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
This commit is contained in:
Maurus Cuelenaere 2009-11-20 13:04:13 +01:00 committed by Ben Dooks
parent 23196a42a6
commit 6a88e9838f
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/plat-s3c64xx/gpiolib.c
View File

@ -213,6 +213,11 @@ static struct s3c_gpio_cfg gpio_4bit_cfg_eint0011 = {
.get_pull = s3c_gpio_getpull_updown, .get_pull = s3c_gpio_getpull_updown,
}; };
int s3c64xx_gpio2int_gpm(struct gpio_chip *chip, unsigned pin)
{
return pin < 5 ? IRQ_EINT(23) + pin : -ENXIO;
}
static struct s3c_gpio_chip gpio_4bit[] = { static struct s3c_gpio_chip gpio_4bit[] = {
{ {
.base = S3C64XX_GPA_BASE, .base = S3C64XX_GPA_BASE,
@ -269,10 +274,16 @@ static struct s3c_gpio_chip gpio_4bit[] = {
.base = S3C64XX_GPM(0), .base = S3C64XX_GPM(0),
.ngpio = S3C64XX_GPIO_M_NR, .ngpio = S3C64XX_GPIO_M_NR,
.label = "GPM", .label = "GPM",
.to_irq = s3c64xx_gpio2int_gpm,
}, },
}, },
}; };
int s3c64xx_gpio2int_gpl(struct gpio_chip *chip, unsigned pin)
{
return pin >= 8 ? IRQ_EINT(16) + pin - 8 : -ENXIO;
}
static struct s3c_gpio_chip gpio_4bit2[] = { static struct s3c_gpio_chip gpio_4bit2[] = {
{ {
.base = S3C64XX_GPH_BASE + 0x4, .base = S3C64XX_GPH_BASE + 0x4,
@ -297,6 +308,7 @@ static struct s3c_gpio_chip gpio_4bit2[] = {
.base = S3C64XX_GPL(0), .base = S3C64XX_GPL(0),
.ngpio = S3C64XX_GPIO_L_NR, .ngpio = S3C64XX_GPIO_L_NR,
.label = "GPL", .label = "GPL",
.to_irq = s3c64xx_gpio2int_gpl,
}, },
}, },
}; };

19
arch/arm/plat-s3c64xx/irq-eint.c
View File

@ -65,7 +65,7 @@ static void s3c_irq_eint_maskack(unsigned int irq)
static int s3c_irq_eint_set_type(unsigned int irq, unsigned int type) static int s3c_irq_eint_set_type(unsigned int irq, unsigned int type)
{ {
int offs = eint_offset(irq); int offs = eint_offset(irq);
int pin; int pin, pin_val;
int shift; int shift;
u32 ctrl, mask; u32 ctrl, mask;
u32 newvalue = 0; u32 newvalue = 0;
@ -109,7 +109,10 @@ static int s3c_irq_eint_set_type(unsigned int irq, unsigned int type)
return -1; return -1;
} }
shift = (offs / 2) * 4; if (offs <= 15)
shift = (offs / 2) * 4;
else
shift = ((offs - 16) / 2) * 4;
mask = 0x7 << shift; mask = 0x7 << shift;
ctrl = __raw_readl(reg); ctrl = __raw_readl(reg);
@ -119,12 +122,18 @@ static int s3c_irq_eint_set_type(unsigned int irq, unsigned int type)
/* set the GPIO pin appropriately */ /* set the GPIO pin appropriately */
if (offs < 23) if (offs < 16) {
pin = S3C64XX_GPN(offs); pin = S3C64XX_GPN(offs);
else pin_val = S3C_GPIO_SFN(2);
} else if (offs < 23) {
pin = S3C64XX_GPL(offs + 8 - 16);
pin_val = S3C_GPIO_SFN(3);
} else {
pin = S3C64XX_GPM(offs - 23); pin = S3C64XX_GPM(offs - 23);
pin_val = S3C_GPIO_SFN(3);
}
s3c_gpio_cfgpin(pin, S3C_GPIO_SFN(2)); s3c_gpio_cfgpin(pin, pin_val);
return 0; return 0;
} }