From patchwork Tue Jan 19 17:35:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lesly A M X-Patchwork-Id: 73900 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0JHMqqj019670 for ; Tue, 19 Jan 2010 17:22:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751401Ab0ASRWw (ORCPT ); Tue, 19 Jan 2010 12:22:52 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751271Ab0ASRWw (ORCPT ); Tue, 19 Jan 2010 12:22:52 -0500 Received: from devils.ext.ti.com ([198.47.26.153]:54730 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751251Ab0ASRWv (ORCPT ); Tue, 19 Jan 2010 12:22:51 -0500 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id o0JHMlu9018699 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 19 Jan 2010 11:22:49 -0600 Received: from localhost.localdomain (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id o0JHMhLC026686; Tue, 19 Jan 2010 22:52:43 +0530 (IST) From: x0080970@ti.com To: linux-omap@vger.kernel.org Cc: Lesly A M , Nishanth Menon , David Derrick , Samuel Ortiz Subject: [PATCH v2 1/6] omap3: pm: re-program the sleep state of TRITON resources by modifying the REMAP register Date: Tue, 19 Jan 2010 23:05:01 +0530 Message-Id: <1263922501-13701-1-git-send-email-x0080970@ti.com> X-Mailer: git-send-email 1.6.0.4 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Index: linux-omap-pm/drivers/mfd/twl4030-power.c =================================================================== --- linux-omap-pm.orig/drivers/mfd/twl4030-power.c 2010-01-19 19:18:56.000000000 +0530 +++ linux-omap-pm/drivers/mfd/twl4030-power.c 2010-01-19 19:19:02.000000000 +0530 @@ -416,14 +416,35 @@ return err; } - return 0; + + /* Set the remap sleep cmd */ + err = twl_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER, &remap, + rconfig_addr + REMAP_OFFSET); + if (err < 0) { + printk(KERN_ERR "TWL4030 Resource %d remap could not read\n", + rconfig->resource); + return err; + } + + if (rconfig->remap_sleep >= 0) { + remap &= ~SLEEP_STATE_MASK; + remap |= rconfig->remap_sleep; + } + + err = twl_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, remap, + rconfig_addr + REMAP_OFFSET); + if (err < 0) { + pr_err("TWL4030 failed to program remap sleep cmd \n"); + return err; + } + + return err; } static int __init load_twl4030_script(struct twl4030_script *tscript, u8 address) { int err; - static int order; /* Make sure the script isn't going beyond last valid address (0x3f) */ if ((address + tscript->size) > END_OF_SCRIPT) { @@ -444,7 +465,6 @@ err = twl4030_config_wakeup12_sequence(address); if (err) goto out; - order = 1; } if (tscript->flags & TWL4030_WAKEUP3_SCRIPT) { err = twl4030_config_wakeup3_sequence(address); @@ -452,10 +472,6 @@ goto out; } if (tscript->flags & TWL4030_SLEEP_SCRIPT) - if (order) - pr_warning("TWL4030: Bad order of scripts (sleep "\ - "script before wakeup) Leads to boot"\ - "failure on some boards\n"); err = twl4030_config_sleep_sequence(address); out: return err;