From patchwork Mon Nov 18 07:12:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sonic Zhang X-Patchwork-Id: 291969 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 980AD2C00CE for ; Mon, 18 Nov 2013 18:45:32 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 176F84B2D0; Mon, 18 Nov 2013 08:45:29 +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 1yc5mt6AtqSS; Mon, 18 Nov 2013 08:45:28 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A34944B27B; Mon, 18 Nov 2013 08:45:27 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 608484B27B for ; Mon, 18 Nov 2013 08:45:21 +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 B4IrlsBAn5db for ; Mon, 18 Nov 2013 08:45:15 +0100 (CET) X-Greylist: delayed 1227 seconds by postgrey-1.27 at theia; Mon, 18 Nov 2013 08:45:09 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-f177.google.com (mail-pd0-f177.google.com [209.85.192.177]) by theia.denx.de (Postfix) with ESMTPS id 81C0A4B277 for ; Mon, 18 Nov 2013 08:45:09 +0100 (CET) Received: by mail-pd0-f177.google.com with SMTP id q10so1013240pdj.36 for ; Sun, 17 Nov 2013 23:45:07 -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=ie+m7darJDTgE1HCQP86pIu7IMHcHUzRuQleeGzjqC0=; b=cpQ0mra3RsVfMjD4qM9FaxrspbeXztFky/VDKhzR5JHlPO7gpit8YF8eStMDCGB2TP D3baJqyHg6YSM+5D6rwKYaTiTuz4+bFALBr61zp49RmjDUtvu2yHwOCTOxgEh13j7U8G IQYDx8YfXd/WghVL0MTA/+4Q9+/H+AaEp9ZUcacB9pkku4/fX2GDPdbE2RFeEhGlVOTc YKeF4rsAHB10mjm8b20tQ8LKvhhFgUbsCyKilVsimEmJMRNcztcVQI/amoPPf0tsLG3J tc6ev/hue0NwRHm+TbyKfQBNzS0niaMYhnCax0VRRm06Vyn0vddT4by1bIZMvpzFoqQk Pzxw== X-Received: by 10.68.217.226 with SMTP id pb2mr247154pbc.165.1384759104903; Sun, 17 Nov 2013 23:18:24 -0800 (PST) Received: from localhost.localdomain ([114.91.244.100]) by mx.google.com with ESMTPSA id sg1sm21272170pbb.16.2013.11.17.23.18.20 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 17 Nov 2013 23:18:24 -0800 (PST) From: Sonic Zhang To: Masahiro Yamada , u-boot@lists.denx.de Date: Mon, 18 Nov 2013 15:12:49 +0800 Message-Id: <1384758770-7462-3-git-send-email-sonic.adi@gmail.com> X-Mailer: git-send-email 1.8.2.3 In-Reply-To: <1384758770-7462-1-git-send-email-sonic.adi@gmail.com> References: <1384758770-7462-1-git-send-email-sonic.adi@gmail.com> Cc: u-boot-devel@blackfin.uclinux.org, Sonic Zhang Subject: [U-Boot] [PATCH 3/4] 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);