[U-Boot] [PATCH 1/2] nios2: add gpio_request

Scott McNutt
2010-06-16T01:29:36Z

Applied to: git://git.denx.de/u-boot-nios.git next
Thanks,
--Scott

Thomas Chou wrote:
> This will be used by nand_plat.
>
> Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
> ---
> arch/nios2/include/asm/gpio.h | 6 ++++++
> board/altera/nios2-generic/gpio.c | 5 +++++
> 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;