1 files changed, 114 insertions, 103 deletions

diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
index 0d2fc64a5e1..76f9668221a 100644
--- a/drivers/input/keyboard/pxa27x_keypad.c
+++ b/drivers/input/keyboard/pxa27x_keypad.c
@@ -25,13 +25,13 @@
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <linux/err.h>
+#include <linux/input/matrix_keypad.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
 #include <mach/hardware.h>
 #include <mach/pxa27x_keypad.h>
-
 /*
  * Keypad Controller registers
  */
@@ -95,7 +95,8 @@
 #define keypad_readl(off)       __raw_readl(keypad->mmio_base + (off))
 #define keypad_writel(off, v)   __raw_writel((v), keypad->mmio_base + (off))
 
-#define MAX_MATRIX_KEY_NUM      (8 * 8)
+#define MAX_MATRIX_KEY_NUM      (MAX_MATRIX_KEY_ROWS * MAX_MATRIX_KEY_COLS)
+#define MAX_KEYPAD_KEYS         (MAX_MATRIX_KEY_NUM + MAX_DIRECT_KEY_NUM)
 
 struct pxa27x_keypad {
         struct pxa27x_keypad_platform_data *pdata;
@@ -106,73 +107,82 @@ struct pxa27x_keypad {
 
         int irq;
 
-        /* matrix key code map */
-        unsigned int matrix_keycodes[MAX_MATRIX_KEY_NUM];
+        unsigned short keycodes[MAX_KEYPAD_KEYS];
+        int rotary_rel_code[2];
 
         /* state row bits of each column scan */
         uint32_t matrix_key_state[MAX_MATRIX_KEY_COLS];
         uint32_t direct_key_state;
 
         unsigned int direct_key_mask;
-
-        int rotary_rel_code[2];
-        int rotary_up_key[2];
-        int rotary_down_key[2];
 };
 
 static void pxa27x_keypad_build_keycode(struct pxa27x_keypad *keypad)
 {
         struct pxa27x_keypad_platform_data *pdata = keypad->pdata;
         struct input_dev *input_dev = keypad->input_dev;
-        unsigned int *key;
+        unsigned short keycode;
         int i;
 
-        key = &pdata->matrix_key_map[0];
-        for (i = 0; i < pdata->matrix_key_map_size; i++, key++) {
-                int row = ((*key) >> 28) & 0xf;
-                int col = ((*key) >> 24) & 0xf;
-                int code = (*key) & 0xffffff;
+        for (i = 0; i < pdata->matrix_key_map_size; i++) {
+                unsigned int key = pdata->matrix_key_map[i];
+                unsigned int row = KEY_ROW(key);
+                unsigned int col = KEY_COL(key);
+                unsigned int scancode = MATRIX_SCAN_CODE(row, col,
+                                                         MATRIX_ROW_SHIFT);
 
-                keypad->matrix_keycodes[(row << 3) + col] = code;
-                set_bit(code, input_dev->keybit);
+                keycode = KEY_VAL(key);
+                keypad->keycodes[scancode] = keycode;
+                __set_bit(keycode, input_dev->keybit);
         }
 
-        for (i = 0; i < pdata->direct_key_num; i++)
-                set_bit(pdata->direct_key_map[i], input_dev->keybit);
-
-        keypad->rotary_up_key[0] = pdata->rotary0_up_key;
-        keypad->rotary_up_key[1] = pdata->rotary1_up_key;
-        keypad->rotary_down_key[0] = pdata->rotary0_down_key;
-        keypad->rotary_down_key[1] = pdata->rotary1_down_key;
-        keypad->rotary_rel_code[0] = pdata->rotary0_rel_code;
-        keypad->rotary_rel_code[1] = pdata->rotary1_rel_code;
+        for (i = 0; i < pdata->direct_key_num; i++) {
+                keycode = pdata->direct_key_map[i];
+                keypad->keycodes[MAX_MATRIX_KEY_NUM + i] = keycode;
+                __set_bit(keycode, input_dev->keybit);
+        }
 
         if (pdata->enable_rotary0) {
                 if (pdata->rotary0_up_key && pdata->rotary0_down_key) {
-                        set_bit(pdata->rotary0_up_key, input_dev->keybit);
-                        set_bit(pdata->rotary0_down_key, input_dev->keybit);
-                } else
-                        set_bit(pdata->rotary0_rel_code, input_dev->relbit);
+                        keycode = pdata->rotary0_up_key;
+                        keypad->keycodes[MAX_MATRIX_KEY_NUM + 0] = keycode;
+                        __set_bit(keycode, input_dev->keybit);
+
+                        keycode = pdata->rotary0_down_key;
+                        keypad->keycodes[MAX_MATRIX_KEY_NUM + 1] = keycode;
+                        __set_bit(keycode, input_dev->keybit);
+
+                        keypad->rotary_rel_code[0] = -1;
+                } else {
+                        keypad->rotary_rel_code[0] = pdata->rotary0_rel_code;
+                        __set_bit(pdata->rotary0_rel_code, input_dev->relbit);
+                }
         }
 
         if (pdata->enable_rotary1) {
                 if (pdata->rotary1_up_key && pdata->rotary1_down_key) {
-                        set_bit(pdata->rotary1_up_key, input_dev->keybit);
-                        set_bit(pdata->rotary1_down_key, input_dev->keybit);
-                } else
-                        set_bit(pdata->rotary1_rel_code, input_dev->relbit);
+                        keycode = pdata->rotary1_up_key;
+                        keypad->keycodes[MAX_MATRIX_KEY_NUM + 2] = keycode;
+                        __set_bit(keycode, input_dev->keybit);
+
+                        keycode = pdata->rotary1_down_key;
+                        keypad->keycodes[MAX_MATRIX_KEY_NUM + 3] = keycode;
+                        __set_bit(keycode, input_dev->keybit);
+
+                        keypad->rotary_rel_code[1] = -1;
+                } else {
+                        keypad->rotary_rel_code[1] = pdata->rotary1_rel_code;
+                        __set_bit(pdata->rotary1_rel_code, input_dev->relbit);
+                }
         }
-}
 
