summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Chou <thomas@wytron.com.tw>2010-06-09 09:51:09 +0800
committerScott McNutt <smcnutt@psyent.com>2010-07-12 11:30:51 -0400
commit6db6c18b5074f959882bb199c850359ded54778f (patch)
tree76d1b199252d3ba3eb83dd8cfe5d7fcbb2743410
parent06c5d30dc358a41efa3a27e1c7f602e7b3e8a6f5 (diff)
downloadu-boot-imx-6db6c18b5074f959882bb199c850359ded54778f.zip
u-boot-imx-6db6c18b5074f959882bb199c850359ded54778f.tar.gz
u-boot-imx-6db6c18b5074f959882bb199c850359ded54778f.tar.bz2
nios2: add gpio_request
This will be used by nand_plat. Signed-off-by: Thomas Chou <thomas@wytron.com.tw> Signed-off-by: Scott McNutt <smcnutt@psyent.com>
-rw-r--r--arch/nios2/include/asm/gpio.h6
-rw-r--r--board/altera/nios2-generic/gpio.c5
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/nios2/include/asm/gpio.h b/arch/nios2/include/asm/gpio.h
index 76c425e..cff1dd9 100644
--- a/arch/nios2/include/asm/gpio.h
+++ b/arch/nios2/include/asm/gpio.h
@@ -21,6 +21,11 @@
#ifdef CONFIG_SYS_GPIO_BASE
#include <asm/io.h>
+static inline int gpio_request(unsigned gpio, const char *label)
+{
+ return 0;
+}
+
static inline int gpio_direction_input(unsigned gpio)
{
writel(1, CONFIG_SYS_GPIO_BASE + (gpio << 2));
@@ -43,6 +48,7 @@ static inline void gpio_set_value(unsigned gpio, int value)
writel(value ? 3 : 2, CONFIG_SYS_GPIO_BASE + (gpio << 2));
}
#else
+extern int gpio_request(unsigned gpio, const char *label);
extern int gpio_direction_input(unsigned gpio);
extern int gpio_direction_output(unsigned gpio, int value);
extern int gpio_get_value(unsigned gpio);
diff --git a/board/altera/nios2-generic/gpio.c b/board/altera/nios2-generic/gpio.c
index 6c9c6c2..d449684 100644
--- a/board/altera/nios2-generic/gpio.c
+++ b/board/altera/nios2-generic/gpio.c
@@ -15,6 +15,11 @@
static u32 pio_data_reg;
static u32 pio_dir_reg;
+int gpio_request(unsigned gpio, const char *label)
+{
+ return 0;
+}
+
int gpio_direction_input(unsigned gpio)
{
u32 mask = 1 << gpio;