diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-02-06 09:27:13 -0500 |
---|---|---|
committer | Samuel Ortiz <samuel@sortiz.org> | 2009-04-04 18:32:20 -0400 |
commit | 3206450355100eae8e033645318b95bb60f1faff (patch) | |
tree | c24ba036ef75df55dbbe8ad41f88a29efa955c09 /drivers | |
parent | 9dfd338198bec67ebc82ed363078f9d8aa74ec3e (diff) |
mfd: Support active high IRQs on WM835x
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@openedhand.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mfd/wm8350-core.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/mfd/wm8350-core.c b/drivers/mfd/wm8350-core.c index f22b18b70796..a285cc0cc704 100644 --- a/drivers/mfd/wm8350-core.c +++ b/drivers/mfd/wm8350-core.c | |||
@@ -1438,7 +1438,21 @@ int wm8350_device_init(struct wm8350 *wm8350, int irq, | |||
1438 | mutex_init(&wm8350->irq_mutex); | 1438 | mutex_init(&wm8350->irq_mutex); |
1439 | INIT_WORK(&wm8350->irq_work, wm8350_irq_worker); | 1439 | INIT_WORK(&wm8350->irq_work, wm8350_irq_worker); |
1440 | if (irq) { | 1440 | if (irq) { |
1441 | ret = request_irq(irq, wm8350_irq, 0, | 1441 | int flags = 0; |
1442 | |||
1443 | if (pdata && pdata->irq_high) { | ||
1444 | flags |= IRQF_TRIGGER_HIGH; | ||
1445 | |||
1446 | wm8350_set_bits(wm8350, WM8350_SYSTEM_CONTROL_1, | ||
1447 | WM8350_IRQ_POL); | ||
1448 | } else { | ||
1449 | flags |= IRQF_TRIGGER_LOW; | ||
1450 | |||
1451 | wm8350_clear_bits(wm8350, WM8350_SYSTEM_CONTROL_1, | ||
1452 | WM8350_IRQ_POL); | ||
1453 | } | ||
1454 | |||
1455 | ret = request_irq(irq, wm8350_irq, flags, | ||
1442 | "wm8350", wm8350); | 1456 | "wm8350", wm8350); |
1443 | if (ret != 0) { | 1457 | if (ret != 0) { |
1444 | dev_err(wm8350->dev, "Failed to request IRQ: %d\n", | 1458 | dev_err(wm8350->dev, "Failed to request IRQ: %d\n", |