[PATCH v2] mfd: Support configuration of WM831x /IRQ output in CMOS mode

[PATCH v2] mfd: Support configuration of WM831x /IRQ output in CMOS mode

[Mark Brown]

From: Mark Brown <broonie@opensource.wolfsonmciro.com>

Provide platform data allowing the system to set the /IRQ pin into
CMOS mode rather than the default open drain. The default value of
this platform data reflects the default hardware configuration so
there should be no change to existing users.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmciro.com>
---
 drivers/mfd/wm831x-irq.c         |    8 ++++++++
 include/linux/mfd/wm831x/pdata.h |    3 +++
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/drivers/mfd/wm831x-irq.c b/drivers/mfd/wm831x-irq.c
index 2691648..90ad3fa 100644
--- a/drivers/mfd/wm831x-irq.c
+++ b/drivers/mfd/wm831x-irq.c
@@ -520,6 +520,14 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq)
 		return 0;
 	}
 
+	if (pdata->irq_cmos)
+		i = 0;
+	else
+		i = WM831X_IRQ_OD;
+
+	wm831x_set_bits(wm831x, WM831X_IRQ_CONFIG,
+			WM831X_IRQ_OD, i);
+
 	/* Try to flag /IRQ as a wake source; there are a number of
 	 * unconditional wake sources in the PMIC so this isn't
 	 * conditional but we don't actually care *too* much if it
diff --git a/include/linux/mfd/wm831x/pdata.h b/include/linux/mfd/wm831x/pdata.h
index fd322ac..1ae8499 100644
--- a/include/linux/mfd/wm831x/pdata.h
+++ b/include/linux/mfd/wm831x/pdata.h
@@ -108,6 +108,9 @@ struct wm831x_pdata {
 	/** Called after subdevices are set up */
 	int (*post_init)(struct wm831x *wm831x);
 
+	/** Put the /IRQ line into CMOS mode */
+	bool irq_cmos;
+
 	int irq_base;
 	int gpio_base;
 	struct wm831x_backlight_pdata *backlight;
-- 
1.7.2.3

Re: [PATCH v2] mfd: Support configuration of WM831x /IRQ output in CMOS mode

[Mark Brown]

On Fri, Jan 21, 2011 at 01:26:46PM +0000, Mark Brown wrote:
> From: Mark Brown <broonie@opensource.wolfsonmciro.com>

Clearly this is a typo and should be reset to my normal address.

Re: [PATCH v2] mfd: Support configuration of WM831x /IRQ output in CMOS mode

[Samuel Ortiz]

Hi Mark,

On Fri, Jan 21, 2011 at 01:27:28PM +0000, Mark Brown wrote:
> On Fri, Jan 21, 2011 at 01:26:46PM +0000, Mark Brown wrote:
> > From: Mark Brown <broonie@opensource.wolfsonmciro.com>
> 
> Clearly this is a typo and should be reset to my normal address.
Patch applied and fixed.

Cheers,
Samuel.

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