diff options
| author | Philipp Zabel | 2007-02-20 13:58:20 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2007-02-20 17:10:16 -0800 |
| commit | adff264fe66d78a166dc887f861e7273d0cb1654 (patch) | |
| tree | 5cd2d29ec1584d8c77bdaa01de9e769ab9de264c | |
| parent | d23c6c21af5624c774adb6fa7155000bfd75ba40 (diff) | |
[PATCH] GPIO API: S3C2410 wrapper cleanup
this one adds an #include <asm/arch/regs-gpio.h>.
Tested by Roman Moravcik on s3c2440.
Based on the discussion last december
(http://lkml.org/lkml/2006/12/20/243), this patch
- fixes comment and includes in gpio.h
- adds the gpio_to_irq definition for S3C2400
- includes asm/arch/regs-gpio.h for pin direction
definitions
Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | include/asm-arm/arch-s3c2410/gpio.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/include/asm-arm/arch-s3c2410/gpio.h b/include/asm-arm/arch-s3c2410/gpio.h index 67b8b9ab22e9..d47ae453f8ca 100644 --- a/include/asm-arm/arch-s3c2410/gpio.h +++ b/include/asm-arm/arch-s3c2410/gpio.h @@ -1,7 +1,7 @@ /* - * linux/include/asm-arm/arch-pxa/gpio.h + * linux/include/asm-arm/arch-s3c2410/gpio.h * - * S3C2400 GPIO wrappers for arch-neutral GPIO calls + * S3C2410 GPIO wrappers for arch-neutral GPIO calls * * Written by Philipp Zabel <philipp.zabel@gmail.com> * @@ -21,14 +21,12 @@ * */ -#ifndef __ASM_ARCH_PXA_GPIO_H -#define __ASM_ARCH_PXA_GPIO_H +#ifndef __ASM_ARCH_S3C2410_GPIO_H +#define __ASM_ARCH_S3C2410_GPIO_H -#include <asm/arch/pxa-regs.h> -#include <asm/arch/irqs.h> -#include <asm/arch/hardware.h> - -#include <asm/errno.h> +#include <asm/irq.h> +#include <asm/hardware.h> +#include <asm/arch/regs-gpio.h> static inline int gpio_request(unsigned gpio, const char *label) { @@ -57,8 +55,11 @@ static inline int gpio_direction_output(unsigned gpio) #include <asm-generic/gpio.h> /* cansleep wrappers */ -/* FIXME or maybe s3c2400_gpio_getirq() ... */ +#ifdef CONFIG_CPU_S3C2400 +#define gpio_to_irq(gpio) s3c2400_gpio_getirq(gpio) +#else #define gpio_to_irq(gpio) s3c2410_gpio_getirq(gpio) +#endif /* FIXME implement irq_to_gpio() */ |