input: gpio_keys: polling mode support
Subsystems (2)
PATCH 1/1 input: gpio_keys: polling mode support
This implements an optional polling mode for the gpio_keys driver, necessary for GPIOs that are not able to generate IRQs.
gpio_keys_platform_data has been extended with poll_interval which specifies the polling interval in ms, this is passed onto input-polldev.
This work was based on the patch[1] originally conceived by Paul Mundt but now the absolute dependency on INPUT_POLLDEV has been removed (so existing users of gpio_keys can compile out polldev) plus some un-necessary code has been removed.
N.B. untested on an IRQ driven gpio_keys using platform as I have
none available to me, but looks like it should still work
[1] http://article.gmane.org/gmane.linux.kernel.input/5814
--- drivers/input/keyboard/gpio_keys.c | 122 +++++++++++++++++++++++++++++++----- include/linux/gpio_keys.h | 1 + 2 files changed, 106 insertions(+), 17 deletions(-)
drivers/input/keyboard/gpio_keys.c +105 -17
@@ -1,7 +1,9 @@/* -* Driver for keys on GPIO lines capable of generating interrupts. +* Driver for keys on GPIO lines, either IRQ-driven or polled. * * Copyright 2005 Phil Blundell +* Copyright 2008 Paul Mundt +* Copyright 2010 Alexander Clouter <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as
@@ -25,6 +27,7 @@#include <linux/gpio_keys.h> #include <linux/workqueue.h> #include <linux/gpio.h> +#include <linux/input-polldev.h> struct gpio_button_data {struct gpio_keys_button *button;
@@ -36,6 +39,9 @@ struct gpio_button_data {struct gpio_keys_drvdata {struct input_dev *input; +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +struct input_polled_dev *poll_dev; +#endif struct mutex disable_lock;unsigned int n_buttons;struct gpio_button_data data[0 ];
@@ -340,6 +346,16 @@ static void gpio_keys_timer(unsigned long _data)schedule_work (&data->work); } +static void gpio_handle_button_event (struct gpio_keys_button *button, +struct gpio_button_data *bdata) +{ +if (button->debounce_interval) +mod_timer (&bdata->timer, + jiffies +msecs_to_jiffies (button->debounce_interval)); +else +gpio_keys_report_event (bdata); +} +static irqreturn_t gpio_keys_isr (int irq,void *dev_id) {struct gpio_button_data *bdata = dev_id;
@@ -347,15 +363,26 @@ static irqreturn_t gpio_keys_isr(int irq, void *dev_id)BUG_ON (irq !=gpio_to_irq (button->gpio)); -if (button->debounce_interval) -mod_timer (&bdata->timer, - jiffies +msecs_to_jiffies (button->debounce_interval)); -else -schedule_work (&bdata->work); +gpio_handle_button_event (button, bdata);return IRQ_HANDLED ; } +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +static void gpio_keys_poll (struct input_polled_dev *dev) +{ +struct gpio_keys_drvdata *ddata = dev->private; +int i; + +for (i =0 ; i < ddata->n_buttons; i++) { +struct gpio_button_data *bdata = &ddata->data[i]; +struct gpio_keys_button *button = bdata->button; + +gpio_handle_button_event (button, bdata); + } +} +#endif +static int __devinit gpio_keys_setup_key (struct platform_device *pdev,struct gpio_button_data *bdata,struct gpio_keys_button *button)
@@ -422,23 +449,52 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)struct input_dev *input;int i, error;int wakeup =0 ; +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +struct input_polled_dev *poll_dev; +#else + +if (pdata->poll_interval) { +dev_err (dev,"device needs polling (enable INPUT_POLLDEV)\n" ); +return -EINVAL ; + } +#endif ddata =kzalloc (sizeof (struct gpio_keys_drvdata ) + pdata->nbuttons *sizeof (struct gpio_button_data ),GFP_KERNEL ); - input =input_allocate_device (); +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +if (pdata->poll_interval) { + poll_dev =input_allocate_polled_device (); +if (poll_dev) + input = poll_dev->input; + } else +#endif + input =input_allocate_device ();if (!ddata || !input) {dev_err (dev,"failed to allocate state\n" ); error = -ENOMEM ; goto fail1; } - ddata->input = input; +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +if (pdata->poll_interval) { + ddata->poll_dev = poll_dev; + } else +#endif + ddata->input = input; ddata->n_buttons = pdata->nbuttons;mutex_init (&ddata->disable_lock);platform_set_drvdata (pdev, ddata); +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +if (pdata->poll_interval) { + poll_dev->private = ddata; + poll_dev->poll = gpio_keys_poll; + poll_dev->poll_interval = pdata->poll_interval; + } +#endif + input->name = pdev->name; input->phys ="gpio-keys/input0" ; input->dev.parent = &pdev->dev;
@@ -460,14 +516,17 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) bdata->input = input; bdata->button = button; +input_set_capability (input, type, button->code); + +if (pdata->poll_interval) +continue ; + error =gpio_keys_setup_key (pdev, bdata, button);if (error) goto fail2;if (button->wakeup) wakeup =1 ; - -input_set_capability (input, type, button->code); } error =sysfs_create_group (&pdev->dev.kobj, &gpio_keys_attr_group);
@@ -477,7 +536,12 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) goto fail2; } - error =input_register_device (input); +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +if (pdata->poll_interval) + error =input_register_polled_device (poll_dev); + else +#endif + error =input_register_device (input);if (error) {dev_err (dev,"Unable to register input device, error: %d\n" , error);
@@ -497,7 +561,9 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)sysfs_remove_group (&pdev->dev.kobj, &gpio_keys_attr_group); fail2:while (--i >=0 ) { -free_irq (gpio_to_irq (pdata->buttons[i].gpio), &ddata->data[i]); +if (!pdata->poll_interval) +free_irq (gpio_to_irq (pdata->buttons[i].gpio), + &ddata->data[i]);if (pdata->buttons[i].debounce_interval)del_timer_sync (&ddata->data[i].timer);cancel_work_sync (&ddata->data[i].work);
@@ -506,7 +572,12 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)platform_set_drvdata (pdev,NULL ); fail1: -input_free_device (input); +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +if (pdata->poll_interval) +input_free_polled_device (poll_dev); + else +#endif +input_free_device (input);kfree (ddata);return error;
@@ -516,23 +587,40 @@ static int __devexit gpio_keys_remove(struct platform_device *pdev) {struct gpio_keys_platform_data *pdata = pdev->dev.platform_data;struct gpio_keys_drvdata *ddata =platform_get_drvdata (pdev); -struct input_dev *input = ddata->input; +struct input_dev *input;int i; +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +struct input_polled_dev *poll_dev; +#endif sysfs_remove_group (&pdev->dev.kobj, &gpio_keys_attr_group);device_init_wakeup (&pdev->dev,0 );for (i =0 ; i < pdata->nbuttons; i++) { -int irq =gpio_to_irq (pdata->buttons[i].gpio); -free_irq (irq, &ddata->data[i]); +if (!pdata->poll_interval) { +int irq =gpio_to_irq (pdata->buttons[i].gpio); +free_irq (irq, &ddata->data[i]); + }if (pdata->buttons[i].debounce_interval)del_timer_sync (&ddata->data[i].timer);cancel_work_sync (&ddata->data[i].work);gpio_free (pdata->buttons[i].gpio); } -input_unregister_device (input); +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +if (pdata->poll_interval) { + poll_dev = ddata->poll_dev; +input_unregister_polled_device (poll_dev); +input_free_polled_device (poll_dev); + }else { +#endif + input = ddata->input; +input_unregister_device (input); +input_free_device (input); +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) + } +#endif return 0 ; }
include/linux/gpio_keys.h +1 -0
@@ -17,6 +17,7 @@ struct gpio_keys_platform_data {struct gpio_keys_button *buttons;int nbuttons; unsigned int rep:1; /* enable input subsystem auto repeat */ + unsigned int poll_interval; /* polling interval in ms */ };#endif
Signature · 1 line
1.7.1
ping...?
Quoted 284 lines · Alexander Clouter
This implements an optional polling mode for the
gpio_keysdriver, necessary for GPIOs that are not able to generate IRQs.
gpio_keys_platform_datahas been extended withpoll_intervalwhich specifies the polling interval in ms, this is passed onto input-polldev.This work was based on the patch[1] originally conceived by Paul Mundt but now the absolute dependency on
INPUT_POLLDEVhas been removed (so existing users ofgpio_keyscan compile out polldev) plus some un-necessary code has been removed.N.B. untested on an IRQ driven
gpio_keysusing platform as I have
none available to me, but looks like it should still work[1] http://article.gmane.org/gmane.linux.kernel.input/5814
Signed-off-by Alexander Clouter <[email protected]>---
drivers/input/keyboard/gpio_keys.c| 122 +++++++++++++++++++++++++++++++-----include/linux/gpio_keys.h| 1 +2 files changed, 106 insertions(+), 17 deletions(-)drivers/input/keyboard/gpio_keys.c +105
-17@@ -1,7 +1,9 @@/* -* Driver for keys on GPIO lines capable of generating interrupts. +* Driver for keys on GPIO lines, either IRQ-driven or polled. * * Copyright 2005 Phil Blundell +* Copyright 2008 Paul Mundt +* Copyright 2010 Alexander Clouter <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -25,6 +27,7 @@#include <linux/gpio_keys.h> #include <linux/workqueue.h> #include <linux/gpio.h> +#include <linux/input-polldev.h> struct gpio_button_data {struct gpio_keys_button *button;@@ -36,6 +39,9 @@ struct gpio_button_data {struct gpio_keys_drvdata {struct input_dev *input; +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +struct input_polled_dev *poll_dev; +#endif struct mutex disable_lock;unsigned int n_buttons;struct gpio_button_data data[0 ];@@ -340,6 +346,16 @@ static void gpio_keys_timer(unsigned long _data)schedule_work (&data->work); } +static void gpio_handle_button_event (struct gpio_keys_button *button, +struct gpio_button_data *bdata) +{ +if (button->debounce_interval) +mod_timer (&bdata->timer, + jiffies +msecs_to_jiffies (button->debounce_interval)); +else +gpio_keys_report_event (bdata); +} +static irqreturn_t gpio_keys_isr (int irq,void *dev_id) {struct gpio_button_data *bdata = dev_id;@@ -347,15 +363,26 @@ static irqreturn_t gpio_keys_isr(int irq, void *dev_id)BUG_ON (irq !=gpio_to_irq (button->gpio)); -if (button->debounce_interval) -mod_timer (&bdata->timer, - jiffies +msecs_to_jiffies (button->debounce_interval)); -else -schedule_work (&bdata->work); +gpio_handle_button_event (button, bdata);return IRQ_HANDLED ; } +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +static void gpio_keys_poll (struct input_polled_dev *dev) +{ +struct gpio_keys_drvdata *ddata = dev->private; +int i; + +for (i =0 ; i < ddata->n_buttons; i++) { +struct gpio_button_data *bdata = &ddata->data[i]; +struct gpio_keys_button *button = bdata->button; + +gpio_handle_button_event (button, bdata); + } +} +#endif +static int __devinit gpio_keys_setup_key (struct platform_device *pdev,struct gpio_button_data *bdata,struct gpio_keys_button *button)@@ -422,23 +449,52 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)struct input_dev *input;int i, error;int wakeup =0 ; +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +struct input_polled_dev *poll_dev; +#else + +if (pdata->poll_interval) { +dev_err (dev,"device needs polling (enable INPUT_POLLDEV)\n" ); +return -EINVAL ; + } +#endif ddata =kzalloc (sizeof (struct gpio_keys_drvdata ) + pdata->nbuttons *sizeof (struct gpio_button_data ),GFP_KERNEL ); - input =input_allocate_device (); +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +if (pdata->poll_interval) { + poll_dev =input_allocate_polled_device (); +if (poll_dev) + input = poll_dev->input; + } else +#endif + input =input_allocate_device ();if (!ddata || !input) {dev_err (dev,"failed to allocate state\n" ); error = -ENOMEM ; goto fail1; } - ddata->input = input; +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +if (pdata->poll_interval) { + ddata->poll_dev = poll_dev; + } else +#endif + ddata->input = input; ddata->n_buttons = pdata->nbuttons;mutex_init (&ddata->disable_lock);platform_set_drvdata (pdev, ddata); +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +if (pdata->poll_interval) { + poll_dev->private = ddata; + poll_dev->poll = gpio_keys_poll; + poll_dev->poll_interval = pdata->poll_interval; + } +#endif + input->name = pdev->name; input->phys ="gpio-keys/input0" ; input->dev.parent = &pdev->dev;@@ -460,14 +516,17 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) bdata->input = input; bdata->button = button; +input_set_capability (input, type, button->code); + +if (pdata->poll_interval) +continue ; + error =gpio_keys_setup_key (pdev, bdata, button);if (error) goto fail2;if (button->wakeup) wakeup =1 ; - -input_set_capability (input, type, button->code); } error =sysfs_create_group (&pdev->dev.kobj, &gpio_keys_attr_group);@@ -477,7 +536,12 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) goto fail2; } - error =input_register_device (input); +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +if (pdata->poll_interval) + error =input_register_polled_device (poll_dev); + else +#endif + error =input_register_device (input);if (error) {dev_err (dev,"Unable to register input device, error: %d\n" , error);@@ -497,7 +561,9 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)sysfs_remove_group (&pdev->dev.kobj, &gpio_keys_attr_group); fail2:while (--i >=0 ) { -free_irq (gpio_to_irq (pdata->buttons[i].gpio), &ddata->data[i]); +if (!pdata->poll_interval) +free_irq (gpio_to_irq (pdata->buttons[i].gpio), + &ddata->data[i]);if (pdata->buttons[i].debounce_interval)del_timer_sync (&ddata->data[i].timer);cancel_work_sync (&ddata->data[i].work);@@ -506,7 +572,12 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)platform_set_drvdata (pdev,NULL ); fail1: -input_free_device (input); +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +if (pdata->poll_interval) +input_free_polled_device (poll_dev); + else +#endif +input_free_device (input);kfree (ddata);return error;@@ -516,23 +587,40 @@ static int __devexit gpio_keys_remove(struct platform_device *pdev) {struct gpio_keys_platform_data *pdata = pdev->dev.platform_data;struct gpio_keys_drvdata *ddata =platform_get_drvdata (pdev); -struct input_dev *input = ddata->input; +struct input_dev *input;int i; +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +struct input_polled_dev *poll_dev; +#endif sysfs_remove_group (&pdev->dev.kobj, &gpio_keys_attr_group);device_init_wakeup (&pdev->dev,0 );for (i =0 ; i < pdata->nbuttons; i++) { -int irq =gpio_to_irq (pdata->buttons[i].gpio); -free_irq (irq, &ddata->data[i]); +if (!pdata->poll_interval) { +int irq =gpio_to_irq (pdata->buttons[i].gpio); +free_irq (irq, &ddata->data[i]); + }if (pdata->buttons[i].debounce_interval)del_timer_sync (&ddata->data[i].timer);cancel_work_sync (&ddata->data[i].work);gpio_free (pdata->buttons[i].gpio); } -input_unregister_device (input); +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +if (pdata->poll_interval) { + poll_dev = ddata->poll_dev; +input_unregister_polled_device (poll_dev); +input_free_polled_device (poll_dev); + }else { +#endif + input = ddata->input; +input_unregister_device (input); +input_free_device (input); +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) + } +#endif return 0 ; }include/linux/gpio_keys.h +1
-0@@ -17,6 +17,7 @@ struct gpio_keys_platform_data {struct gpio_keys_button *buttons;int nbuttons; unsigned int rep:1; /* enable input subsystem auto repeat */ + unsigned int poll_interval; /* polling interval in ms */ };#endif Signature · 5 lines
1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
Alexander Clouter .sigmonster says: Men seldom show dimples to girls who have pimples.
Hi,
-EDONTCARE? :(
Cheers
Quoted 279 lines · Alexander Clouter
This implements an optional polling mode for the
gpio_keysdriver, necessary for GPIOs that are not able to generate IRQs.
gpio_keys_platform_datahas been extended withpoll_intervalwhich specifies the polling interval in ms, this is passed onto input-polldev.This work was based on the patch[1] originally conceived by Paul Mundt but now the absolute dependency on
INPUT_POLLDEVhas been removed (so existing users ofgpio_keyscan compile out polldev) plus some un-necessary code has been removed.N.B. untested on an IRQ driven
gpio_keysusing platform as I have
none available to me, but looks like it should still work[1] http://article.gmane.org/gmane.linux.kernel.input/5814
Signed-off-by Alexander Clouter <[email protected]>--- drivers/input/keyboard/gpio_keys.c | 122 +++++++++++++++++++++++++++++++----- include/linux/gpio_keys.h | 1 + 2 files changed, 106 insertions(+), 17 deletions(-)drivers/input/keyboard/gpio_keys.c +105
-17@@ -1,7 +1,9 @@/* -* Driver for keys on GPIO lines capable of generating interrupts. +* Driver for keys on GPIO lines, either IRQ-driven or polled. * * Copyright 2005 Phil Blundell +* Copyright 2008 Paul Mundt +* Copyright 2010 Alexander Clouter <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -25,6 +27,7 @@#include <linux/gpio_keys.h> #include <linux/workqueue.h> #include <linux/gpio.h> +#include <linux/input-polldev.h> struct gpio_button_data {struct gpio_keys_button *button;@@ -36,6 +39,9 @@ struct gpio_button_data {struct gpio_keys_drvdata {struct input_dev *input; +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +struct input_polled_dev *poll_dev; +#endif struct mutex disable_lock;unsigned int n_buttons;struct gpio_button_data data[0 ];@@ -340,6 +346,16 @@ static void gpio_keys_timer(unsigned long _data)schedule_work (&data->work); } +static void gpio_handle_button_event (struct gpio_keys_button *button, +struct gpio_button_data *bdata) +{ +if (button->debounce_interval) +mod_timer (&bdata->timer, + jiffies +msecs_to_jiffies (button->debounce_interval)); +else +gpio_keys_report_event (bdata); +} +static irqreturn_t gpio_keys_isr (int irq,void *dev_id) {struct gpio_button_data *bdata = dev_id;@@ -347,15 +363,26 @@ static irqreturn_t gpio_keys_isr(int irq, void *dev_id)BUG_ON (irq !=gpio_to_irq (button->gpio)); -if (button->debounce_interval) -mod_timer (&bdata->timer, - jiffies +msecs_to_jiffies (button->debounce_interval)); -else -schedule_work (&bdata->work); +gpio_handle_button_event (button, bdata);return IRQ_HANDLED ; } +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +static void gpio_keys_poll (struct input_polled_dev *dev) +{ +struct gpio_keys_drvdata *ddata = dev->private; +int i; + +for (i =0 ; i < ddata->n_buttons; i++) { +struct gpio_button_data *bdata = &ddata->data[i]; +struct gpio_keys_button *button = bdata->button; + +gpio_handle_button_event (button, bdata); + } +} +#endif +static int __devinit gpio_keys_setup_key (struct platform_device *pdev,struct gpio_button_data *bdata,struct gpio_keys_button *button)@@ -422,23 +449,52 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)struct input_dev *input;int i, error;int wakeup =0 ; +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +struct input_polled_dev *poll_dev; +#else + +if (pdata->poll_interval) { +dev_err (dev,"device needs polling (enable INPUT_POLLDEV)\n" ); +return -EINVAL ; + } +#endif ddata =kzalloc (sizeof (struct gpio_keys_drvdata ) + pdata->nbuttons *sizeof (struct gpio_button_data ),GFP_KERNEL ); - input =input_allocate_device (); +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +if (pdata->poll_interval) { + poll_dev =input_allocate_polled_device (); +if (poll_dev) + input = poll_dev->input; + } else +#endif + input =input_allocate_device ();if (!ddata || !input) {dev_err (dev,"failed to allocate state\n" ); error = -ENOMEM ; goto fail1; } - ddata->input = input; +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +if (pdata->poll_interval) { + ddata->poll_dev = poll_dev; + } else +#endif + ddata->input = input; ddata->n_buttons = pdata->nbuttons;mutex_init (&ddata->disable_lock);platform_set_drvdata (pdev, ddata); +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +if (pdata->poll_interval) { + poll_dev->private = ddata; + poll_dev->poll = gpio_keys_poll; + poll_dev->poll_interval = pdata->poll_interval; + } +#endif + input->name = pdev->name; input->phys ="gpio-keys/input0" ; input->dev.parent = &pdev->dev;@@ -460,14 +516,17 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) bdata->input = input; bdata->button = button; +input_set_capability (input, type, button->code); + +if (pdata->poll_interval) +continue ; + error =gpio_keys_setup_key (pdev, bdata, button);if (error) goto fail2;if (button->wakeup) wakeup =1 ; - -input_set_capability (input, type, button->code); } error =sysfs_create_group (&pdev->dev.kobj, &gpio_keys_attr_group);@@ -477,7 +536,12 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) goto fail2; } - error =input_register_device (input); +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +if (pdata->poll_interval) + error =input_register_polled_device (poll_dev); + else +#endif + error =input_register_device (input);if (error) {dev_err (dev,"Unable to register input device, error: %d\n" , error);@@ -497,7 +561,9 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)sysfs_remove_group (&pdev->dev.kobj, &gpio_keys_attr_group); fail2:while (--i >=0 ) { -free_irq (gpio_to_irq (pdata->buttons[i].gpio), &ddata->data[i]); +if (!pdata->poll_interval) +free_irq (gpio_to_irq (pdata->buttons[i].gpio), + &ddata->data[i]);if (pdata->buttons[i].debounce_interval)del_timer_sync (&ddata->data[i].timer);cancel_work_sync (&ddata->data[i].work);@@ -506,7 +572,12 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)platform_set_drvdata (pdev,NULL ); fail1: -input_free_device (input); +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +if (pdata->poll_interval) +input_free_polled_device (poll_dev); + else +#endif +input_free_device (input);kfree (ddata);return error;@@ -516,23 +587,40 @@ static int __devexit gpio_keys_remove(struct platform_device *pdev) {struct gpio_keys_platform_data *pdata = pdev->dev.platform_data;struct gpio_keys_drvdata *ddata =platform_get_drvdata (pdev); -struct input_dev *input = ddata->input; +struct input_dev *input;int i; +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +struct input_polled_dev *poll_dev; +#endif sysfs_remove_group (&pdev->dev.kobj, &gpio_keys_attr_group);device_init_wakeup (&pdev->dev,0 );for (i =0 ; i < pdata->nbuttons; i++) { -int irq =gpio_to_irq (pdata->buttons[i].gpio); -free_irq (irq, &ddata->data[i]); +if (!pdata->poll_interval) { +int irq =gpio_to_irq (pdata->buttons[i].gpio); +free_irq (irq, &ddata->data[i]); + }if (pdata->buttons[i].debounce_interval)del_timer_sync (&ddata->data[i].timer);cancel_work_sync (&ddata->data[i].work);gpio_free (pdata->buttons[i].gpio); } -input_unregister_device (input); +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +if (pdata->poll_interval) { + poll_dev = ddata->poll_dev; +input_unregister_polled_device (poll_dev); +input_free_polled_device (poll_dev); + }else { +#endif + input = ddata->input; +input_unregister_device (input); +input_free_device (input); +#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) + } +#endif return 0 ; }include/linux/gpio_keys.h +1
-0@@ -17,6 +17,7 @@ struct gpio_keys_platform_data {struct gpio_keys_button *buttons;int nbuttons; unsigned int rep:1; /* enable input subsystem auto repeat */ + unsigned int poll_interval; /* polling interval in ms */ };#endif Signature · 1 line
1.7.1
Signature · 2 lines
Alexander Clouter .sigmonster says: One picture is worth 128K words.
Quoted 4 lines · Alexander Clouter
Hi,
-EDONTCARE? :(
You could try Cc-ing akpm on the next version, so it at least doesn't get lost.
Quoted 16 lines
Quoted 6 lines
drivers/input/keyboard/gpio_keys.c +5
-0+#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +static void gpio_keys_poll (struct input_polled_dev *dev) +{ +struct gpio_keys_drvdata *ddata = dev->private; +int i;drivers/input/keyboard/gpio_keys.c static irqreturn_t gpio_keys_isr(int irq, void *dev_id) · line 385
Quoted 10 lines
drivers/input/keyboard/gpio_keys.c +10
-0+ +for (i =0 ; i < ddata->n_buttons; i++) { +struct gpio_button_data *bdata = &ddata->data[i]; +struct gpio_keys_button *button = bdata->button; + +gpio_handle_button_event (button, bdata); + } +} +#endif +
This gets back to why I opted to select the polldev stuff in the first place, to avoid the total mess that all of the ifdeffery causes without it. It's also inconsistent, as you have the poll interval tested openly in some places and always defined, while the poll dev itself is always under ifdef due to the input layer definitions.
Personally I've never found the argument that the polling stuff should be optional very convincing. It's a reasonable mode of operation for devices that don't have IRQs bound to GPIOs, and having to depend on the platform to select random bits of input subsystem infrastructure to support a driver that may or may not be enabled at all is ugly at best.
Dmitry Torokhov
maintainerQuoted 30 lines · Paul Mundt
Quoted 4 lines · Alexander Clouter
Hi,
-EDONTCARE? :(You could try Cc-ing akpm on the next version, so it at least doesn't get lost.
Quoted 16 lines
Quoted 6 lines
drivers/input/keyboard/gpio_keys.c +5
-0+#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +static void gpio_keys_poll (struct input_polled_dev *dev) +{ +struct gpio_keys_drvdata *ddata = dev->private; +int i;drivers/input/keyboard/gpio_keys.c static irqreturn_t gpio_keys_isr(int irq, void *dev_id) · line 385
Quoted 10 lines
drivers/input/keyboard/gpio_keys.c +10
-0+ +for (i =0 ; i < ddata->n_buttons; i++) { +struct gpio_button_data *bdata = &ddata->data[i]; +struct gpio_keys_button *button = bdata->button; + +gpio_handle_button_event (button, bdata); + } +} +#endif +This gets back to why I opted to select the polldev stuff in the first place, to avoid the total mess that all of the ifdeffery causes without it. It's also inconsistent, as you have the poll interval tested openly in some places and always defined, while the poll dev itself is always under ifdef due to the input layer definitions.
Quoted 5 lines
Personally I've never found the argument that the polling stuff should be optional very convincing. It's a reasonable mode of operation for devices that don't have IRQs bound to GPIOs, and having to depend on the platform to select random bits of input subsystem infrastructure to support a driver that may or may not be enabled at all is ugly at best.
Let me play a tad with it and if I can't untangle it reasonably I'll just dig up old Paul's patch.
Signature · 1 line
Dmitry
Hi,
Quoted 11 lines · Dmitry Torokhov
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/input/keyboard/gpio_keys.c +10
-0+#if defined(CONFIG_INPUT_POLLDEV ) || defined(CONFIG_INPUT_POLLDEV_MODULE ) +static void gpio_keys_poll (struct input_polled_dev *dev) +{ +struct gpio_keys_drvdata *ddata = dev->private; +int i; + +for (i =0 ; i < ddata->n_buttons; i++) { +struct gpio_button_data *bdata = &ddata->data[i]; +struct gpio_keys_button *button = bdata->button; +
Quoted 9 lines
Quoted 8 lines
Quoted 4 lines
drivers/input/keyboard/gpio_keys.c static irqreturn_t gpio_keys_isr(int irq, void *dev_id) · line 384
Quoted 4 lines
drivers/input/keyboard/gpio_keys.c +4
-0+ gpio_handle_button_event(button, bdata); + } +} +#endif This gets back to why I opted to select the polldev stuff in the first place, to avoid the total mess that all of the ifdeffery causes without it.
Well, for me the ifdef madness really only looks bad as (took me a while to work out) as when configuring polldev to be a module things do not set CONFIG_INPUT_POLLDEV. Is this normal?
grep'ing /usr/src/linux/{arch,drivers/input} for CONFIG_INPUT_POLLDEV_MODULE comes up with no matchs at all (except for gpio_keys.c after my patch is applied).
To clean up the ifdef madness, the only approach I can think of is to define some dummy noop input_allocate_polled_device(), input_free_polled_device() and input_unregister_polled_device() functions defined in gpio_keys.c when CONFIG_INPUT_POLLDEV is not compiled in.
I am happy to do this if preferred?
I can see the argument against forcing gpio_key users having to use polldev (it adds 10kB to the kernel for me), especially on my platform I have a 4MB Flash and my kernel can only be 768kB...
Quoted 4 lines
Quoted 3 lines
It's also inconsistent, as you have the poll interval tested openly in some places and always defined, while the poll dev itself is always under ifdef due to the input layer definitions.
It was meant to me, you will notice the non-ifdef sections do not do anything other than check if poll_interval is non-zero. As this is not an expensive check for the CPU but it is argubly expensive on readability throwing in some more ifdef's...I felt it a good compromise.
Quoted 9 lines
Quoted 5 lines
Personally I've never found the argument that the polling stuff should be optional very convincing. It's a reasonable mode of operation for devices that don't have IRQs bound to GPIOs, and having to depend on the platform to select random bits of input subsystem infrastructure to support a driver that may or may not be enabled at all is ugly at best.
Let me play a tad with it and if I can't untangle it reasonably I'll just dig up old Paul's patch.
Paul's patch unneccessarily extends gpio_keys_drvdata with gpio_keys_platform_data.
Cheers
Signature · 2 lines
Alexander Clouter .sigmonster says: Never argue with a woman when she's tired -- or rested.
PATCH v2 1/1 input: gpio_keys: polling mode support
This implements an optional polling mode for the gpio_keys driver, necessary for GPIOs that are not able to generate IRQs.
gpio_keys_platform_data has been extended with poll_interval which specifies the polling interval in ms, this is passed onto input-polldev.
This work was based on the patch[1] originally conceived by Paul Mundt but now the absolute dependency on INPUT_POLLDEV has been removed (so existing users of gpio_keys can compile out polldev) plus some un-necessary code has been removed.
Changes since v1:
* remove #ifdef madness
[1] http://article.gmane.org/gmane.linux.kernel.input/5814
--- drivers/input/keyboard/gpio_keys.c | 121 +++++++++++++++++++++++++++++++----- include/linux/gpio_keys.h | 1 + 2 files changed, 105 insertions(+), 17 deletions(-)
drivers/input/keyboard/gpio_keys.c +104 -17
@@ -1,7 +1,9 @@/* -* Driver for keys on GPIO lines capable of generating interrupts. +* Driver for keys on GPIO lines, either IRQ-driven or polled. * * Copyright 2005 Phil Blundell +* Copyright 2008 Paul Mundt +* Copyright 2010 Alexander Clouter <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as
@@ -25,6 +27,7 @@#include <linux/gpio_keys.h> #include <linux/workqueue.h> #include <linux/gpio.h> +#include <linux/input-polldev.h> struct gpio_button_data {struct gpio_keys_button *button;
@@ -36,11 +39,32 @@ struct gpio_button_data {struct gpio_keys_drvdata {struct input_dev *input; +struct input_polled_dev *poll_dev;struct mutex disable_lock;unsigned int n_buttons;struct gpio_button_data data[0 ]; }; +#if !defined(CONFIG_INPUT_POLLDEV ) && !defined(CONFIG_INPUT_POLLDEV_MODULE ) +inline struct input_polled_dev *input_allocate_polled_device (void ) +{ +return NULL ; +} + +inline void input_free_polled_device (struct input_polled_dev *poll_dev) +{ +} + +inline int input_register_polled_device (struct input_polled_dev *dev) +{ +return -ENXIO ; +} + +inline void input_unregister_polled_device (struct input_polled_dev *poll_dev) +{ +} +#endif +/* * SYSFS interface for enabling/disabling keys and switches: *
@@ -340,6 +364,16 @@ static void gpio_keys_timer(unsigned long _data)schedule_work (&data->work); } +static void gpio_handle_button_event (struct gpio_keys_button *button, +struct gpio_button_data *bdata) +{ +if (button->debounce_interval) +mod_timer (&bdata->timer, + jiffies +msecs_to_jiffies (button->debounce_interval)); +else +gpio_keys_report_event (bdata); +} +static irqreturn_t gpio_keys_isr (int irq,void *dev_id) {struct gpio_button_data *bdata = dev_id;
@@ -347,15 +381,24 @@ static irqreturn_t gpio_keys_isr(int irq, void *dev_id)BUG_ON (irq !=gpio_to_irq (button->gpio)); -if (button->debounce_interval) -mod_timer (&bdata->timer, - jiffies +msecs_to_jiffies (button->debounce_interval)); -else -schedule_work (&bdata->work); +gpio_handle_button_event (button, bdata);return IRQ_HANDLED ; } +static void gpio_keys_poll (struct input_polled_dev *dev) +{ +struct gpio_keys_drvdata *ddata = dev->private; +int i; + +for (i =0 ; i < ddata->n_buttons; i++) { +struct gpio_button_data *bdata = &ddata->data[i]; +struct gpio_keys_button *button = bdata->button; + +gpio_handle_button_event (button, bdata); + } +} +static int __devinit gpio_keys_setup_key (struct platform_device *pdev,struct gpio_button_data *bdata,struct gpio_keys_button *button)
@@ -420,25 +463,47 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)struct gpio_keys_drvdata *ddata;struct device *dev = &pdev->dev;struct input_dev *input; +struct input_polled_dev *poll_dev;int i, error;int wakeup =0 ; +#if !defined(CONFIG_INPUT_POLLDEV ) && !defined(CONFIG_INPUT_POLLDEV_MODULE ) +if (pdata->poll_interval) { +dev_err (dev,"device needs polling (enable INPUT_POLLDEV)\n" ); +return -EINVAL ; + } +#endif + ddata =kzalloc (sizeof (struct gpio_keys_drvdata ) + pdata->nbuttons *sizeof (struct gpio_button_data ),GFP_KERNEL ); - input =input_allocate_device (); +if (pdata->poll_interval) { + poll_dev =input_allocate_polled_device (); +if (poll_dev) + input = poll_dev->input; + }else + input =input_allocate_device ();if (!ddata || !input) {dev_err (dev,"failed to allocate state\n" ); error = -ENOMEM ; goto fail1; } - ddata->input = input; +if (pdata->poll_interval) { + ddata->poll_dev = poll_dev; + }else + ddata->input = input; ddata->n_buttons = pdata->nbuttons;mutex_init (&ddata->disable_lock);platform_set_drvdata (pdev, ddata); +if (pdata->poll_interval) { + poll_dev->private = ddata; + poll_dev->poll = gpio_keys_poll; + poll_dev->poll_interval = pdata->poll_interval; + } + input->name = pdev->name; input->phys ="gpio-keys/input0" ; input->dev.parent = &pdev->dev;
@@ -460,14 +525,17 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) bdata->input = input; bdata->button = button; +input_set_capability (input, type, button->code); + +if (pdata->poll_interval) +continue ; + error =gpio_keys_setup_key (pdev, bdata, button);if (error) goto fail2;if (button->wakeup) wakeup =1 ; - -input_set_capability (input, type, button->code); } error =sysfs_create_group (&pdev->dev.kobj, &gpio_keys_attr_group);
@@ -477,7 +545,10 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) goto fail2; } - error =input_register_device (input); +if (pdata->poll_interval) + error =input_register_polled_device (poll_dev); +else + error =input_register_device (input);if (error) {dev_err (dev,"Unable to register input device, error: %d\n" , error);
@@ -497,7 +568,9 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)sysfs_remove_group (&pdev->dev.kobj, &gpio_keys_attr_group); fail2:while (--i >=0 ) { -free_irq (gpio_to_irq (pdata->buttons[i].gpio), &ddata->data[i]); +if (!pdata->poll_interval) +free_irq (gpio_to_irq (pdata->buttons[i].gpio), + &ddata->data[i]);if (pdata->buttons[i].debounce_interval)del_timer_sync (&ddata->data[i].timer);cancel_work_sync (&ddata->data[i].work);
@@ -506,7 +579,10 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)platform_set_drvdata (pdev,NULL ); fail1: -input_free_device (input); +if (pdata->poll_interval) +input_free_polled_device (poll_dev); +else +input_free_device (input);kfree (ddata);return error;
@@ -516,7 +592,8 @@ static int __devexit gpio_keys_remove(struct platform_device *pdev) {struct gpio_keys_platform_data *pdata = pdev->dev.platform_data;struct gpio_keys_drvdata *ddata =platform_get_drvdata (pdev); -struct input_dev *input = ddata->input; +struct input_dev *input; +struct input_polled_dev *poll_dev;int i;sysfs_remove_group (&pdev->dev.kobj, &gpio_keys_attr_group);
@@ -524,15 +601,25 @@ static int __devexit gpio_keys_remove(struct platform_device *pdev)device_init_wakeup (&pdev->dev,0 );for (i =0 ; i < pdata->nbuttons; i++) { -int irq =gpio_to_irq (pdata->buttons[i].gpio); -free_irq (irq, &ddata->data[i]); +if (!pdata->poll_interval) { +int irq =gpio_to_irq (pdata->buttons[i].gpio); +free_irq (irq, &ddata->data[i]); + }if (pdata->buttons[i].debounce_interval)del_timer_sync (&ddata->data[i].timer);cancel_work_sync (&ddata->data[i].work);gpio_free (pdata->buttons[i].gpio); } -input_unregister_device (input); +if (pdata->poll_interval) { + poll_dev = ddata->poll_dev; +input_unregister_polled_device (poll_dev); +input_free_polled_device (poll_dev); + }else { + input = ddata->input; +input_unregister_device (input); +input_free_device (input); + }return 0 ; }
include/linux/gpio_keys.h +1 -0
@@ -17,6 +17,7 @@ struct gpio_keys_platform_data {struct gpio_keys_button *buttons;int nbuttons; unsigned int rep:1; /* enable input subsystem auto repeat */ + unsigned int poll_interval; /* polling interval in ms */ };#endif
Signature · 1 line
1.7.1
PATCH v3 1/1 input: gpio_keys: polling mode support
This implements an optional polling mode for the gpio_keys driver, necessary for GPIOs that are not able to generate IRQs.
gpio_keys_platform_data has been extended with poll_interval which specifies the polling interval in ms, this is passed onto input-polldev.
This work was based on the patch[1] originally conceived by Paul Mundt but now the absolute dependency on INPUT_POLLDEV has been removed (so existing users of gpio_keys can compile out polldev) plus some un-necessary code has been removed.
[1] http://article.gmane.org/gmane.linux.kernel.input/5814
Changes since v2:
* fix minor coding style glitch
Changes since v1:
* remove #ifdef madness
--- drivers/input/keyboard/gpio_keys.c | 121 +++++++++++++++++++++++++++++++----- include/linux/gpio_keys.h | 1 + 2 files changed, 105 insertions(+), 17 deletions(-)
drivers/input/keyboard/gpio_keys.c +104 -17
@@ -1,7 +1,9 @@/* -* Driver for keys on GPIO lines capable of generating interrupts. +* Driver for keys on GPIO lines, either IRQ-driven or polled. * * Copyright 2005 Phil Blundell +* Copyright 2008 Paul Mundt +* Copyright 2010 Alexander Clouter <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as
@@ -25,6 +27,7 @@#include <linux/gpio_keys.h> #include <linux/workqueue.h> #include <linux/gpio.h> +#include <linux/input-polldev.h> struct gpio_button_data {struct gpio_keys_button *button;
@@ -36,11 +39,32 @@ struct gpio_button_data {struct gpio_keys_drvdata {struct input_dev *input; +struct input_polled_dev *poll_dev;struct mutex disable_lock;unsigned int n_buttons;struct gpio_button_data data[0 ]; }; +#if !defined(CONFIG_INPUT_POLLDEV ) && !defined(CONFIG_INPUT_POLLDEV_MODULE ) +inline struct input_polled_dev *input_allocate_polled_device (void ) +{ +return NULL ; +} + +inline void input_free_polled_device (struct input_polled_dev *poll_dev) +{ +} + +inline int input_register_polled_device (struct input_polled_dev *dev) +{ +return -ENXIO ; +} + +inline void input_unregister_polled_device (struct input_polled_dev *poll_dev) +{ +} +#endif +/* * SYSFS interface for enabling/disabling keys and switches: *
@@ -340,6 +364,16 @@ static void gpio_keys_timer(unsigned long _data)schedule_work (&data->work); } +static void gpio_handle_button_event (struct gpio_keys_button *button, +struct gpio_button_data *bdata) +{ +if (button->debounce_interval) +mod_timer (&bdata->timer, + jiffies +msecs_to_jiffies (button->debounce_interval)); +else +gpio_keys_report_event (bdata); +} +static irqreturn_t gpio_keys_isr (int irq,void *dev_id) {struct gpio_button_data *bdata = dev_id;
@@ -347,15 +381,24 @@ static irqreturn_t gpio_keys_isr(int irq, void *dev_id)BUG_ON (irq !=gpio_to_irq (button->gpio)); -if (button->debounce_interval) -mod_timer (&bdata->timer, - jiffies +msecs_to_jiffies (button->debounce_interval)); -else -schedule_work (&bdata->work); +gpio_handle_button_event (button, bdata);return IRQ_HANDLED ; } +static void gpio_keys_poll (struct input_polled_dev *dev) +{ +struct gpio_keys_drvdata *ddata = dev->private; +int i; + +for (i =0 ; i < ddata->n_buttons; i++) { +struct gpio_button_data *bdata = &ddata->data[i]; +struct gpio_keys_button *button = bdata->button; + +gpio_handle_button_event (button, bdata); + } +} +static int __devinit gpio_keys_setup_key (struct platform_device *pdev,struct gpio_button_data *bdata,struct gpio_keys_button *button)
@@ -420,25 +463,47 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)struct gpio_keys_drvdata *ddata;struct device *dev = &pdev->dev;struct input_dev *input; +struct input_polled_dev *poll_dev;int i, error;int wakeup =0 ; +#if !defined(CONFIG_INPUT_POLLDEV ) && !defined(CONFIG_INPUT_POLLDEV_MODULE ) +if (pdata->poll_interval) { +dev_err (dev,"device needs polling (enable INPUT_POLLDEV)\n" ); +return -EINVAL ; + } +#endif + ddata =kzalloc (sizeof (struct gpio_keys_drvdata ) + pdata->nbuttons *sizeof (struct gpio_button_data ),GFP_KERNEL ); - input =input_allocate_device (); +if (pdata->poll_interval) { + poll_dev =input_allocate_polled_device (); +if (poll_dev) + input = poll_dev->input; + }else + input =input_allocate_device ();if (!ddata || !input) {dev_err (dev,"failed to allocate state\n" ); error = -ENOMEM ; goto fail1; } - ddata->input = input; +if (pdata->poll_interval) + ddata->poll_dev = poll_dev; +else + ddata->input = input; ddata->n_buttons = pdata->nbuttons;mutex_init (&ddata->disable_lock);platform_set_drvdata (pdev, ddata); +if (pdata->poll_interval) { + poll_dev->private = ddata; + poll_dev->poll = gpio_keys_poll; + poll_dev->poll_interval = pdata->poll_interval; + } + input->name = pdev->name; input->phys ="gpio-keys/input0" ; input->dev.parent = &pdev->dev;
@@ -460,14 +525,17 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) bdata->input = input; bdata->button = button; +input_set_capability (input, type, button->code); + +if (pdata->poll_interval) +continue ; + error =gpio_keys_setup_key (pdev, bdata, button);if (error) goto fail2;if (button->wakeup) wakeup =1 ; - -input_set_capability (input, type, button->code); } error =sysfs_create_group (&pdev->dev.kobj, &gpio_keys_attr_group);
@@ -477,7 +545,10 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) goto fail2; } - error =input_register_device (input); +if (pdata->poll_interval) + error =input_register_polled_device (poll_dev); +else + error =input_register_device (input);if (error) {dev_err (dev,"Unable to register input device, error: %d\n" , error);
@@ -497,7 +568,9 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)sysfs_remove_group (&pdev->dev.kobj, &gpio_keys_attr_group); fail2:while (--i >=0 ) { -free_irq (gpio_to_irq (pdata->buttons[i].gpio), &ddata->data[i]); +if (!pdata->poll_interval) +free_irq (gpio_to_irq (pdata->buttons[i].gpio), + &ddata->data[i]);if (pdata->buttons[i].debounce_interval)del_timer_sync (&ddata->data[i].timer);cancel_work_sync (&ddata->data[i].work);
@@ -506,7 +579,10 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)platform_set_drvdata (pdev,NULL ); fail1: -input_free_device (input); +if (pdata->poll_interval) +input_free_polled_device (poll_dev); +else +input_free_device (input);kfree (ddata);return error;
@@ -516,7 +592,8 @@ static int __devexit gpio_keys_remove(struct platform_device *pdev) {struct gpio_keys_platform_data *pdata = pdev->dev.platform_data;struct gpio_keys_drvdata *ddata =platform_get_drvdata (pdev); -struct input_dev *input = ddata->input; +struct input_dev *input; +struct input_polled_dev *poll_dev;int i;sysfs_remove_group (&pdev->dev.kobj, &gpio_keys_attr_group);
@@ -524,15 +601,25 @@ static int __devexit gpio_keys_remove(struct platform_device *pdev)device_init_wakeup (&pdev->dev,0 );for (i =0 ; i < pdata->nbuttons; i++) { -int irq =gpio_to_irq (pdata->buttons[i].gpio); -free_irq (irq, &ddata->data[i]); +if (!pdata->poll_interval) { +int irq =gpio_to_irq (pdata->buttons[i].gpio); +free_irq (irq, &ddata->data[i]); + }if (pdata->buttons[i].debounce_interval)del_timer_sync (&ddata->data[i].timer);cancel_work_sync (&ddata->data[i].work);gpio_free (pdata->buttons[i].gpio); } -input_unregister_device (input); +if (pdata->poll_interval) { + poll_dev = ddata->poll_dev; +input_unregister_polled_device (poll_dev); +input_free_polled_device (poll_dev); + }else { + input = ddata->input; +input_unregister_device (input); +input_free_device (input); + }return 0 ; }
include/linux/gpio_keys.h +1 -0
@@ -17,6 +17,7 @@ struct gpio_keys_platform_data {struct gpio_keys_button *buttons;int nbuttons; unsigned int rep:1; /* enable input subsystem auto repeat */ + unsigned int poll_interval; /* polling interval in ms */ };#endif
Signature · 1 line
1.7.1
Hi,
Just in case you didn't know: there's an alternate implementation at
https://dev.openwrt.org/browser/trunk/target/linux/generic-2.6/files/drivers/input/misc/gpio_buttons.c?rev=21436
Signature · 2 lines
Regards, Feri.
Dmitry Torokhov
maintainerQuoted 4 lines · Ferenc Wagner
Hi,
Just in case you didn't know: there's an alternate implementation at
https://dev.openwrt.org/browser/trunk/target/linux/generic-2.6/files/drivers/input/misc/gpio_buttons.c?rev=21436
Hmm, I might like this option best of all. We just need to rename the driver so that we can have both polled and interrupt driven compiled, Then we'd bind based on device name creatd for us.
Can you submit it officially?
Thanks.
Signature · 1 line
Dmitry
Quoted 10 lines · Dmitry Torokhov
Quoted 2 lines · Ferenc Wagner
Just in case you didn't know: there's an alternate implementation at
https://dev.openwrt.org/browser/trunk/target/linux/generic-2.6/files/drivers/input/misc/gpio_buttons.c?rev=21436Hmm, I might like this option best of all. We just need to rename the driver so that we can have both polled and interrupt driven compiled, Then we'd bind based on device name creatd for us.
Can you submit it officially?
Hi,
Actually, I'm not affiliated with that code, I just happened to run into it some time ago. I put its authors on Cc, they sure can help you better. I'd expect them to very gladly submit it, thus reducing the delta between OpenWRT and upstream Linux. :)
Signature · 2 lines
Regards, Feri.