From patchwork Fri Jan 22 20:12:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Turquette X-Patchwork-Id: 74732 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 o0MKKavJ019353 for ; Fri, 22 Jan 2010 20:20:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754066Ab0AVUUG (ORCPT ); Fri, 22 Jan 2010 15:20:06 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754055Ab0AVUUG (ORCPT ); Fri, 22 Jan 2010 15:20:06 -0500 Received: from mail-iw0-f186.google.com ([209.85.223.186]:41502 "EHLO mail-iw0-f186.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753986Ab0AVUUE (ORCPT ); Fri, 22 Jan 2010 15:20:04 -0500 X-Greylist: delayed 369 seconds by postgrey-1.27 at vger.kernel.org; Fri, 22 Jan 2010 15:20:04 EST Received: by iwn16 with SMTP id 16so447654iwn.33 for ; Fri, 22 Jan 2010 12:20:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=K+Lbnk9o871dL0hJQWVnfXWuN1sae7HfRuIb77Gz8eQ=; b=wBP9cbcY207+KHjMEN8cg6lzdaSRsutKytMsPEL4cw9gKtqw8BFUFPCtO4mWqhO00M KskiK+dtRmlENhut2HgbjLZC1itk0PSY04zAM7EeQw8bwBJSYGl0dOoZNGStReyJF4BY vGKEu600gqcm03+Jn0hOfowV2qwRTpiq7CMc4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=P8LMW31Iyh+0su0rgMcGye4qYn/1qVrW1ISnxR/+aDDAtS92msvTM/NKKR5kqSJahD OCHyXrSvsx5oC94jZFzviHKmuWBeq6kBDSV+GY/E9iA+/vjMK7+BuYTFE3fk9j1d47NH PB03BuCXE7WPeLetad4sfbqwDv2iOieTK5vDY= Received: by 10.231.148.205 with SMTP id q13mr605704ibv.47.1264191232105; Fri, 22 Jan 2010 12:13:52 -0800 (PST) Received: from localhost.localdomain (adsl-99-57-147-167.dsl.rcsntx.sbcglobal.net [99.57.147.167]) by mx.google.com with ESMTPS id 21sm1821956iwn.14.2010.01.22.12.13.50 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 22 Jan 2010 12:13:50 -0800 (PST) From: mturquette@gmail.com To: sameo@linux.intel.com Cc: linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Mike Turquette Subject: [PATCH] MFD: TWL4030: program remap_sleep correctly Date: Fri, 22 Jan 2010 14:12:58 -0600 Message-Id: <1264191178-12877-1-git-send-email-mturquette@ti.com> X-Mailer: git-send-email 1.6.3.2 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c index 0815292..5b045ff 100644 --- a/drivers/mfd/twl4030-power.c +++ b/drivers/mfd/twl4030-power.c @@ -405,7 +405,7 @@ static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig) if (rconfig->remap_sleep != TWL4030_RESCONFIG_UNDEF) { remap &= ~SLEEP_STATE_MASK; - remap |= rconfig->remap_off << SLEEP_STATE_SHIFT; + remap |= rconfig->remap_sleep << SLEEP_STATE_SHIFT; } err = twl_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,