Input: gpio_keys - add support for switches (EV_SW)
Signed-off-by: Roman Moravcik <roman.moravcik@gmail.com> Signed-off-by: Paul Sokolovsky <pmiscml@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
parent
bc95f3669f
commit
84767d00a8
|
@ -35,11 +35,14 @@ static irqreturn_t gpio_keys_isr(int irq, void *dev_id)
|
||||||
struct input_dev *input = platform_get_drvdata(pdev);
|
struct input_dev *input = platform_get_drvdata(pdev);
|
||||||
|
|
||||||
for (i = 0; i < pdata->nbuttons; i++) {
|
for (i = 0; i < pdata->nbuttons; i++) {
|
||||||
int gpio = pdata->buttons[i].gpio;
|
struct gpio_keys_button *button = &pdata->buttons[i];
|
||||||
if (irq == gpio_to_irq(gpio)) {
|
int gpio = button->gpio;
|
||||||
int state = (gpio_get_value(gpio) ? 1 : 0) ^ (pdata->buttons[i].active_low);
|
|
||||||
|
|
||||||
input_report_key(input, pdata->buttons[i].keycode, state);
|
if (irq == gpio_to_irq(gpio)) {
|
||||||
|
unsigned int type = button->type ?: EV_KEY;
|
||||||
|
int state = (gpio_get_value(gpio) ? 1 : 0) ^ button->active_low;
|
||||||
|
|
||||||
|
input_event(input, type, button->code, !!state);
|
||||||
input_sync(input);
|
input_sync(input);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -71,19 +74,21 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
|
||||||
input->id.version = 0x0100;
|
input->id.version = 0x0100;
|
||||||
|
|
||||||
for (i = 0; i < pdata->nbuttons; i++) {
|
for (i = 0; i < pdata->nbuttons; i++) {
|
||||||
int code = pdata->buttons[i].keycode;
|
struct gpio_keys_button *button = &pdata->buttons[i];
|
||||||
int irq = gpio_to_irq(pdata->buttons[i].gpio);
|
int irq = gpio_to_irq(button->gpio);
|
||||||
|
unsigned int type = button->type ?: EV_KEY;
|
||||||
|
|
||||||
set_irq_type(irq, IRQ_TYPE_EDGE_BOTH);
|
set_irq_type(irq, IRQ_TYPE_EDGE_BOTH);
|
||||||
error = request_irq(irq, gpio_keys_isr, IRQF_SAMPLE_RANDOM,
|
error = request_irq(irq, gpio_keys_isr, IRQF_SAMPLE_RANDOM,
|
||||||
pdata->buttons[i].desc ? pdata->buttons[i].desc : "gpio_keys",
|
button->desc ? button->desc : "gpio_keys",
|
||||||
pdev);
|
pdev);
|
||||||
if (error) {
|
if (error) {
|
||||||
printk(KERN_ERR "gpio-keys: unable to claim irq %d; error %d\n",
|
printk(KERN_ERR "gpio-keys: unable to claim irq %d; error %d\n",
|
||||||
irq, error);
|
irq, error);
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
set_bit(code, input->keybit);
|
|
||||||
|
input_set_capability(input, type, button->code);
|
||||||
}
|
}
|
||||||
|
|
||||||
error = input_register_device(input);
|
error = input_register_device(input);
|
||||||
|
|
|
@ -3,10 +3,11 @@
|
||||||
|
|
||||||
struct gpio_keys_button {
|
struct gpio_keys_button {
|
||||||
/* Configuration parameters */
|
/* Configuration parameters */
|
||||||
int keycode;
|
int code; /* input event code (KEY_*, SW_*) */
|
||||||
int gpio;
|
int gpio;
|
||||||
int active_low;
|
int active_low;
|
||||||
char *desc;
|
char *desc;
|
||||||
|
int type; /* input event type (EV_KEY, EV_SW) */
|
||||||
};
|
};
|
||||||
|
|
||||||
struct gpio_keys_platform_data {
|
struct gpio_keys_platform_data {
|
||||||
|
|
Loading…
Reference in New Issue