From patchwork Thu Jun 2 00:19:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 842142 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p520Jwb9027800 for ; Thu, 2 Jun 2011 00:19:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759049Ab1FBAT5 (ORCPT ); Wed, 1 Jun 2011 20:19:57 -0400 Received: from na3sys009aog105.obsmtp.com ([74.125.149.75]:44396 "EHLO na3sys009aog105.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758959Ab1FBAT4 (ORCPT ); Wed, 1 Jun 2011 20:19:56 -0400 Received: from mail-px0-f177.google.com ([209.85.212.177]) (using TLSv1) by na3sys009aob105.postini.com ([74.125.148.12]) with SMTP ID DSNKTebXKz0yn9lvmAFmA6IF+I+JeHCa0roM@postini.com; Wed, 01 Jun 2011 17:19:56 PDT Received: by mail-px0-f177.google.com with SMTP id 10so175668pxi.36 for ; Wed, 01 Jun 2011 17:19:55 -0700 (PDT) Received: by 10.143.58.15 with SMTP id l15mr13251wfk.418.1306973995435; Wed, 01 Jun 2011 17:19:55 -0700 (PDT) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net [24.19.7.36]) by mx.google.com with ESMTPS id y2sm69133pbg.56.2011.06.01.17.19.54 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 01 Jun 2011 17:19:54 -0700 (PDT) From: Kevin Hilman To: Ben Dooks , linux-i2c@vger.kernel.org Cc: Andy Green , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 06/18] I2C: OMAP1: set IP revision in platform data Date: Wed, 1 Jun 2011 17:19:32 -0700 Message-Id: <1306973984-15165-7-git-send-email-khilman@ti.com> X-Mailer: git-send-email 1.7.4 In-Reply-To: <1306973984-15165-1-git-send-email-khilman@ti.com> References: <1306973984-15165-1-git-send-email-khilman@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 02 Jun 2011 00:19:59 +0000 (UTC) From: Andy Green 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 Signed-off-by: Tony Lindgren Signed-off-by: Kevin Hilman --- 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 3341ca4..a938df0 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); }