diff options
author | Ben Dooks <ben-linux@org.rmk.(none)> | 2006-10-29 20:27:45 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-11-02 17:58:52 -0500 |
commit | 94c52fde553260e86f263448034930abe364faec (patch) | |
tree | 8c668d34bc291db9daf73f2b9f2e6209262424f8 /arch/arm | |
parent | 73218187e8650c08d4e4735dbeeeb860f438da7c (diff) |
[ARM] 3915/1: S3C2412: Add s3c2410_gpio_getirq() to general gpio.c
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>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-s3c2410/gpio.c | 21 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/s3c2410-gpio.c | 19 |
2 files changed, 20 insertions, 20 deletions
diff --git a/arch/arm/mach-s3c2410/gpio.c b/arch/arm/mach-s3c2410/gpio.c index db6393c99860..ba346546150b 100644 --- a/arch/arm/mach-s3c2410/gpio.c +++ b/arch/arm/mach-s3c2410/gpio.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * Copyright (c) 2004-2005 Simtec Electronics | 3 | * Copyright (c) 2004-2005 Simtec Electronics |
4 | * Ben Dooks <ben@simtec.co.uk> | 4 | * Ben Dooks <ben@simtec.co.uk> |
5 | * | 5 | * |
6 | * S3C2410 GPIO support | 6 | * S3C24XX GPIO support |
7 | * | 7 | * |
8 | * This program is free software; you can redistribute it and/or modify | 8 | * This program is free software; you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License as published by | 9 | * it under the terms of the GNU General Public License as published by |
@@ -163,3 +163,22 @@ unsigned int s3c2410_modify_misccr(unsigned int clear, unsigned int change) | |||
163 | } | 163 | } |
164 | 164 | ||
165 | EXPORT_SYMBOL(s3c2410_modify_misccr); | 165 | EXPORT_SYMBOL(s3c2410_modify_misccr); |
166 | |||
167 | int s3c2410_gpio_getirq(unsigned int pin) | ||
168 | { | ||
169 | if (pin < S3C2410_GPF0 || pin > S3C2410_GPG15) | ||
170 | return -1; /* not valid interrupts */ | ||
171 | |||
172 | if (pin < S3C2410_GPG0 && pin > S3C2410_GPF7) | ||
173 | return -1; /* not valid pin */ | ||
174 | |||
175 | if (pin < S3C2410_GPF4) | ||
176 | return (pin - S3C2410_GPF0) + IRQ_EINT0; | ||
177 | |||
178 | if (pin < S3C2410_GPG0) | ||
179 | return (pin - S3C2410_GPF4) + IRQ_EINT4; | ||
180 | |||
181 | return (pin - S3C2410_GPG0) + IRQ_EINT8; | ||
182 | } | ||
183 | |||
184 | EXPORT_SYMBOL(s3c2410_gpio_getirq); | ||
diff --git a/arch/arm/mach-s3c2410/s3c2410-gpio.c b/arch/arm/mach-s3c2410/s3c2410-gpio.c index a2098f692d83..ec3a276cc3cf 100644 --- a/arch/arm/mach-s3c2410/s3c2410-gpio.c +++ b/arch/arm/mach-s3c2410/s3c2410-gpio.c | |||
@@ -69,22 +69,3 @@ int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on, | |||
69 | } | 69 | } |
70 | 70 | ||
71 | EXPORT_SYMBOL(s3c2410_gpio_irqfilter); | 71 | EXPORT_SYMBOL(s3c2410_gpio_irqfilter); |
72 | |||
73 | int s3c2410_gpio_getirq(unsigned int pin) | ||
74 | { | ||
75 | if (pin < S3C2410_GPF0 || pin > S3C2410_GPG15) | ||
76 | return -1; /* not valid interrupts */ | ||
77 | |||
78 | if (pin < S3C2410_GPG0 && pin > S3C2410_GPF7) | ||
79 | return -1; /* not valid pin */ | ||
80 | |||
81 | if (pin < S3C2410_GPF4) | ||
82 | return (pin - S3C2410_GPF0) + IRQ_EINT0; | ||
83 | |||
84 | if (pin < S3C2410_GPG0) | ||
85 | return (pin - S3C2410_GPF4) + IRQ_EINT4; | ||
86 | |||
87 | return (pin - S3C2410_GPG0) + IRQ_EINT8; | ||
88 | } | ||
89 | |||
90 | EXPORT_SYMBOL(s3c2410_gpio_getirq); | ||