leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: plat-iop: remove custom complex GPIO implementation

Browse Source 
The kernel will now only use gpiolib to access GPIOs, so remove
the complex GPIO flag and the custom implementation.

Cc: Lennert Buytenhek <kernel@wantstofly.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Mikael Pettersson <mikpe@it.uu.se>
Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2013-09-09 16:07:42 +02:00
parent f6ffa5ee03
commit 51a97d829e
3 changed files with 3 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
arch/arm/include/asm/hardware/iop3xx-gpio.h
View File

@ -28,48 +28,5 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm-generic/gpio.h> #include <asm-generic/gpio.h>
#define __ARM_GPIOLIB_COMPLEX
#define IOP3XX_N_GPIOS 8
static inline int gpio_get_value(unsigned gpio)
{
if (gpio > IOP3XX_N_GPIOS)
return __gpio_get_value(gpio);
return gpio_line_get(gpio);
}
static inline void gpio_set_value(unsigned gpio, int value)
{
if (gpio > IOP3XX_N_GPIOS) {
__gpio_set_value(gpio, value);
return;
}
gpio_line_set(gpio, value);
}
static inline int gpio_cansleep(unsigned gpio)
{
if (gpio < IOP3XX_N_GPIOS)
return 0;
else
return __gpio_cansleep(gpio);
}
/*
* The GPIOs are not generating any interrupt
* Note : manuals are not clear about this
*/
static inline int gpio_to_irq(int gpio)
{
return -EINVAL;
}
static inline int irq_to_gpio(int gpio)
{
return -EINVAL;
}
#endif #endif

3
arch/arm/include/asm/hardware/iop3xx.h
View File

@ -25,9 +25,6 @@
#define IOP3XX_GPIO_LINE(x) (x) #define IOP3XX_GPIO_LINE(x) (x)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
extern void gpio_line_config(int line, int direction);
extern int gpio_line_get(int line);
extern void gpio_line_set(int line, int value);
extern int init_atu; extern int init_atu;
extern int iop3xx_get_init_atu(void); extern int iop3xx_get_init_atu(void);
#endif #endif

9
drivers/gpio/gpio-iop.c
View File

@ -19,7 +19,7 @@
#define IOP3XX_N_GPIOS 8 #define IOP3XX_N_GPIOS 8
void gpio_line_config(int line, int direction) static void gpio_line_config(int line, int direction)
{ {
unsigned long flags; unsigned long flags;
@ -31,15 +31,13 @@ void gpio_line_config(int line, int direction)
} }
local_irq_restore(flags); local_irq_restore(flags);
} }
EXPORT_SYMBOL(gpio_line_config);
int gpio_line_get(int line) static int gpio_line_get(int line)
{ {
return !!(*IOP3XX_GPID & (1 << line)); return !!(*IOP3XX_GPID & (1 << line));
} }
EXPORT_SYMBOL(gpio_line_get);
void gpio_line_set(int line, int value) static void gpio_line_set(int line, int value)
{ {
unsigned long flags; unsigned long flags;
@ -51,7 +49,6 @@ void gpio_line_set(int line, int value)
} }
local_irq_restore(flags); local_irq_restore(flags);
} }
EXPORT_SYMBOL(gpio_line_set);
static int iop3xx_gpio_direction_input(struct gpio_chip *chip, unsigned gpio) static int iop3xx_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
{ {