From patchwork Mon Nov 25 06:27:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sonic Zhang X-Patchwork-Id: 293822 X-Patchwork-Delegate: sonic.adi@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 1D9B42C00B9 for ; Mon, 25 Nov 2013 17:28:06 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 89EA94A8FF; Mon, 25 Nov 2013 07:28:02 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bx+xo1MGbzzF; Mon, 25 Nov 2013 07:28:02 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2C6574A8F0; Mon, 25 Nov 2013 07:27:52 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 504774A8D1 for ; Mon, 25 Nov 2013 07:27:45 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8MxhZcIGrI1u for ; Mon, 25 Nov 2013 07:27:40 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pd0-f182.google.com (mail-pd0-f182.google.com [209.85.192.182]) by theia.denx.de (Postfix) with ESMTPS id 47A544A8D5 for ; Mon, 25 Nov 2013 07:27:34 +0100 (CET) Received: by mail-pd0-f182.google.com with SMTP id v10so4852610pde.27 for ; Sun, 24 Nov 2013 22:27:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jhwm06KFvKOelI8bFFeg7aL+rBDRiXBpLA8wq3QNQn8=; b=IAuP89beKWvztU8t4rvOOXRyHYNHMDX/H908wLqfM6ANRIC+BAgbnd2ayuHikc02hv sWjjut9cbkgfnyEXPXMNNeZpWi0mpQ6BExTNbKd569PiJ1U/v7TMOnBKfm5xBKMxxF/m SrZ7PdAYYd+1U3WI8DddcD0QPmcRJIhiI9s+EKYRZDn+Dm7ZBNpmicxPPLVQgqwT6gEl xssbfdavDKI7O1SogkwDOOmenpmffeA1wy0cD8NPAVfwJgcfBbF1ttEVMOFtJjBde6zY 1io4HYe9Yevc8T4KUjVmHTHXSPTKG8r/dL9jX07O2XOL/EY05cFgHn86ZqKuWHk2KdnG VHHQ== X-Received: by 10.66.188.172 with SMTP id gb12mr1072535pac.143.1385360853229; Sun, 24 Nov 2013 22:27:33 -0800 (PST) Received: from localhost.localdomain ([114.91.244.100]) by mx.google.com with ESMTPSA id y9sm80111301pas.10.2013.11.24.22.27.26 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 24 Nov 2013 22:27:32 -0800 (PST) From: Sonic Zhang To: Masahiro Yamada , u-boot@lists.denx.de Date: Mon, 25 Nov 2013 14:27:11 +0800 Message-Id: <1385360833-26879-2-git-send-email-sonic.adi@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1385360833-26879-1-git-send-email-sonic.adi@gmail.com> References: <1385360833-26879-1-git-send-email-sonic.adi@gmail.com> Cc: Sonic Zhang , adi-u-boot-devel@lists.sourceforge.net Subject: [U-Boot] [PATCH 2/4 v2] blackfin: If none ADI_GPIOX macro is defined, use ADI_GPIO1 as default X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de From: Sonic Zhang Signed-off-by: Sonic Zhang --- 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 #include -#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);