public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Sonic Zhang <sonic.adi@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 2/4 v2] blackfin: If none ADI_GPIOX macro is defined, use ADI_GPIO1 as default
Date: Mon, 25 Nov 2013 14:27:11 +0800	[thread overview]
Message-ID: <1385360833-26879-2-git-send-email-sonic.adi@gmail.com> (raw)
In-Reply-To: <1385360833-26879-1-git-send-email-sonic.adi@gmail.com>

From: Sonic Zhang <sonic.zhang@analog.com>

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
---
 arch/blackfin/cpu/gpio.c         |    2 +-
 arch/blackfin/include/asm/gpio.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/blackfin/cpu/gpio.c b/arch/blackfin/cpu/gpio.c
index 5e9c68a..86da706 100644
--- a/arch/blackfin/cpu/gpio.c
+++ b/arch/blackfin/cpu/gpio.c
@@ -12,7 +12,7 @@
 #include <asm/gpio.h>
 #include <asm/portmux.h>
 
-#ifdef CONFIG_ADI_GPIO1
+#ifndef CONFIG_ADI_GPIO2
 #if ANOMALY_05000311 || ANOMALY_05000323
 enum {
 	AWA_data = SYSCR,
diff --git a/arch/blackfin/include/asm/gpio.h b/arch/blackfin/include/asm/gpio.h
index 376ec02..6ebcf01 100644
--- a/arch/blackfin/include/asm/gpio.h
+++ b/arch/blackfin/include/asm/gpio.h
@@ -72,7 +72,7 @@
 
 #ifndef __ASSEMBLY__
 
-#ifdef CONFIG_ADI_GPIO1
+#ifndef CONFIG_ADI_GPIO2
 void set_gpio_dir(unsigned, unsigned short);
 void set_gpio_inen(unsigned, unsigned short);
 void set_gpio_polar(unsigned, unsigned short);
-- 
1.7.9.5

  reply	other threads:[~2013-11-25  6:27 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-25  6:27 [U-Boot] [PATCH 1/4 v2] blackfin: Use ADI_GPIO2 driver other than the default ADI_GPIO1 Sonic Zhang
2013-11-25  6:27 ` Sonic Zhang [this message]
2013-11-25  6:27 ` [U-Boot] [PATCH 3/4 v2] blackfin: Add missing macro CONFIG_BFIN_SERIAL Sonic Zhang
2013-11-25  6:27 ` [U-Boot] [PATCH 4/4 v2] blackfin: soft-i2c: No need to define blackfin specific soft i2c operations Sonic Zhang
2013-11-25  6:51   ` Heiko Schocher
2013-11-25  7:07     ` Zhang, Sonic
2013-11-25  7:15       ` Heiko Schocher
2013-11-25  7:15   ` Heiko Schocher

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=1385360833-26879-2-git-send-email-sonic.adi@gmail.com \
    --to=sonic.adi@gmail.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