linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] mfd: Add support for WM8351 revision B
@ 2009-03-03 15:53 Mark Brown
  2009-03-03 15:53 ` [PATCH 2/2] mfd: Use the value of the final spin when reading the AUXADC Mark Brown
  0 siblings, 1 reply; 4+ messages in thread
From: Mark Brown @ 2009-03-03 15:53 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-kernel, Mark Brown

No software visible difference from revision A.

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

diff --git a/drivers/mfd/wm8350-core.c b/drivers/mfd/wm8350-core.c
index c384cd2..a285cc0 100644
--- a/drivers/mfd/wm8350-core.c
+++ b/drivers/mfd/wm8350-core.c
@@ -1386,6 +1386,11 @@ int wm8350_device_init(struct wm8350 *wm8350, int irq,
 			wm8350->power.rev_g_coeff = 1;
 			break;
 
+		case 1:
+			dev_info(wm8350->dev, "WM8351 Rev B\n");
+			wm8350->power.rev_g_coeff = 1;
+			break;
+
 		default:
 			dev_err(wm8350->dev, "Unknown WM8351 CHIP_REV\n");
 			ret = -ENODEV;
-- 
1.6.1.3


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

* [PATCH 2/2] mfd: Use the value of the final spin when reading the AUXADC
  2009-03-03 15:53 [PATCH 1/2] mfd: Add support for WM8351 revision B Mark Brown
@ 2009-03-03 15:53 ` Mark Brown
  0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2009-03-03 15:53 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-kernel, Mark Brown

Reverse the order of the tests for loop exit so we use a valid value
before we time out.  Vanishingly unlikely to happen since we retry for
several times the expected conversion time.

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

diff --git a/drivers/mfd/wm8350-core.c b/drivers/mfd/wm8350-core.c
index a285cc0..c2be308 100644
--- a/drivers/mfd/wm8350-core.c
+++ b/drivers/mfd/wm8350-core.c
@@ -1111,7 +1111,7 @@ int wm8350_read_auxadc(struct wm8350 *wm8350, int channel, int scale, int vref)
 	do {
 		schedule_timeout_interruptible(1);
 		reg = wm8350_reg_read(wm8350, WM8350_DIGITISER_CONTROL_1);
-	} while (--tries && (reg & WM8350_AUXADC_POLL));
+	} while ((reg & WM8350_AUXADC_POLL) && --tries);
 
 	if (!tries)
 		dev_err(wm8350->dev, "adc chn %d read timeout\n", channel);
-- 
1.6.1.3


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

* Re: [PATCH 2/2] mfd: Use the value of the final spin when reading the AUXADC
  2009-02-25 16:23 ` [PATCH 2/2] mfd: Use the value of the final spin when reading the AUXADC Mark Brown
@ 2009-02-26 22:25   ` Andrew Morton
  0 siblings, 0 replies; 4+ messages in thread
From: Andrew Morton @ 2009-02-26 22:25 UTC (permalink / raw)
  To: Mark Brown; +Cc: sameo, linux-kernel, broonie

On Wed, 25 Feb 2009 16:23:35 +0000
Mark Brown <broonie@opensource.wolfsonmicro.com> wrote:

> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
>  drivers/mfd/wm8350-core.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/mfd/wm8350-core.c b/drivers/mfd/wm8350-core.c
> index a285cc0..c2be308 100644
> --- a/drivers/mfd/wm8350-core.c
> +++ b/drivers/mfd/wm8350-core.c
> @@ -1111,7 +1111,7 @@ int wm8350_read_auxadc(struct wm8350 *wm8350, int channel, int scale, int vref)
>  	do {
>  		schedule_timeout_interruptible(1);
>  		reg = wm8350_reg_read(wm8350, WM8350_DIGITISER_CONTROL_1);
> -	} while (--tries && (reg & WM8350_AUXADC_POLL));
> +	} while ((reg & WM8350_AUXADC_POLL) && --tries);
>  
>  	if (!tries)
>  		dev_err(wm8350->dev, "adc chn %d read timeout\n", channel);

Please do not ever send any unchangelogged patches ever again, at all, ever.

OK?

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

* [PATCH 2/2] mfd: Use the value of the final spin when reading the AUXADC
  2009-02-25 16:23 [PATCH 1/2] mfd: Add support for WM8351 revision B Mark Brown
@ 2009-02-25 16:23 ` Mark Brown
  2009-02-26 22:25   ` Andrew Morton
  0 siblings, 1 reply; 4+ messages in thread
From: Mark Brown @ 2009-02-25 16:23 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-kernel, Mark Brown

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

diff --git a/drivers/mfd/wm8350-core.c b/drivers/mfd/wm8350-core.c
index a285cc0..c2be308 100644
--- a/drivers/mfd/wm8350-core.c
+++ b/drivers/mfd/wm8350-core.c
@@ -1111,7 +1111,7 @@ int wm8350_read_auxadc(struct wm8350 *wm8350, int channel, int scale, int vref)
 	do {
 		schedule_timeout_interruptible(1);
 		reg = wm8350_reg_read(wm8350, WM8350_DIGITISER_CONTROL_1);
-	} while (--tries && (reg & WM8350_AUXADC_POLL));
+	} while ((reg & WM8350_AUXADC_POLL) && --tries);
 
 	if (!tries)
 		dev_err(wm8350->dev, "adc chn %d read timeout\n", channel);
-- 
1.6.1.3


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

end of thread, other threads:[~2009-03-03 15:54 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-03-03 15:53 [PATCH 1/2] mfd: Add support for WM8351 revision B Mark Brown
2009-03-03 15:53 ` [PATCH 2/2] mfd: Use the value of the final spin when reading the AUXADC Mark Brown
  -- strict thread matches above, loose matches on Subject: below --
2009-02-25 16:23 [PATCH 1/2] mfd: Add support for WM8351 revision B Mark Brown
2009-02-25 16:23 ` [PATCH 2/2] mfd: Use the value of the final spin when reading the AUXADC Mark Brown
2009-02-26 22:25   ` Andrew Morton

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).