-static inline unsigned int lookup_matrix_keycode(
-                struct pxa27x_keypad *keypad, int row, int col)
-{
-        return keypad->matrix_keycodes[(row << 3) + col];
+        __clear_bit(KEY_RESERVED, input_dev->keybit);
 }
 
 static void pxa27x_keypad_scan_matrix(struct pxa27x_keypad *keypad)
 {
         struct pxa27x_keypad_platform_data *pdata = keypad->pdata;
+        struct input_dev *input_dev = keypad->input_dev;
         int row, col, num_keys_pressed = 0;
         uint32_t new_state[MAX_MATRIX_KEY_COLS];
         uint32_t kpas = keypad_readl(KPAS);
@@ -215,6 +225,7 @@ static void pxa27x_keypad_scan_matrix(struct pxa27x_keypad *keypad)
 scan:
         for (col = 0; col < pdata->matrix_key_cols; col++) {
                 uint32_t bits_changed;
+                int code;
 
                 bits_changed = keypad->matrix_key_state[col] ^ new_state[col];
                 if (bits_changed == 0)
@@ -224,12 +235,13 @@ scan:
                         if ((bits_changed & (1 << row)) == 0)
                                 continue;
 
-                        input_report_key(keypad->input_dev,
-                                lookup_matrix_keycode(keypad, row, col),
-                                new_state[col] & (1 << row));
+                        code = MATRIX_SCAN_CODE(row, col, MATRIX_ROW_SHIFT);
+                        input_event(input_dev, EV_MSC, MSC_SCAN, code);
+                        input_report_key(input_dev, keypad->keycodes[code],
+                                         new_state[col] & (1 << row));
                 }
         }
-        input_sync(keypad->input_dev);
+        input_sync(input_dev);
         memcpy(keypad->matrix_key_state, new_state, sizeof(new_state));
 }
 
@@ -252,13 +264,15 @@ static void report_rotary_event(struct pxa27x_keypad *keypad, int r, int delta)
         if (delta == 0)
                 return;
 
