luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Input: ad714x - allow platform code to specify irqflags

Browse Source 
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>
This commit is contained in:
Michael Hennerich 2011-05-16 23:17:34 -07:00 committed by Dmitry Torokhov
parent e223cc7e96
commit 3532cb0ca2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/input/misc/ad714x.c
View File

@ -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, 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) { if (error) {
dev_err(dev, "can't allocate irq %d\n", ad714x->irq); dev_err(dev, "can't allocate irq %d\n", ad714x->irq);
goto err_unreg_dev; goto err_unreg_dev;

3
include/linux/input/ad714x.h
View File

@ -6,7 +6,7 @@
* The platform_data for the device's "struct device" holds this * The platform_data for the device's "struct device" holds this
* information. * information.
* *
* Copyright 2009 Analog Devices Inc. * Copyright 2009-2011 Analog Devices Inc.
* *
* Licensed under the GPL-2 or later. * Licensed under the GPL-2 or later.
*/ */
@ -58,6 +58,7 @@ struct ad714x_platform_data {
struct ad714x_button_plat *button; struct ad714x_button_plat *button;
unsigned short stage_cfg_reg[STAGE_NUM][STAGE_CFGREG_NUM]; unsigned short stage_cfg_reg[STAGE_NUM][STAGE_CFGREG_NUM];
unsigned short sys_cfg_reg[SYS_CFGREG_NUM]; unsigned short sys_cfg_reg[SYS_CFGREG_NUM];
unsigned long irqflags;
}; };
#endif #endif