tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

[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>

authored by

Philipp Zabel and committed by
Linus Torvalds adff264f d23c6c21

+11 -10
+11 -10
include/asm-arm/arch-s3c2410/gpio.h
··· 1 1 /* 2 - * linux/include/asm-arm/arch-pxa/gpio.h 2 + * linux/include/asm-arm/arch-s3c2410/gpio.h 3 3 * 4 - * S3C2400 GPIO wrappers for arch-neutral GPIO calls 4 + * S3C2410 GPIO wrappers for arch-neutral GPIO calls 5 5 * 6 6 * Written by Philipp Zabel <philipp.zabel@gmail.com> 7 7 * ··· 21 21 * 22 22 */ 23 23 24 - #ifndef __ASM_ARCH_PXA_GPIO_H 25 - #define __ASM_ARCH_PXA_GPIO_H 24 + #ifndef __ASM_ARCH_S3C2410_GPIO_H 25 + #define __ASM_ARCH_S3C2410_GPIO_H 26 26 27 - #include <asm/arch/pxa-regs.h> 28 - #include <asm/arch/irqs.h> 29 - #include <asm/arch/hardware.h> 30 - 31 - #include <asm/errno.h> 27 + #include <asm/irq.h> 28 + #include <asm/hardware.h> 29 + #include <asm/arch/regs-gpio.h> 32 30 33 31 static inline int gpio_request(unsigned gpio, const char *label) 34 32 { ··· 55 57 56 58 #include <asm-generic/gpio.h> /* cansleep wrappers */ 57 59 58 - /* FIXME or maybe s3c2400_gpio_getirq() ... */ 60 + #ifdef CONFIG_CPU_S3C2400 61 + #define gpio_to_irq(gpio) s3c2400_gpio_getirq(gpio) 62 + #else 59 63 #define gpio_to_irq(gpio) s3c2410_gpio_getirq(gpio) 64 + #endif 60 65 61 66 /* FIXME implement irq_to_gpio() */ 62 67