mfd: arizona: Basic support for edge triggered IRQs

Allow the user to configure edge triggered IRQs, though we do not yet
fully handle new interrupts occurring while an interrupt is being handled.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
index bf3d1c09b085ffb48161e306896c3c94c52994ed..40b0e75b1ecc2cd88cee3b323e0befa7a48352d8 100644 (file)
--- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
@@ -208,7 +208,7 @@ static const struct i2c_board_info wm1277_devs[] = {
 static struct arizona_pdata wm5102_reva_pdata = {
        .ldoena = S3C64XX_GPN(7),
        .gpio_base = CODEC_GPIO_BASE,
-       .irq_active_high = true,
+       .irq_flags = IRQF_TRIGGER_HIGH,
        .micd_pol_gpio = CODEC_GPIO_BASE + 4,
        .gpio_defaults = {
                [2] = 0x10000, /* AIF3TXLRCLK */
@@ -237,7 +237,7 @@ static struct spi_board_info wm5102_reva_spi_devs[] = {
 static struct arizona_pdata wm5102_pdata = {
        .ldoena = S3C64XX_GPN(7),
        .gpio_base = CODEC_GPIO_BASE,
-       .irq_active_high = true,
+       .irq_flags = IRQF_TRIGGER_HIGH,
        .micd_pol_gpio = CODEC_GPIO_BASE + 2,
        .gpio_defaults = {
                [2] = 0x10000, /* AIF3TXLRCLK */

diff --git a/drivers/mfd/arizona-irq.c b/drivers/mfd/arizona-irq.c
index 0aa39e2eb0080208370d3e516f2f3235206f0be4..aa25468d24aa03b1b6a90fd135377985f123ca15 100644 (file)
--- a/drivers/mfd/arizona-irq.c
+++ b/drivers/mfd/arizona-irq.c
@@ -195,7 +195,11 @@ int arizona_irq_init(struct arizona *arizona)
        /* Disable all wake sources by default */
        regmap_write(arizona->regmap, ARIZONA_WAKE_CONTROL, 0);
 
-       if (arizona->pdata.irq_active_high) {
+       if (!arizona->pdata.irq_flags)
+               arizona->pdata.irq_flags = IRQF_TRIGGER_LOW;
+
+       if (arizona->pdata.irq_flags & (IRQF_TRIGGER_HIGH |
+                                       IRQF_TRIGGER_RISING)) {
                ret = regmap_update_bits(arizona->regmap, ARIZONA_IRQ_CTRL_1,
                                         ARIZONA_IRQ_POL, 0);
                if (ret != 0) {
@@ -203,12 +207,10 @@ int arizona_irq_init(struct arizona *arizona)
                                ret);
                        goto err;
                }
-
-               flags |= IRQF_TRIGGER_HIGH;
-       } else {
-               flags |= IRQF_TRIGGER_LOW;
        }
 
+       flags |= arizona->pdata.irq_flags;
+
        /* Allocate a virtual IRQ domain to distribute to the regmap domains */
        arizona->virq = irq_domain_add_linear(NULL, 2, &arizona_domain_ops,
                                              arizona);

diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h
index 455c51d22d6b43e5dd4ccb932021dfcea36182a0..84fefede3a23dc896b50aeae4b0df872cc6c8988 100644 (file)
--- a/include/linux/mfd/arizona/pdata.h
+++ b/include/linux/mfd/arizona/pdata.h
@@ -99,7 +99,8 @@ struct arizona_pdata {
        /** If a direct 32kHz clock is provided on an MCLK specify it here */
        int clk32k_src;
 
-       bool irq_active_high; /** IRQ polarity */
+       /** Mode for primary IRQ (defaults to active low) */
+       unsigned int irq_flags;
 
        /* Base GPIO */
        int gpio_base;