Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen...

[sfrench/cifs-2.6.git] / drivers / input / misc / cobalt_btns.c

diff --git a/drivers/input/misc/cobalt_btns.c b/drivers/input/misc/cobalt_btns.c
index 064b07936019c1f6465eb6aa1c1391666734a653..5511ef006a66c591cf59df2ffde421001f282758 100644 (file)
--- a/drivers/input/misc/cobalt_btns.c
+++ b/drivers/input/misc/cobalt_btns.c
@@ -1,7 +1,7 @@
 /*
  *  Cobalt button interface driver.
  *
- *  Copyright (C) 2007  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *  Copyright (C) 2007-2008  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <linux/init.h>
 #include <linux/input-polldev.h>
@@ -27,55 +27,48 @@
 #define BUTTONS_COUNT_THRESHOLD        3
 #define BUTTONS_STATUS_MASK    0xfe000000
 
+static const unsigned short cobalt_map[] = {
+       KEY_RESERVED,
+       KEY_RESTART,
+       KEY_LEFT,
+       KEY_UP,
+       KEY_DOWN,
+       KEY_RIGHT,
+       KEY_ENTER,
+       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;
 };
 
-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, },
-};
-
 static void handle_buttons(struct input_polled_dev *dev)
 {
-       struct buttons_map *button = buttons_map;
        struct buttons_dev *bdev = dev->private;
        struct input_dev *input = dev->input;
        uint32_t status;
        int i;
 
-       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 & (1U << 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(input, button->keycode, 0);
+                       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;
-               }
-
-               if (button->count == BUTTONS_COUNT_THRESHOLD) {
-                       input_report_key(input, button->keycode, 1);
-                       input_sync(input);
+                       bdev->count[i] = 0;
                }
-
-               button++;
        }
 }
 
@@ -94,6 +87,8 @@ static int __devinit cobalt_buttons_probe(struct platform_device *pdev)
                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;
@@ -102,13 +97,17 @@ static int __devinit cobalt_buttons_probe(struct platform_device *pdev)
        input->name = "Cobalt buttons";
        input->phys = "cobalt/input0";
        input->id.bustype = BUS_HOST;
-       input->cdev.dev = &pdev->dev;
+       input->dev.parent = &pdev->dev;
 
-       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 = bdev->keymap;
+       input->keycodemax = ARRAY_SIZE(bdev->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(cobalt_map); i++)
+               __set_bit(bdev->keymap[i], input->keybit);
+       __clear_bit(KEY_RESERVED, input->keybit);
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!res) {