From patchwork Fri Jul 29 15:24:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shubhrajyoti Datta X-Patchwork-Id: 1020972 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6TFP5ci019078 for ; Fri, 29 Jul 2011 15:25:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751893Ab1G2PZA (ORCPT ); Fri, 29 Jul 2011 11:25:00 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:49260 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751299Ab1G2PY7 (ORCPT ); Fri, 29 Jul 2011 11:24:59 -0400 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id p6TFOu73011856 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 29 Jul 2011 10:24:58 -0500 Received: from dbde71.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id p6TFOt0Z025004; Fri, 29 Jul 2011 20:54:55 +0530 (IST) Received: from dbdp31.itg.ti.com (172.24.170.98) by DBDE71.ent.ti.com (172.24.170.149) with Microsoft SMTP Server id 8.3.106.1; Fri, 29 Jul 2011 20:54:55 +0530 Received: from a0393217ubnlt.india.ti.com ([172.24.190.250]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id p6TFOsDf008597; Fri, 29 Jul 2011 20:54:55 +0530 (IST) From: Shubhrajyoti D To: CC: linux-i2c@vger.kernel.org, santosh.shilimkar@ti.com, Shubhrajyoti D Subject: [PATCHv2] OMAP4: I2C: Enable the wakeup in I2C_WE Date: Fri, 29 Jul 2011 20:54:52 +0530 Message-ID: <1311953092-12506-1-git-send-email-shubhrajyoti@ti.com> X-Mailer: git-send-email 1.7.1 MIME-Version: 1.0 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 (demeter1.kernel.org [140.211.167.41]); Fri, 29 Jul 2011 15:25:29 +0000 (UTC) Currently for OMAP4 the I2C_WE is not programmed. This patch enables the programming for OMAP4. This patch fixes a bad conflict resolution. This effectively restores the following commit Commit 120bdaa47[i2c-omap: Program I2C_WE on OMAP4 to enable i2c wakeup] which got changed by Commit a3a7acbc[I2C: OMAP2+: address confused probed version naming] Reviewed-by: Felipe Balbi Reported-by: Santosh Shilimkar Signed-off-by: Shubhrajyoti D --- TODO: Currently all the wakeup sources are enabled. There is scope of optimising the same. Will revisit it. Rebased on Kevin's wip/i2c branch Tested on OMAP4430. drivers/i2c/busses/i2c-omap.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index d05efe7..18cc0af 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -313,9 +313,8 @@ static int omap_i2c_init(struct omap_i2c_dev *dev) * REVISIT: Some wakeup sources might not be needed. */ dev->westate = OMAP_I2C_WE_ALL; - if (dev->rev < OMAP_I2C_REV_ON_3530_4430) - omap_i2c_write_reg(dev, OMAP_I2C_WE_REG, - dev->westate); + omap_i2c_write_reg(dev, OMAP_I2C_WE_REG, + dev->westate); } omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);