From patchwork Tue Mar 15 19:56:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Green X-Patchwork-Id: 595 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:02 -0000 Delivered-To: patches@linaro.org Received: by 10.151.46.5 with SMTP id y5cs80495ybj; Tue, 15 Mar 2011 12:56:41 -0700 (PDT) Received: by 10.216.25.202 with SMTP id z52mr4096783wez.14.1300218997007; Tue, 15 Mar 2011 12:56:37 -0700 (PDT) Received: from mail-ww0-f42.google.com (mail-ww0-f42.google.com [74.125.82.42]) by mx.google.com with ESMTPS id m53si300507wej.87.2011.03.15.12.56.36 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 15 Mar 2011 12:56:37 -0700 (PDT) Received-SPF: pass (google.com: domain of andy.warmcat.com@googlemail.com designates 74.125.82.42 as permitted sender) client-ip=74.125.82.42; Authentication-Results: mx.google.com; spf=pass (google.com: domain of andy.warmcat.com@googlemail.com designates 74.125.82.42 as permitted sender) smtp.mail=andy.warmcat.com@googlemail.com; dkim=pass (test mode) header.i=@googlemail.com Received: by mail-ww0-f42.google.com with SMTP id 4so3297987wwk.1 for ; Tue, 15 Mar 2011 12:56:36 -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=XbEf2GNrm0gJi9wVYx965xFhfY/zIpjnI1MiAa+A78D4ssT8SlDaMAJYJYB349bzoY UuwRoz/W2xVBOg7vKlWxi9hr8J6WUiRgrE5uNBKI/kX/rUVL32H4bYlDDBzwyrWx2oMk Afk/9YSaTJNfBVg5I5NIIDVKzTJULof7Aa+4Q= 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=xLBvsHzB6MqmdpEPgxFAhGEngAB8Vuf+MrYm3SnKFjOp9V9LzQpLXieMofGNaU6DWR XMzgvEdxciLl+4YjuDeQ6VcOUYZ+G4DtFeCTmleGBRXgvWrjKEb+4KQaIASOzqcGl6PD Zz78+eDXjI3t/6jW8/UaqeMfnaOfRodXk3AaM= Received: by 10.216.64.201 with SMTP id c51mr9652244wed.6.1300218996178; Tue, 15 Mar 2011 12:56:36 -0700 (PDT) Received: from otae.warmcat.com (s15404224.onlinehome-server.info [87.106.134.80]) by mx.google.com with ESMTPS id a50sm103394wer.42.2011.03.15.12.56.35 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 15 Mar 2011 12:56:35 -0700 (PDT) Sender: Andy Green From: Andy Green Subject: [PATCH 3 06/18] I2C: OMAP1: set IP revision in platform data To: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org Cc: patches@linaro.org, Ben Dooks , Andy Green Date: Tue, 15 Mar 2011 19:56:34 +0000 Message-ID: <20110315195633.30000.50623.stgit@otae.warmcat.com> In-Reply-To: <20110315195147.30000.86184.stgit@otae.warmcat.com> References: <20110315195147.30000.86184.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); }