Merge branch 'slub-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm

[linux-2.6-omap-h63xx.git] / drivers / input / misc / cobalt_btns.c

diff --git a/drivers/input/misc/cobalt_btns.c b/drivers/input/misc/cobalt_btns.c
index b9b2d7764e735f60ab6dbeb1d6680143f0901a62..4833b1a826239c62c3fd641ba96dd0b92a3ab0ff 100644 (file)
--- a/drivers/input/misc/cobalt_btns.c
+++ b/drivers/input/misc/cobalt_btns.c
@@ -18,111 +18,96 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include <linux/init.h>
-#include <linux/input.h>
+#include <linux/input-polldev.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
-#include <linux/jiffies.h>
-#include <linux/timer.h>
 
 #define BUTTONS_POLL_INTERVAL  30      /* msec */
 #define BUTTONS_COUNT_THRESHOLD        3
 #define BUTTONS_STATUS_MASK    0xfe000000
 
-struct buttons_dev {
-       struct input_dev *input;
-       void __iomem *reg;
+static const unsigned short cobalt_map[] = {
+       KEY_RESERVED,
+       KEY_RESTART,
+       KEY_LEFT,
+       KEY_UP,
+       KEY_DOWN,
+       KEY_RIGHT,
+       KEY_ENTER,
+       KEY_SELECT
 };
 
-struct buttons_map {
-       uint32_t mask;
-       int keycode;
-       int count;
-};
-
-static struct buttons_map buttons_map[] = {
-       { 0x02000000, KEY_RESTART, },
-       { 0x04000000, KEY_LEFT, },
-       { 0x08000000, KEY_UP, },
-       { 0x10000000, KEY_DOWN, },
-       { 0x20000000, KEY_RIGHT, },
-       { 0x40000000, KEY_ENTER, },
-       { 0x80000000, KEY_SELECT, },
+struct buttons_dev {
+       struct input_polled_dev *poll_dev;
+       unsigned short keymap[ARRAY_SIZE(cobalt_map)];
+       int count[ARRAY_SIZE(cobalt_map)];
+       void __iomem *reg;
 };
 
-static struct timer_list buttons_timer;
-
-static void handle_buttons(unsigned long data)
+static void handle_buttons(struct input_polled_dev *dev)
 {
-       struct buttons_map *button = buttons_map;
-       struct buttons_dev *bdev;
+       struct buttons_dev *bdev = dev->private;
+       struct input_dev *input = dev->input;
        uint32_t status;
        int i;
 
-       bdev = (struct buttons_dev *)data;
-       status = readl(bdev->reg);
-       status = ~status & BUTTONS_STATUS_MASK;
+       status = ~readl(bdev->reg) >> 24;
 
-       for (i = 0; i < ARRAY_SIZE(buttons_map); i++) {
-               if (status & button->mask) {
-                       button->count++;
+       for (i = 0; i < ARRAY_SIZE(bdev->keymap); i++) {
+               if (status & (1UL << i)) {
+                       if (++bdev->count[i] == BUTTONS_COUNT_THRESHOLD) {
+                               input_event(input, EV_MSC, MSC_SCAN, i);
+                               input_report_key(input, bdev->keymap[i], 1);
+                               input_sync(input);
+                       }
                } else {
-                       if (button->count >= BUTTONS_COUNT_THRESHOLD) {
-                               input_report_key(bdev->input, button->keycode, 0);
-                               input_sync(bdev->input);
+                       if (bdev->count[i] >= BUTTONS_COUNT_THRESHOLD) {
+                               input_event(input, EV_MSC, MSC_SCAN, i);
+                               input_report_key(input, bdev->keymap[i], 0);
+                               input_sync(input);
                        }
-                       button->count = 0;
+                       bdev->count[i] = 0;
                }
-
-               if (button->count == BUTTONS_COUNT_THRESHOLD) {
-                       input_report_key(bdev->input, button->keycode, 1);
-                       input_sync(bdev->input);
-               }
-
-               button++;
        }
-
-       mod_timer(&buttons_timer, jiffies + msecs_to_jiffies(BUTTONS_POLL_INTERVAL));
-}
-
-static int cobalt_buttons_open(struct input_dev *dev)
-{
-       mod_timer(&buttons_timer, jiffies + msecs_to_jiffies(BUTTONS_POLL_INTERVAL));
-
-       return 0;
-}
-
-static void cobalt_buttons_close(struct input_dev *dev)
-{
-       del_timer_sync(&buttons_timer);
 }
 
 static int __devinit cobalt_buttons_probe(struct platform_device *pdev)
 {
        struct buttons_dev *bdev;
+       struct input_polled_dev *poll_dev;
        struct input_dev *input;
        struct resource *res;
        int error, i;
 
        bdev = kzalloc(sizeof(struct buttons_dev), GFP_KERNEL);
-       input = input_allocate_device();
-       if (!bdev || !input) {
+       poll_dev = input_allocate_polled_device();
+       if (!bdev || !poll_dev) {
                error = -ENOMEM;
                goto err_free_mem;
        }
 
+       memcpy(bdev->keymap, cobalt_map, sizeof(bdev->keymap));
+
+       poll_dev->private = bdev;
+       poll_dev->poll = handle_buttons;
+       poll_dev->poll_interval = BUTTONS_POLL_INTERVAL;
+
+       input = poll_dev->input;
        input->name = "Cobalt buttons";
        input->phys = "cobalt/input0";
        input->id.bustype = BUS_HOST;
        input->cdev.dev = &pdev->dev;
-       input->open = cobalt_buttons_open;
-       input->close = cobalt_buttons_close;
 
-       input->evbit[0] = BIT(EV_KEY);
-       for (i = 0; i < ARRAY_SIZE(buttons_map); i++) {
-               set_bit(buttons_map[i].keycode, input->keybit);
-               buttons_map[i].count = 0;
-       }
+       input->keycode = pdev->keymap;
+       input->keycodemax = ARRAY_SIZE(pdev->keymap);
+       input->keycodesize = sizeof(unsigned short);
+
+       input_set_capability(input, EV_MSC, MSC_SCAN);
+       __set_bit(EV_KEY, input->evbit);
+       for (i = 0; i < ARRAY_SIZE(buttons_map); i++)
+               __set_bit(input->keycode[i], input->keybit);
+       __clear_bit(KEY_RESERVED, input->keybit);
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!res) {
@@ -130,13 +115,11 @@ static int __devinit cobalt_buttons_probe(struct platform_device *pdev)
                goto err_free_mem;
        }
 
-       bdev->input = input;
+       bdev->poll_dev = poll_dev;
        bdev->reg = ioremap(res->start, res->end - res->start + 1);
        dev_set_drvdata(&pdev->dev, bdev);
 
-       setup_timer(&buttons_timer, handle_buttons, (unsigned long)bdev);
-
-       error = input_register_device(input);
+       error = input_register_polled_device(poll_dev);
        if (error)
                goto err_iounmap;
 
@@ -145,7 +128,7 @@ static int __devinit cobalt_buttons_probe(struct platform_device *pdev)
  err_iounmap:
        iounmap(bdev->reg);
  err_free_mem:
-       input_free_device(input);
+       input_free_polled_device(poll_dev);
        kfree(bdev);
        dev_set_drvdata(&pdev->dev, NULL);
        return error;
@@ -156,7 +139,8 @@ static int __devexit cobalt_buttons_remove(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct buttons_dev *bdev = dev_get_drvdata(dev);
 
-       input_unregister_device(bdev->input);
+       input_unregister_polled_device(bdev->poll_dev);
+       input_free_polled_device(bdev->poll_dev);
        iounmap(bdev->reg);
        kfree(bdev);
        dev_set_drvdata(dev, NULL);