aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/plat-s3c/gpio.c
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2008-10-31 16:14:32 +0000
committerBen Dooks <ben-linux@fluff.org>2008-12-15 23:33:42 +0000
commit8a53bdb907cb924ed30f79bcfe7f4f15ff7de15e (patch)
treee2bca4f6a4988f4eeb79ff18ac782b2383d1cf92 /arch/arm/plat-s3c/gpio.c
parent7db6c82a37beabef7b76d232e3d20efacd74bd3a (diff)
[ARM] S3C: Add GPIO chip tracking
The gpiolib driver keeps its chip array to itself and having a separate array for s3c-only gpios stops any non-s3c gpio being used in one of the s3c specific configuration calls. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/plat-s3c/gpio.c')
-rw-r--r--arch/arm/plat-s3c/gpio.c21
1 files changed, 20 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c/gpio.c b/arch/arm/plat-s3c/gpio.c
index f035d4550c4..d71dd6d9ce5 100644
--- a/arch/arm/plat-s3c/gpio.c
+++ b/arch/arm/plat-s3c/gpio.c
@@ -18,6 +18,22 @@
#include <plat/gpio-core.h>
+#ifdef CONFIG_S3C_GPIO_TRACK
+struct s3c_gpio_chip *s3c_gpios[S3C_GPIO_END];
+
+static __init void s3c_gpiolib_track(struct s3c_gpio_chip *chip)
+{
+ unsigned int gpn;
+ int i;
+
+ gpn = chip->chip.base;
+ for (i = 0; i < chip->chip.ngpio; i++, gpn++) {
+ BUG_ON(gpn > ARRAY_SIZE(s3c_gpios));
+ s3c_gpios[gpn] = chip;
+ }
+}
+#endif /* CONFIG_S3C_GPIO_TRACK */
+
/* Default routines for controlling GPIO, based on the original S3C24XX
* GPIO functions which deal with the case where each gpio bank of the
* chip is as following:
@@ -109,6 +125,7 @@ static int s3c_gpiolib_get(struct gpio_chip *chip, unsigned offset)
__init void s3c_gpiolib_add(struct s3c_gpio_chip *chip)
{
struct gpio_chip *gc = &chip->chip;
+ int ret;
BUG_ON(!chip->base);
BUG_ON(!gc->label);
@@ -124,5 +141,7 @@ __init void s3c_gpiolib_add(struct s3c_gpio_chip *chip)
gc->get = s3c_gpiolib_get;
/* gpiochip_add() prints own failure message on error. */
- gpiochip_add(gc);
+ ret = gpiochip_add(gc);
+ if (ret >= 0)
+ s3c_gpiolib_track(chip);
}