Input: ad714x - allow platform code to specify irqflags

Add option to specify irqflags in platfrom data.
Also update copyright notice.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Tested-by: Jean-Francois Dagenais <jeff.dagenais@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

diff --git a/drivers/input/misc/ad714x.c b/drivers/input/misc/ad714x.c
index 0f2db45..5f683ec 100644 (file)
--- a/drivers/input/misc/ad714x.c
+++ b/drivers/input/misc/ad714x.c
@@ -1257,7 +1257,9 @@ struct ad714x_chip *ad714x_probe(struct device *dev, u16 bus_type, int irq,
        }
 
        error = request_threaded_irq(ad714x->irq, NULL, ad714x_interrupt_thread,
-                       IRQF_TRIGGER_FALLING, "ad714x_captouch", ad714x);
+                               plat_data->irqflags ?
+                                       plat_data->irqflags : IRQF_TRIGGER_FALLING,
+                               "ad714x_captouch", ad714x);
        if (error) {
                dev_err(dev, "can't allocate irq %d\n", ad714x->irq);
                goto err_unreg_dev;

diff --git a/include/linux/input/ad714x.h b/include/linux/input/ad714x.h
index 0cbe5e8..d388d85 100644 (file)
--- a/include/linux/input/ad714x.h
+++ b/include/linux/input/ad714x.h
@@ -6,7 +6,7 @@
  * The platform_data for the device's "struct device" holds this
  * information.
  *
- * Copyright 2009 Analog Devices Inc.
+ * Copyright 2009-2011 Analog Devices Inc.
  *
  * Licensed under the GPL-2 or later.
  */
@@ -58,6 +58,7 @@ struct ad714x_platform_data {
        struct ad714x_button_plat *button;
        unsigned short stage_cfg_reg[STAGE_NUM][STAGE_CFGREG_NUM];
        unsigned short sys_cfg_reg[SYS_CFGREG_NUM];
+       unsigned long irqflags;
 };
 
 #endif