public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Scott McNutt <smcnutt@psyent.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 1/2] nios2: add gpio_request
Date: Tue, 15 Jun 2010 21:29:36 -0400	[thread overview]
Message-ID: <4C182900.7060307@psyent.com> (raw)
In-Reply-To: <1276048270-16482-1-git-send-email-thomas@wytron.com.tw>

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;

      parent reply	other threads:[~2010-06-16  1:29 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-09  1:51 [U-Boot] [PATCH 1/2] nios2: add gpio_request Thomas Chou
2010-06-09  1:51 ` [U-Boot] [PATCH 2/2] gpio_led: add gpio_request to __led_init Thomas Chou
2010-06-09  4:25   ` Mike Frysinger
2010-06-09  5:32     ` [U-Boot] [PATCH 2/2 v2] " Thomas Chou
2010-06-16  1:29       ` Scott McNutt
2010-07-05 14:31         ` Thomas Chou
2010-06-09  5:41     ` [U-Boot] [PATCH 2/2] " Thomas Chou
2010-06-16  1:29 ` Scott McNutt [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4C182900.7060307@psyent.com \
    --to=smcnutt@psyent.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox