LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH 0/2] WM8350 updates
@ 2008-10-20 19:00 Mark Brown
  2008-10-20 19:01 ` [PATCH 1/2] mfd/wm8350: don't export static functions Mark Brown
  2008-10-20 22:44 ` [PATCH 0/2] WM8350 updates Samuel Ortiz
  0 siblings, 2 replies; 4+ messages in thread
From: Mark Brown @ 2008-10-20 19:00 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-kernel

A couple of minor WM8350 updates here.  The first, from Stephen
Rothwell needs to be merged with Linus fairly urgently.  The second
is less urgent since nothing merged should be affected, though it should
still be safe to merge.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 1/2] mfd/wm8350: don't export static functions
  2008-10-20 19:00 [PATCH 0/2] WM8350 updates Mark Brown
@ 2008-10-20 19:01 ` Mark Brown
  2008-10-20 19:01   ` [PATCH 2/2] mfd: Don't store volatile bits in WM8350 register cache Mark Brown
  2008-10-20 22:44 ` [PATCH 0/2] WM8350 updates Samuel Ortiz
  1 sibling, 1 reply; 4+ messages in thread
From: Mark Brown @ 2008-10-20 19:01 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-kernel, Stephen Rothwell, Mark Brown

From: Stephen Rothwell <sfr@canb.auug.org.au>

Today's linux-next build (powerpc allyesconfig) failed like this:

drivers/mfd/wm8350-core.c:1131: error: __ksymtab_wm8350_create_cache causes a section type conflict

Caused by commit 89b4012befb1abca5e86d232bc0e2a797b0d9825 ("mfd: Core
support for the WM8350 AudioPlus PMIC"). wm8350_create_cache is not used
elsewhere, so remove the EXPORT_SYMBOL.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 drivers/mfd/wm8350-core.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/mfd/wm8350-core.c b/drivers/mfd/wm8350-core.c
index bf87f67..fbe22fb 100644
--- a/drivers/mfd/wm8350-core.c
+++ b/drivers/mfd/wm8350-core.c
@@ -1128,7 +1128,6 @@ static int wm8350_create_cache(struct wm8350 *wm8350, int mode)
 out:
 	return ret;
 }
-EXPORT_SYMBOL_GPL(wm8350_create_cache);
 
 /*
  * Register a client device.  This is non-fatal since there is no need to
-- 
1.5.6.5


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 2/2] mfd: Don't store volatile bits in WM8350 register cache
  2008-10-20 19:01 ` [PATCH 1/2] mfd/wm8350: don't export static functions Mark Brown
@ 2008-10-20 19:01   ` Mark Brown
  0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2008-10-20 19:01 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-kernel, Mark Brown

This makes the contents of the cache clearer and fixes incorrect
initialisation of the cache for partially volatile registers.

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

diff --git a/drivers/mfd/wm8350-core.c b/drivers/mfd/wm8350-core.c
index fbe22fb..0d47fb9 100644
--- a/drivers/mfd/wm8350-core.c
+++ b/drivers/mfd/wm8350-core.c
@@ -183,6 +183,9 @@ static int wm8350_write(struct wm8350 *wm8350, u8 reg, int num_regs, u16 *src)
 			(wm8350->reg_cache[i] & ~wm8350_reg_io_map[i].writable)
 			| src[i - reg];
 
+		/* Don't store volatile bits */
+		wm8350->reg_cache[i] &= ~wm8350_reg_io_map[i].vol;
+
 		src[i - reg] = cpu_to_be16(src[i - reg]);
 	}
 
@@ -1120,6 +1123,7 @@ static int wm8350_create_cache(struct wm8350 *wm8350, int mode)
 			}
 			value = be16_to_cpu(value);
 			value &= wm8350_reg_io_map[i].readable;
+			value &= ~wm8350_reg_io_map[i].vol;
 			wm8350->reg_cache[i] = value;
 		} else
 			wm8350->reg_cache[i] = reg_map[i];
-- 
1.5.6.5


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 0/2] WM8350 updates
  2008-10-20 19:00 [PATCH 0/2] WM8350 updates Mark Brown
  2008-10-20 19:01 ` [PATCH 1/2] mfd/wm8350: don't export static functions Mark Brown
@ 2008-10-20 22:44 ` Samuel Ortiz
  1 sibling, 0 replies; 4+ messages in thread
From: Samuel Ortiz @ 2008-10-20 22:44 UTC (permalink / raw)
  To: Mark Brown; +Cc: linux-kernel

Hi Mark,

On Mon, Oct 20, 2008 at 08:00:22PM +0100, Mark Brown wrote:
> A couple of minor WM8350 updates here.  The first, from Stephen
> Rothwell needs to be merged with Linus fairly urgently.  The second
> is less urgent since nothing merged should be affected, though it should
> still be safe to merge.

Both of them merged to my mfd-next tree. I'll send a pull request to Linus
tomorrow.

Thanks for the patches.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2008-10-20 22:42 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-10-20 19:00 [PATCH 0/2] WM8350 updates Mark Brown
2008-10-20 19:01 ` [PATCH 1/2] mfd/wm8350: don't export static functions Mark Brown
2008-10-20 19:01   ` [PATCH 2/2] mfd: Don't store volatile bits in WM8350 register cache Mark Brown
2008-10-20 22:44 ` [PATCH 0/2] WM8350 updates Samuel Ortiz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).