a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] GPIO API: SA1100 wrapper cleanup

Browse Source 
Based on the discussion last december (http://lkml.org/lkml/2006/12/20/241),
this patch
  - adds gpio_direction_input/output functions to
    generic.c instead of making them inline,
  - fixes comment and includes and uses inline functions
    instead of macros in gpio.h

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>
This commit is contained in:
Philipp Zabel 2007-02-20 13:58:20 -08:00 committed by Linus Torvalds
parent adff264fe6
commit 5b7e42b2d3
2 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
arch/arm/mach-sa1100/generic.c
View File

@ -138,6 +138,36 @@ unsigned long long sched_clock(void)
return v; return v;
} }
int gpio_direction_input(unsigned gpio)
{
unsigned long flags;
if (gpio > GPIO_MAX)
return -EINVAL;
local_irq_save(flags);
GPDR &= ~GPIO_GPIO(gpio);
local_irq_restore(flags);
return 0;
}
EXPORT_SYMBOL(gpio_direction_input);
int gpio_direction_output(unsigned gpio)
{
unsigned long flags;
if (gpio > GPIO_MAX)
return -EINVAL;
local_irq_save(flags);
GPDR |= GPIO_GPIO(gpio);
local_irq_restore(flags);
return 0;
}
EXPORT_SYMBOL(gpio_direction_output);
/* /*
* Default power-off for SA1100 * Default power-off for SA1100
*/ */

34
include/asm-arm/arch-sa1100/gpio.h
View File

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/arch-pxa/gpio.h * linux/include/asm-arm/arch-sa1100/gpio.h
* *
* SA1100 GPIO wrappers for arch-neutral GPIO calls * SA1100 GPIO wrappers for arch-neutral GPIO calls
* *
@ -24,11 +24,8 @@
#ifndef __ASM_ARCH_SA1100_GPIO_H #ifndef __ASM_ARCH_SA1100_GPIO_H
#define __ASM_ARCH_SA1100_GPIO_H #define __ASM_ARCH_SA1100_GPIO_H
#include <asm/arch/SA-1100.h> #include <asm/hardware.h>
#include <asm/arch/irqs.h> #include <asm/irq.h>
#include <asm/arch/hardware.h>
#include <asm/errno.h>
static inline int gpio_request(unsigned gpio, const char *label) static inline int gpio_request(unsigned gpio, const char *label)
{ {
@ -40,26 +37,23 @@ static inline void gpio_free(unsigned gpio)
return; return;
} }
static inline int gpio_direction_input(unsigned gpio) extern int gpio_direction_input(unsigned gpio);
extern int gpio_direction_output(unsigned gpio);
static inline int gpio_get_value(unsigned gpio)
{ {
if (gpio > GPIO_MAX) return GPLR & GPIO_GPIO(gpio);
return -EINVAL;
GPDR = (GPDR_In << gpio) 0
} }
static inline int gpio_direction_output(unsigned gpio) static inline void gpio_set_value(unsigned gpio, int value)
{ {
if (gpio > GPIO_MAX) if (value)
return -EINVAL; GPSR = GPIO_GPIO(gpio);
GPDR = (GPDR_Out << gpio) 0 else
GPCR = GPIO_GPIO(gpio);
} }
#define gpio_get_value(gpio) \
(GPLR & GPIO_GPIO(gpio))
#define gpio_set_value(gpio,value) \
((value) ? (GPSR = GPIO_GPIO(gpio)) : (GPCR(gpio) = GPIO_GPIO(gpio)))
#include <asm-generic/gpio.h> /* cansleep wrappers */ #include <asm-generic/gpio.h> /* cansleep wrappers */
static inline unsigned gpio_to_irq(unsigned gpio) static inline unsigned gpio_to_irq(unsigned gpio)