-        if (keypad->rotary_up_key[r] && keypad->rotary_down_key[r]) {
-                int keycode = (delta > 0) ? keypad->rotary_up_key[r] :
-                                            keypad->rotary_down_key[r];
+        if (keypad->rotary_rel_code[r] == -1) {
+                int code = MAX_MATRIX_KEY_NUM + 2 * r + (delta > 0 ? 0 : 1);
+                unsigned char keycode = keypad->keycodes[code];
 
                 /* simulate a press-n-release */
+                input_event(dev, EV_MSC, MSC_SCAN, code);
                 input_report_key(dev, keycode, 1);
                 input_sync(dev);
+                input_event(dev, EV_MSC, MSC_SCAN, code);
                 input_report_key(dev, keycode, 0);
                 input_sync(dev);
         } else {
@@ -286,6 +300,7 @@ static void pxa27x_keypad_scan_rotary(struct pxa27x_keypad *keypad)
 static void pxa27x_keypad_scan_direct(struct pxa27x_keypad *keypad)
 {
         struct pxa27x_keypad_platform_data *pdata = keypad->pdata;
+        struct input_dev *input_dev = keypad->input_dev;
         unsigned int new_state;
         uint32_t kpdk, bits_changed;
         int i;
@@ -295,9 +310,6 @@ static void pxa27x_keypad_scan_direct(struct pxa27x_keypad *keypad)
         if (pdata->enable_rotary0 || pdata->enable_rotary1)
                 pxa27x_keypad_scan_rotary(keypad);
 
-        if (pdata->direct_key_map == NULL)
-                return;
-
         new_state = KPDK_DK(kpdk) & keypad->direct_key_mask;
         bits_changed = keypad->direct_key_state ^ new_state;
 
@@ -305,12 +317,15 @@ static void pxa27x_keypad_scan_direct(struct pxa27x_keypad *keypad)
                 return;
 
         for (i = 0; i < pdata->direct_key_num; i++) {
-                if (bits_changed & (1 << i))
-                        input_report_key(keypad->input_dev,
-                                        pdata->direct_key_map[i],
-                                        (new_state & (1 << i)));
+                if (bits_changed & (1 << i)) {
+                        int code = MAX_MATRIX_KEY_NUM + i;
+
+                        input_event(input_dev, EV_MSC, MSC_SCAN, code);
+                        input_report_key(input_dev, keypad->keycodes[code],
+                                         new_state & (1 << i));
+                }
         }
-        input_sync(keypad->input_dev);
+        input_sync(input_dev);
         keypad->direct_key_state = new_state;
 }
 
@@ -388,8 +403,9 @@ static void pxa27x_keypad_close(struct input_dev *dev)
 }
 
 #ifdef CONFIG_PM
-static int pxa27x_keypad_suspend(struct platform_device *pdev, pm_message_t state)
+static int pxa27x_keypad_suspend(struct device *dev)
 {
+        struct platform_device *pdev = to_platform_device(dev);
         struct pxa27x_keypad *keypad = platform_get_drvdata(pdev);
 
         clk_disable(keypad->clk);
@@ -400,8 +416,9 @@ static int pxa27x_keypad_suspend(struct platform_device *pdev, pm_message_t stat
         return 0;
 }
 
-static int pxa27x_keypad_resume(struct platform_device *pdev)
+static int pxa27x_keypad_resume(struct device *dev)
 {
+        struct platform_device *pdev = to_platform_device(dev);
         struct pxa27x_keypad *keypad = platform_get_drvdata(pdev);
         struct input_dev *input_dev = keypad->input_dev;
 
@@ -420,55 +437,58 @@ static int pxa27x_keypad_resume(struct platform_device *pdev)
 
         return 0;
 }
-#else
-#define pxa27x_keypad_suspend   NULL
-#define pxa27x_keypad_resume    NULL
-#endif
 
-#define res_size(res)   ((res)->end - (res)->start + 1)
+static const struct dev_pm_ops pxa27x_keypad_pm_ops = {
+        .suspend        = pxa27x_keypad_suspend,
+        .resume         = pxa27x_keypad_resume,
+};
+#endif
 
 static int __devinit pxa27x_keypad_probe(struct platform_device *pdev)
 {
+        struct pxa27x_keypad_platform_data *pdata = pdev->dev.platform_data;
         struct pxa27x_keypad *keypad;
         struct input_dev *input_dev;
         struct resource *res;
         int irq, error;
 
-        keypad = kzalloc(sizeof(struct pxa27x_keypad), GFP_KERNEL);
-        if (keypad == NULL) {
-                dev_err(&pdev->dev, "failed to allocate driver data\n");
-                return -ENOMEM;
-        }
-
-        keypad->pdata = pdev->dev.platform_data;
-        if (keypad->pdata == NULL) {
+        if (pdata == NULL) {
                 dev_err(&pdev->dev, "no platform data defined\n");
-                error = -EINVAL;
-                goto failed_free;
+                return -EINVAL;
         }
 
         irq = platform_get_irq(pdev, 0);
         if (irq < 0) {
                 dev_err(&pdev->dev, "failed to get keypad irq\n");
-                error = -ENXIO;
-                goto failed_free;
+                return -ENXIO;
         }
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (res == NULL) {
                 dev_err(&pdev->dev, "failed to get I/O memory\n");
-                error = -ENXIO;
+                return -ENXIO;
+        }
+
+        keypad = kzalloc(sizeof(struct pxa27x_keypad), GFP_KERNEL);
+        input_dev = input_allocate_device();
+        if (!keypad || !input_dev) {
+                dev_err(&pdev->dev, "failed to allocate memory\n");
+                error = -ENOMEM;
                 goto failed_free;
         }
 
-        res = request_mem_region(res->start, res_size(res), pdev->name);
+        keypad->pdata = pdata;
+        keypad->input_dev = input_dev;
+        keypad->irq = irq;
+
+        res = request_mem_region(res->start, resource_size(res), pdev->name);
         if (res == NULL) {
                 dev_err(&pdev->dev, "failed to request I/O memory\n");
                 error = -EBUSY;
                 goto failed_free;
         }
 
-        keypad->mmio_base = ioremap(res->start, res_size(res));
+        keypad->mmio_base = ioremap(res->start, resource_size(res));
         if (keypad->mmio_base == NULL) {
                 dev_err(&pdev->dev, "failed to remap I/O memory\n");
                 error = -ENXIO;
@@ -482,43 +502,35 @@ static int __devinit pxa27x_keypad_probe(struct platform_device *pdev)
                 goto failed_free_io;
         }
 
-        /* Create and register the input driver. */
-        input_dev = input_allocate_device();
-        if (!input_dev) {
-                dev_err(&pdev->dev, "failed to allocate input device\n");
-                error = -ENOMEM;
-                goto failed_put_clk;
-        }
-
         input_dev->name = pdev->name;
         input_dev->id.bustype = BUS_HOST;
         input_dev->open = pxa27x_keypad_open;
         input_dev->close = pxa27x_keypad_close;
         input_dev->dev.parent = &pdev->dev;
 
-        keypad->input_dev = input_dev;
+        input_dev->keycode = keypad->keycodes;
+        input_dev->keycodesize = sizeof(keypad->keycodes[0]);
+        input_dev->keycodemax = ARRAY_SIZE(keypad->keycodes);
+
         input_set_drvdata(input_dev, keypad);
 
         input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
-        if ((keypad->pdata->enable_rotary0 &&
-                        keypad->pdata->rotary0_rel_code) ||
-            (keypad->pdata->enable_rotary1 &&
-                        keypad->pdata->rotary1_rel_code)) {
-                input_dev->evbit[0] |= BIT_MASK(EV_REL);
-        }
+        input_set_capability(input_dev, EV_MSC, MSC_SCAN);
 
         pxa27x_keypad_build_keycode(keypad);
-        platform_set_drvdata(pdev, keypad);
+
+        if ((pdata->enable_rotary0 && keypad->rotary_rel_code[0] != -1) ||
+            (pdata->enable_rotary1 && keypad->rotary_rel_code[1] != -1)) {
+                input_dev->evbit[0] |= BIT_MASK(EV_REL);
+        }
 
         error = request_irq(irq, pxa27x_keypad_irq_handler, IRQF_DISABLED,
                             pdev->name, keypad);
         if (error) {
                 dev_err(&pdev->dev, "failed to request IRQ\n");
-                goto failed_free_dev;
+                goto failed_put_clk;
         }
 
-        keypad->irq = irq;
-
         /* Register the input device */
         error = input_register_device(input_dev);
         if (error) {
@@ -526,22 +538,21 @@ static int __devinit pxa27x_keypad_probe(struct platform_device *pdev)
                 goto failed_free_irq;
         }
 
+        platform_set_drvdata(pdev, keypad);
         device_init_wakeup(&pdev->dev, 1);
 
         return 0;
 
 failed_free_irq:
         free_irq(irq, pdev);
-        platform_set_drvdata(pdev, NULL);
-failed_free_dev:
-        input_free_device(input_dev);
 failed_put_clk:
         clk_put(keypad->clk);
 failed_free_io:
         iounmap(keypad->mmio_base);
 failed_free_mem:
-        release_mem_region(res->start, res_size(res));
+        release_mem_region(res->start, resource_size(res));
 failed_free:
+        input_free_device(input_dev);
         kfree(keypad);
         return error;
 }
@@ -552,8 +563,6 @@ static int __devexit pxa27x_keypad_remove(struct platform_device *pdev)
         struct resource *res;
 
         free_irq(keypad->irq, pdev);
-
-        clk_disable(keypad->clk);
         clk_put(keypad->clk);
 
         input_unregister_device(keypad->input_dev);
@@ -562,10 +571,11 @@ static int __devexit pxa27x_keypad_remove(struct platform_device *pdev)
         iounmap(keypad->mmio_base);
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(res->start, res_size(res));
+        release_mem_region(res->start, resource_size(res));
 
         platform_set_drvdata(pdev, NULL);
         kfree(keypad);
+
         return 0;
 }
 
@@ -575,11 +585,12 @@ MODULE_ALIAS("platform:pxa27x-keypad");
 static struct platform_driver pxa27x_keypad_driver = {
         .probe          = pxa27x_keypad_probe,
         .remove         = __devexit_p(pxa27x_keypad_remove),
-        .suspend        = pxa27x_keypad_suspend,
-        .resume         = pxa27x_keypad_resume,
         .driver         = {
                 .name   = "pxa27x-keypad",
                 .owner  = THIS_MODULE,
+#ifdef CONFIG_PM
+                .pm     = &pxa27x_keypad_pm_ops,
+#endif
         },
 };