* [PATCH 3.2] mfd: Update wm8994 active device checks for WM1811
@ 2011-11-04 23:14 Mark Brown
2011-11-14 0:16 ` Samuel Ortiz
0 siblings, 1 reply; 3+ messages in thread
From: Mark Brown @ 2011-11-04 23:14 UTC (permalink / raw)
To: Samuel Ortiz; +Cc: linux-kernel, patches, Mark Brown
This didn't go in as part of the original MFD patch for WM1811 due to
cross tree issues.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
This really should go into 3.2 to ensure suspend works in all situations
on WM1811 - all the dependencies are now in Linus' tree.
drivers/mfd/wm8994-core.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index 5d6ba13..61894fc 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -239,6 +239,7 @@ static int wm8994_suspend(struct device *dev)
switch (wm8994->type) {
case WM8958:
+ case WM1811:
ret = wm8994_reg_read(wm8994, WM8958_MIC_DETECT_1);
if (ret < 0) {
dev_err(dev, "Failed to read power status: %d\n", ret);
--
1.7.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 3.2] mfd: Update wm8994 active device checks for WM1811
2011-11-04 23:14 [PATCH 3.2] mfd: Update wm8994 active device checks for WM1811 Mark Brown
@ 2011-11-14 0:16 ` Samuel Ortiz
0 siblings, 0 replies; 3+ messages in thread
From: Samuel Ortiz @ 2011-11-14 0:16 UTC (permalink / raw)
To: Mark Brown; +Cc: linux-kernel, patches
Hi Mark,
On Fri, Nov 04, 2011 at 11:14:46PM +0000, Mark Brown wrote:
> This didn't go in as part of the original MFD patch for WM1811 due to
> cross tree issues.
I applied this one to my for-linus branch. It should make it to 3.2.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 3.2] mfd: Update wm8994 active device checks for WM1811
@ 2011-12-14 9:22 Mark Brown
0 siblings, 0 replies; 3+ messages in thread
From: Mark Brown @ 2011-12-14 9:22 UTC (permalink / raw)
To: Samuel Ortiz; +Cc: linux-kernel, patches, Mark Brown
This didn't go in as part of the original MFD patch for WM1811 due to
cross tree issues.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
This is essentially a bugfix for 3.2 - suspend is likely to not work
well without it, it wasn't merged as part of the original patch set due
to cross tree issues.
drivers/mfd/wm8994-core.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index 93f8599..83a2a8c 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -229,6 +229,7 @@ static int wm8994_suspend(struct device *dev)
switch (wm8994->type) {
case WM8958:
+ case WM1811:
ret = wm8994_reg_read(wm8994, WM8958_MIC_DETECT_1);
if (ret < 0) {
dev_err(dev, "Failed to read power status: %d\n", ret);
--
1.7.7.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-12-14 9:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-04 23:14 [PATCH 3.2] mfd: Update wm8994 active device checks for WM1811 Mark Brown
2011-11-14 0:16 ` Samuel Ortiz
-- strict thread matches above, loose matches on Subject: below --
2011-12-14 9:22 Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox