diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2006-06-24 16:21:26 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-06-24 16:21:26 -0400 |
| commit | a3ff55026e59687040f00fc35680fc0e774859f4 (patch) | |
| tree | 41fe003d4e2dddd794b989bc4bfde5ebfb2f8838 | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff) | |
[ARM] 3633/1: S3C24XX: s3c2410 gpio bugfix - wrong pin nos
Patch from Ben Dooks
The s3c2410 gpio functions have a pair of bugs where
the code is using the pin function definitions instead
of the pin gpio numbers.
Also remove the changelog
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-s3c2410/s3c2410-gpio.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c2410/s3c2410-gpio.c b/arch/arm/mach-s3c2410/s3c2410-gpio.c index d5e1caea1d23..17519b3281b2 100644 --- a/arch/arm/mach-s3c2410/s3c2410-gpio.c +++ b/arch/arm/mach-s3c2410/s3c2410-gpio.c | |||
| @@ -18,9 +18,6 @@ | |||
| 18 | * You should have received a copy of the GNU General Public License | 18 | * You should have received a copy of the GNU General Public License |
| 19 | * along with this program; if not, write to the Free Software | 19 | * along with this program; if not, write to the Free Software |
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | * | ||
| 22 | * Changelog | ||
| 23 | * 15-Jan-2006 LCVR Splitted from gpio.c | ||
| 24 | */ | 21 | */ |
| 25 | 22 | ||
| 26 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| @@ -47,7 +44,7 @@ int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on, | |||
| 47 | 44 | ||
| 48 | config &= 0xff; | 45 | config &= 0xff; |
| 49 | 46 | ||
| 50 | pin -= S3C2410_GPG8_EINT16; | 47 | pin -= S3C2410_GPG8; |
| 51 | reg += pin & ~3; | 48 | reg += pin & ~3; |
| 52 | 49 | ||
| 53 | local_irq_save(flags); | 50 | local_irq_save(flags); |
| @@ -75,7 +72,7 @@ EXPORT_SYMBOL(s3c2410_gpio_irqfilter); | |||
| 75 | 72 | ||
| 76 | int s3c2410_gpio_getirq(unsigned int pin) | 73 | int s3c2410_gpio_getirq(unsigned int pin) |
| 77 | { | 74 | { |
| 78 | if (pin < S3C2410_GPF0 || pin > S3C2410_GPG15_EINT23) | 75 | if (pin < S3C2410_GPF0 || pin > S3C2410_GPG15) |
| 79 | return -1; /* not valid interrupts */ | 76 | return -1; /* not valid interrupts */ |
| 80 | 77 | ||
| 81 | if (pin < S3C2410_GPG0 && pin > S3C2410_GPF7) | 78 | if (pin < S3C2410_GPG0 && pin > S3C2410_GPF7) |
