diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-10-25 13:46:39 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:02:51 +0200 |
| commit | 9ab268f9e19b472fdccb80ec005f48ce5150fa7f (patch) | |
| tree | 76da882b9bd9659e915cf825d183f6c4e2aae838 | |
| parent | e38029e2d7fce203cf2af29b24f0f487f475ac57 (diff) | |
gpio/nomadik: move the Nomadik GPIO header
This takes the Nomadik GPIO header out of the plat-nomadik
directory and pushes it down into <gpio/nomadik> where it belongs.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/gpio.h | 8 | ||||
| -rw-r--r-- | drivers/gpio/gpio-nomadik.c | 2 | ||||
| -rw-r--r-- | include/linux/gpio/nomadik.h (renamed from arch/arm/plat-nomadik/include/plat/gpio-nomadik.h) | 0 |
3 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/include/mach/gpio.h b/arch/arm/mach-ux500/include/mach/gpio.h index 6a9463dfd9c..2d3bb8f47ce 100644 --- a/arch/arm/mach-ux500/include/mach/gpio.h +++ b/arch/arm/mach-ux500/include/mach/gpio.h @@ -14,6 +14,14 @@ #define NOMADIK_NR_GPIO 288 +#include <asm-generic/gpio.h> + +/* Invoke gpiolibs gpio_chip abstraction */ +#define gpio_get_value __gpio_get_value +#define gpio_set_value __gpio_set_value +#define gpio_cansleep __gpio_cansleep +#define gpio_to_irq __gpio_to_irq + #define MOP500_EGPIO(x) (NOMADIK_NR_GPIO + (x)) #define MOP500_EGPIO_END MOP500_EGPIO(24) #define AB8500_GPIO_BASE MOP500_EGPIO_END diff --git a/drivers/gpio/gpio-nomadik.c b/drivers/gpio/gpio-nomadik.c index 839624f9fe6..37052348724 100644 --- a/drivers/gpio/gpio-nomadik.c +++ b/drivers/gpio/gpio-nomadik.c @@ -23,11 +23,11 @@ #include <linux/interrupt.h> #include <linux/irq.h> #include <linux/slab.h> +#include <linux/gpio/nomadik.h> #include <asm/mach/irq.h> #include <plat/pincfg.h> -#include <plat/gpio-nomadik.h> #include <mach/hardware.h> #include <asm/gpio.h> diff --git a/arch/arm/plat-nomadik/include/plat/gpio-nomadik.h b/include/linux/gpio/nomadik.h index 9605bf227df..9605bf227df 100644 --- a/arch/arm/plat-nomadik/include/plat/gpio-nomadik.h +++ b/include/linux/gpio/nomadik.h |