Skip to content

Commit

Permalink
[ARM] 3915/1: S3C2412: Add s3c2410_gpio_getirq() to general gpio.c
Browse files Browse the repository at this point in the history
s3c2410_gpio_getirq() holds for the S3C2412 build,
so ensure that it gets built for all the current
S3C24XX architectures

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Ben Dooks authored and Russell King committed Nov 2, 2006
1 parent 7321818 commit 94c52fd
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
21 changes: 20 additions & 1 deletion arch/arm/mach-s3c2410/gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Copyright (c) 2004-2005 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk>
*
* S3C2410 GPIO support
* S3C24XX GPIO support
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -163,3 +163,22 @@ unsigned int s3c2410_modify_misccr(unsigned int clear, unsigned int change)
}

EXPORT_SYMBOL(s3c2410_modify_misccr);

int s3c2410_gpio_getirq(unsigned int pin)
{
if (pin < S3C2410_GPF0 || pin > S3C2410_GPG15)
return -1; /* not valid interrupts */

if (pin < S3C2410_GPG0 && pin > S3C2410_GPF7)
return -1; /* not valid pin */

if (pin < S3C2410_GPF4)
return (pin - S3C2410_GPF0) + IRQ_EINT0;

if (pin < S3C2410_GPG0)
return (pin - S3C2410_GPF4) + IRQ_EINT4;

return (pin - S3C2410_GPG0) + IRQ_EINT8;
}

EXPORT_SYMBOL(s3c2410_gpio_getirq);
19 changes: 0 additions & 19 deletions arch/arm/mach-s3c2410/s3c2410-gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,22 +69,3 @@ int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on,
}

EXPORT_SYMBOL(s3c2410_gpio_irqfilter);

int s3c2410_gpio_getirq(unsigned int pin)
{
if (pin < S3C2410_GPF0 || pin > S3C2410_GPG15)
return -1; /* not valid interrupts */

if (pin < S3C2410_GPG0 && pin > S3C2410_GPF7)
return -1; /* not valid pin */

if (pin < S3C2410_GPF4)
return (pin - S3C2410_GPF0) + IRQ_EINT0;

if (pin < S3C2410_GPG0)
return (pin - S3C2410_GPF4) + IRQ_EINT4;

return (pin - S3C2410_GPG0) + IRQ_EINT8;
}

EXPORT_SYMBOL(s3c2410_gpio_getirq);

0 comments on commit 94c52fd

Please sign in to comment.