From mboxrd@z Thu Jan  1 00:00:00 1970
From: Scott McNutt <smcnutt@psyent.com>
Date: Tue, 15 Jun 2010 21:29:36 -0400
Subject: [U-Boot] [PATCH 1/2] nios2: add gpio_request
In-Reply-To: <1276048270-16482-1-git-send-email-thomas@wytron.com.tw>
References: <1276048270-16482-1-git-send-email-thomas@wytron.com.tw>
Message-ID: <4C182900.7060307@psyent.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

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;