diff options
| author | Ben Dooks | 2010-05-17 07:13:16 +0200 |
|---|---|---|
| committer | Ben Dooks | 2010-05-18 12:06:32 +0200 |
| commit | 2c8fcfbf735e2d3b139e4247eb3e73edf64bb23f (patch) | |
| tree | 253eb5464e32a159cac657deb341347d652354c3 | |
| parent | ARM: S3C244X: fix gpiolib port J support (diff) | |
| download | kernel-qcow2-linux-2c8fcfbf735e2d3b139e4247eb3e73edf64bb23f.tar.gz kernel-qcow2-linux-2c8fcfbf735e2d3b139e4247eb3e73edf64bb23f.tar.xz kernel-qcow2-linux-2c8fcfbf735e2d3b139e4247eb3e73edf64bb23f.zip | |
ARM: S3C24XX: Start cleanup of GPIO numbering
Start cleaning up the numbering of GPIO banks by removing the old
bank start definitions currently being used by some of the header
files.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/gpio-nrs.h | 5 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2412/gpio.c | 8 |
2 files changed, 4 insertions, 9 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/gpio-nrs.h b/arch/arm/mach-s3c2410/include/mach/gpio-nrs.h index f3182ff847cb..ad94e1ac2463 100644 --- a/arch/arm/mach-s3c2410/include/mach/gpio-nrs.h +++ b/arch/arm/mach-s3c2410/include/mach/gpio-nrs.h @@ -16,12 +16,7 @@ #define S3C2410_GPIONO(bank,offset) ((bank) + (offset)) -#define S3C2410_GPIO_BANKA (32*0) -#define S3C2410_GPIO_BANKB (32*1) #define S3C2410_GPIO_BANKC (32*2) -#define S3C2410_GPIO_BANKD (32*3) -#define S3C2410_GPIO_BANKE (32*4) -#define S3C2410_GPIO_BANKF (32*5) #define S3C2410_GPIO_BANKG (32*6) #define S3C2410_GPIO_BANKH (32*7) diff --git a/arch/arm/mach-s3c2412/gpio.c b/arch/arm/mach-s3c2412/gpio.c index f7afece7fc38..71c579349dd5 100644 --- a/arch/arm/mach-s3c2412/gpio.c +++ b/arch/arm/mach-s3c2412/gpio.c @@ -33,14 +33,14 @@ int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state) offs *= 2; - if (pin < S3C2410_GPIO_BANKB) + if (pin < S3C2410_GPB(0)) return -EINVAL; - if (pin >= S3C2410_GPIO_BANKF && - pin <= S3C2410_GPIO_BANKG) + if (pin >= S3C2410_GPF(0) && + pin <= S3C2410_GPG(16)) return -EINVAL; - if (pin > (S3C2410_GPIO_BANKH + 32)) + if (pin > S3C2410_GPH(16)) return -EINVAL; local_irq_save(flags); |