From patchwork Wed Mar 16 07:19:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Green X-Patchwork-Id: 627 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:44:11 -0000 Delivered-To: patches@linaro.org Received: by 10.151.46.5 with SMTP id y5cs1268ybj; Wed, 16 Mar 2011 00:19:07 -0700 (PDT) Received: by 10.216.90.79 with SMTP id d57mr4449566wef.65.1300259946965; Wed, 16 Mar 2011 00:19:06 -0700 (PDT) Received: from mail-wy0-f178.google.com (mail-wy0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id e7si1130422wer.165.2011.03.16.00.19.06 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 16 Mar 2011 00:19:06 -0700 (PDT) Received-SPF: pass (google.com: domain of andy.warmcat.com@googlemail.com designates 74.125.82.178 as permitted sender) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=pass (google.com: domain of andy.warmcat.com@googlemail.com designates 74.125.82.178 as permitted sender) smtp.mail=andy.warmcat.com@googlemail.com; dkim=pass (test mode) header.i=@googlemail.com Received: by mail-wy0-f178.google.com with SMTP id 26so1558835wyj.37 for ; Wed, 16 Mar 2011 00:19:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:sender:from:subject:to:cc:date:message-id :in-reply-to:references:user-agent:mime-version:content-type :content-transfer-encoding; bh=G0Nfd8btJsj/gcEM7Xcx4Kt16wOmXGoOocDtXyjF1y0=; b=D9/eINYRhR2YhASGJXE2Ccg4spjdju8G7XI1HHeKqVPrrk1yI9BA1QTzAe7TvIGc0N TEvU81pB2jKT7EABwVx7csCftjP5kEf/55cEr1qqTKtn0GdtAHLGNp8Exd/u/r1tMGbl 0DP+dfVRYlP50bENhlFPTNccSnRdofO9b9+aE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=sender:from:subject:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; b=LD8D0o6DIVvFSYaMNFvXVAAs11JNrEoJu59QYYS92iuIWwbIGnvF9eh/f56wI2DVA7 SPdzbTy71J+JdPZbBkJz60O1wNJiGhpaLyny5fZW5lhXNPB9wPjtCG/n6aCpNoYXZu1E 5OMq/Pb5erz33lilb7VXdZt1OA/jPifG9V3zY= Received: by 10.216.143.74 with SMTP id k52mr416250wej.0.1300259946089; Wed, 16 Mar 2011 00:19:06 -0700 (PDT) Received: from otae.warmcat.com (cpc1-nrte21-2-0-cust677.8-4.cable.virginmedia.com [81.111.78.166]) by mx.google.com with ESMTPS id g32sm373361wej.3.2011.03.16.00.19.05 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 16 Mar 2011 00:19:05 -0700 (PDT) Sender: Andy Green From: Andy Green Subject: [PATCH 3 06/18] I2C: OMAP1: set IP revision in platform data To: linux-i2c@lists.infradead.org Cc: patches@linaro.org, Ben Dooks , Andy Green Date: Wed, 16 Mar 2011 07:19:04 +0000 Message-ID: <20110316071904.453.91435.stgit@otae.warmcat.com> In-Reply-To: <20110316071633.453.22228.stgit@otae.warmcat.com> References: <20110316071633.453.22228.stgit@otae.warmcat.com> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 All OMAP1 are using "IP revision 1" in terms of register layout. We set this information in omap1_i2c_add_bus() so we don't have to use cpu_is_xxx() any more in the omap i2c driver. Cc: patches@linaro.org Cc: Ben Dooks Reported-by: Peter Maydell Signed-off-by: Andy Green --- arch/arm/plat-omap/i2c.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c index a4f8003..0a1b5af 100644 --- a/arch/arm/plat-omap/i2c.c +++ b/arch/arm/plat-omap/i2c.c @@ -108,6 +108,9 @@ static inline int omap1_i2c_add_bus(int bus_id) res[1].start = INT_I2C; pdata = &i2c_pdata[bus_id - 1]; + /* all OMAP1 have IP version 1 register set */ + pdata->rev = OMAP_I2C_IP_VERSION_1; + return platform_device_register(pdev); }