2012-06-01 15:33:37

by Mark Brown

Subject: [PATCH] mfd: wm8994: Support for user defined irq flags

Signed-off-by: Chris Rattray <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
---
drivers/mfd/wm8994-irq.c | 10 +++++++++-
include/linux/mfd/wm8994/pdata.h | 1 +
2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/mfd/wm8994-irq.c b/drivers/mfd/wm8994-irq.c
index f1837f6..0aac4af 100644
--- a/drivers/mfd/wm8994-irq.c
+++ b/drivers/mfd/wm8994-irq.c
@@ -21,6 +21,7 @@
#include <linux/regmap.h>

#include <linux/mfd/wm8994/core.h>
+#include <linux/mfd/wm8994/pdata.h>
#include <linux/mfd/wm8994/registers.h>

#include <linux/delay.h>
@@ -139,6 +140,8 @@ static struct regmap_irq_chip wm8994_irq_chip = {
int wm8994_irq_init(struct wm8994 *wm8994)
{
int ret;
+ unsigned long irqflags;
+ struct wm8994_pdata *pdata = wm8994->dev->platform_data;

if (!wm8994->irq) {
dev_warn(wm8994->dev,
@@ -147,8 +150,13 @@ int wm8994_irq_init(struct wm8994 *wm8994)
return 0;
}

+ /* select user or default irq flags */
+ irqflags = IRQF_TRIGGER_HIGH | IRQF_ONESHOT;
+ if (pdata->irq_flags)
+ irqflags = pdata->irq_flags;
+
ret = regmap_add_irq_chip(wm8994->regmap, wm8994->irq,
- IRQF_TRIGGER_HIGH | IRQF_ONESHOT,
+ irqflags,
wm8994->irq_base, &wm8994_irq_chip,
&wm8994->irq_data);
if (ret != 0) {
diff --git a/include/linux/mfd/wm8994/pdata.h b/include/linux/mfd/wm8994/pdata.h
index 893267b..f0361c0 100644
--- a/include/linux/mfd/wm8994/pdata.h
+++ b/include/linux/mfd/wm8994/pdata.h
@@ -141,6 +141,7 @@ struct wm8994_pdata {
struct wm8994_ldo_pdata ldo[WM8994_NUM_LDO];

int irq_base; /** Base IRQ number for WM8994, required for IRQs */
+ unsigned long irq_flags; /** user irq flags */

int num_drc_cfgs;
struct wm8994_drc_cfg *drc_cfgs;
--
1.7.10

2012-06-29 15:23:33

by Samuel Ortiz

Subject: Re: [PATCH] mfd: wm8994: Support for user defined irq flags

Hi Mark,

On Fri, Jun 01, 2012 at 04:33:19PM +0100, Mark Brown wrote:
> Signed-off-by: Chris Rattray <[email protected]>
> Signed-off-by: Mark Brown <[email protected]>
> ---
> drivers/mfd/wm8994-irq.c | 10 +++++++++-
> include/linux/mfd/wm8994/pdata.h | 1 +
> 2 files changed, 10 insertions(+), 1 deletion(-)
Patch applied, thanks.

Cheers,
Samuel.

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