From patchwork Wed Oct 30 14:18:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_Bie=C3=9Fmann?= X-Patchwork-Id: 287222 X-Patchwork-Delegate: andreas.biessmann@googlemail.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 387CA2C0381 for ; Thu, 31 Oct 2013 01:19:19 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CBBE54A1C7; Wed, 30 Oct 2013 15:19:17 +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 p2P8i6g3QAIZ; Wed, 30 Oct 2013 15:19:17 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0BF954A1C5; Wed, 30 Oct 2013 15:19:15 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7E6F94A1C2 for ; Wed, 30 Oct 2013 15:19:08 +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 Vs3w3mXmu8wO for ; Wed, 30 Oct 2013 15:19:04 +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-ea0-f171.google.com (mail-ea0-f171.google.com [209.85.215.171]) by theia.denx.de (Postfix) with ESMTPS id 6B5C14A1C5 for ; Wed, 30 Oct 2013 15:18:50 +0100 (CET) Received: by mail-ea0-f171.google.com with SMTP id h10so696697eak.16 for ; Wed, 30 Oct 2013 07:18:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=R4mMVqSEUsdRBaeoc0V0EPR4yw4OdZkrx1Tjbk3Hg3M=; b=PshVwH/cb9DFQcb4qwru5BACgEIv77mLusiV30mIFTm2Upxz3O3om9a0/6EXG9ihsJ kwwZLRSRa6LfHC+z0BbkLdkQqURmGWYfTLpUoiN37w2bmAEqMiAiz65E3ZLTsZG/2Pbj EFEP9dZIkPYB0d59wdTGj/ie3PTOE2zTpnvIkDCcuESvzH3xtHun6TgNVfxW1mDS04Ip C96Sn0DOuJ1zMMfMm5A7EXlkGOc6C36DvEDcR5/rqZHc/ah2SedHEXMG/2rUnTNbg2N1 VwObjUGXyt2z3UpxTDQ63H57byUSMQi5KmdqiDf1jvgR+u+LoeD3KGX3ltDyiWjXyTLl eTwQ== X-Received: by 10.15.100.198 with SMTP id bn46mr5185902eeb.11.1383142730544; Wed, 30 Oct 2013 07:18:50 -0700 (PDT) Received: from localhost ([2a01:198:47b:1:210:75ff:fe1a:cd1e]) by mx.google.com with ESMTPSA id a6sm84037744eei.10.2013.10.30.07.18.46 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 30 Oct 2013 07:18:47 -0700 (PDT) From: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= To: u-boot@lists.denx.de Date: Wed, 30 Oct 2013 15:18:18 +0100 Message-Id: <1383142702-9782-3-git-send-email-andreas.devel@googlemail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1383142702-9782-1-git-send-email-andreas.devel@googlemail.com> References: <1383142702-9782-1-git-send-email-andreas.devel@googlemail.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 2/6] i2c: switch from AT91 legacy to ATMEL legacy 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: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Since the required API is gpio which is enclosed with CONFIG_ATMEL_LEGACY use that switch here. Signed-off-by: Andreas Bießmann Acked-by: Heiko Schocher --- drivers/i2c/soft_i2c.c | 2 +- include/i2c.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c index 396fea8..dfea54a 100644 --- a/drivers/i2c/soft_i2c.c +++ b/drivers/i2c/soft_i2c.c @@ -25,7 +25,7 @@ #include #include #include -#ifdef CONFIG_AT91_LEGACY +#ifdef CONFIG_ATMEL_LEGACY #include #endif #endif diff --git a/include/i2c.h b/include/i2c.h index c1be533..f93a183 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -147,7 +147,7 @@ extern struct i2c_bus_hose i2c_bus[]; # elif (defined(CONFIG_AT91RM9200) || \ defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9261) || \ - defined(CONFIG_AT91SAM9263)) && !defined(CONFIG_AT91_LEGACY) + defined(CONFIG_AT91SAM9263)) # define I2C_SOFT_DECLARATIONS at91_pio_t *pio = (at91_pio_t *) ATMEL_BASE_PIOA; # else # define I2C_SOFT_DECLARATIONS