mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Samuel Ortiz <sameo@linux.intel.com>
Cc: patches@opensource.wolfsonmicro.com,
	linux-kernel@vger.kernel.org,
	Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: [PATCH 5/8] mfd: Don't hard code the reset value for WM8994 devices
Date: Mon, 28 Nov 2011 22:44:31 +0000	[thread overview]
Message-ID: <1322520274-13789-5-git-send-email-broonie@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1322520274-13789-1-git-send-email-broonie@opensource.wolfsonmicro.com>

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 drivers/mfd/wm8994-core.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index c8956f2..0167694 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -276,7 +276,8 @@ static int wm8994_suspend(struct device *dev)
 	/* Explicitly put the device into reset in case regulators
 	 * don't get disabled in order to ensure consistent restart.
 	 */
-	wm8994_reg_write(wm8994, WM8994_SOFTWARE_RESET, 0x8994);
+	wm8994_reg_write(wm8994, WM8994_SOFTWARE_RESET,
+			 wm8994_reg_read(wm8994, WM8994_SOFTWARE_RESET));
 
 	wm8994->suspended = true;
 
-- 
1.7.7.3


  parent reply	other threads:[~2011-11-28 22:45 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-28 22:40 [PATCH 0/8] WM8994 MFD updates for 3.3 Mark Brown
2011-11-28 22:44 ` [PATCH 1/8] mfd: Remove some unused functions in wm8894-irq Mark Brown
2011-11-28 22:44   ` [PATCH 2/8] mfd: Add basic device tree binding for wm8994 Mark Brown
2011-11-28 22:44   ` [PATCH 3/8] mfd: Convert wm8994 to devm_kzalloc() Mark Brown
2011-11-28 22:44   ` [PATCH 4/8] mfd: Disable more pulls on WM8994 Mark Brown
2011-11-28 22:44   ` Mark Brown [this message]
2011-11-28 22:44   ` [PATCH 6/8] mfd: Define some additional wm8994 registers Mark Brown
2011-11-28 22:44   ` [PATCH 7/8] mfd: Add wm8994 register access and default information Mark Brown
2011-11-28 22:44   ` [PATCH 8/8] mfd: Enable register cache for wm8994 devices Mark Brown
2011-11-28 22:58     ` Mark Brown
2011-11-28 22:47 ` [PATCH] mfd: Convert wm8994 to use generic regmap irq_chip Mark Brown
2011-12-12 14:34 ` [PATCH 0/8] WM8994 MFD updates for 3.3 Samuel Ortiz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1322520274-13789-5-git-send-email-broonie@opensource.wolfsonmicro.com \
    --to=broonie@opensource.wolfsonmicro.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=patches@opensource.wolfsonmicro.com \
    --cc=sameo@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®