5 files changed, 234 insertions, 29 deletions

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index b49e23379723..b99b8cbde02f 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -22,6 +22,16 @@ config INPUT_88PM860X_ONKEY
           To compile this driver as a module, choose M here: the module
           will be called 88pm860x_onkey.
 
+config INPUT_AB8500_PONKEY
+        tristate "AB8500 Pon (PowerOn) Key"
+        depends on AB8500_CORE
+        help
+          Say Y here to use the PowerOn Key for ST-Ericsson's AB8500
+          Mix-Sig PMIC.
+
+          To compile this driver as a module, choose M here: the module
+          will be called ab8500-ponkey.
+
 config INPUT_AD714X
         tristate "Analog Devices AD714x Capacitance Touch Sensor"
         help
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index 19ccca78fa76..1fe1f6c8b737 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -5,6 +5,7 @@
 # Each configuration option enables a list of files.
 
 obj-$(CONFIG_INPUT_88PM860X_ONKEY)      += 88pm860x_onkey.o
+obj-$(CONFIG_INPUT_AB8500_PONKEY)       += ab8500-ponkey.o
 obj-$(CONFIG_INPUT_AD714X)              += ad714x.o
 obj-$(CONFIG_INPUT_AD714X_I2C)          += ad714x-i2c.o
 obj-$(CONFIG_INPUT_AD714X_SPI)          += ad714x-spi.o
diff --git a/drivers/input/misc/ab8500-ponkey.c b/drivers/input/misc/ab8500-ponkey.c
new file mode 100644
index 000000000000..3d3288a78fdc
--- /dev/null
+++ b/drivers/input/misc/ab8500-ponkey.c
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2010
+ *
+ * License Terms: GNU General Public License v2
+ * Author: Sundar Iyer <sundar.iyer@stericsson.com> for ST-Ericsson
+ *
+ * AB8500 Power-On Key handler
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/mfd/ab8500.h>
+#include <linux/slab.h>
+
+/**
+ * struct ab8500_ponkey - ab8500 ponkey information
+ * @input_dev: pointer to input device
+ * @ab8500: ab8500 parent
+ * @irq_dbf: irq number for falling transition
+ * @irq_dbr: irq number for rising transition
+ */
+struct ab8500_ponkey {
+        struct input_dev        *idev;
+        struct ab8500           *ab8500;
+        int                     irq_dbf;
+        int                     irq_dbr;
+};
+
+/* AB8500 gives us an interrupt when ONKEY is held */
+static irqreturn_t ab8500_ponkey_handler(int irq, void *data)
+{
+        struct ab8500_ponkey *ponkey = data;
+
+        if (irq == ponkey->irq_dbf)
+                input_report_key(ponkey->idev, KEY_POWER, true);
+        else if (irq == ponkey->irq_dbr)
+                input_report_key(ponkey->idev, KEY_POWER, false);
+
+        input_sync(ponkey->idev);
+
+        return IRQ_HANDLED;
+}
+
+static int __devinit ab8500_ponkey_probe(struct platform_device *pdev)
+{
+        struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent);
+        struct ab8500_ponkey *ponkey;
+        struct input_dev *input;
+        int irq_dbf, irq_dbr;
+        int error;
+
+        irq_dbf = platform_get_irq_byname(pdev, "ONKEY_DBF");
+        if (irq_dbf < 0) {
+                dev_err(&pdev->dev, "No IRQ for ONKEY_DBF, error=%d\n", irq_dbf);
+                return irq_dbf;
+        }
+
+        irq_dbr = platform_get_irq_byname(pdev, "ONKEY_DBR");
+        if (irq_dbr < 0) {
+                dev_err(&pdev->dev, "No IRQ for ONKEY_DBR, error=%d\n", irq_dbr);
+                return irq_dbr;
+        }
+
+        ponkey = kzalloc(sizeof(struct ab8500_ponkey), GFP_KERNEL);
+        input = input_allocate_device();
+        if (!ponkey || !input) {
+                error = -ENOMEM;
+                goto err_free_mem;
+        }
+
+        ponkey->idev = input;
+        ponkey->ab8500 = ab8500;
+        ponkey->irq_dbf = irq_dbf;
+        ponkey->irq_dbr = irq_dbr;
+
+        input->name = "AB8500 POn(PowerOn) Key";
+        input->dev.parent = &pdev->dev;
+
+        input_set_capability(input, EV_KEY, KEY_POWER);
+
+        error = request_any_context_irq(ponkey->irq_dbf, ab8500_ponkey_handler,
+                                        0, "ab8500-ponkey-dbf", ponkey);
+        if (error < 0) {
+                dev_err(ab8500->dev, "Failed to request dbf IRQ#%d: %d\n",
+                        ponkey->irq_dbf, error);
+                goto err_free_mem;
+        }
+
+        error = request_any_context_irq(ponkey->irq_dbr, ab8500_ponkey_handler,
+                                        0, "ab8500-ponkey-dbr", ponkey);
+        if (error < 0) {
+                dev_err(ab8500->dev, "Failed to request dbr IRQ#%d: %d\n",
+                        ponkey->irq_dbr, error);
+                goto err_free_dbf_irq;
+        }
+
+        error = input_register_device(ponkey->idev);
+        if (error) {
+                dev_err(ab8500->dev, "Can't register input device: %d\n", error);
+                goto err_free_dbr_irq;
+        }
+
+        platform_set_drvdata(pdev, ponkey);
+        return 0;
+
+err_free_dbr_irq:
+        free_irq(ponkey->irq_dbr, ponkey);
+err_free_dbf_irq:
+        free_irq(ponkey->irq_dbf, ponkey);
+err_free_mem:
+        input_free_device(input);
+        kfree(ponkey);
+
+        return error;
+}
+
+static int __devexit ab8500_ponkey_remove(struct platform_device *pdev)
+{
+        struct ab8500_ponkey *ponkey = platform_get_drvdata(pdev);
+
+        free_irq(ponkey->irq_dbf, ponkey);
+        free_irq(ponkey->irq_dbr, ponkey);
+        input_unregister_device(ponkey->idev);
+        kfree(ponkey);
+
+        platform_set_drvdata(pdev, NULL);
+
+        return 0;
+}
+
+static struct platform_driver ab8500_ponkey_driver = {
+        .driver         = {
+                .name   = "ab8500-poweron-key",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = ab8500_ponkey_probe,
+        .remove         = __devexit_p(ab8500_ponkey_remove),
+};
+
+static int __init ab8500_ponkey_init(void)
+{
+        return platform_driver_register(&ab8500_ponkey_driver);
+}
+module_init(ab8500_ponkey_init);
+
+static void __exit ab8500_ponkey_exit(void)
+{
+        platform_driver_unregister(&ab8500_ponkey_driver);
+}
+module_exit(ab8500_ponkey_exit);
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Sundar Iyer <sundar.iyer@stericsson.com>");
+MODULE_DESCRIPTION("ST-Ericsson AB8500 Power-ON(Pon) Key driver");
diff --git a/drivers/input/misc/ati_remote2.c b/drivers/input/misc/ati_remote2.c
index 23257652b8e8..0b0e9be63542 100644
--- a/drivers/input/misc/ati_remote2.c
+++ b/drivers/input/misc/ati_remote2.c
@@ -483,51 +483,88 @@ static void ati_remote2_complete_key(struct urb *urb)
 }
 
 static int ati_remote2_getkeycode(struct input_dev *idev,
-                                  unsigned int scancode, unsigned int *keycode)
+                                  struct input_keymap_entry *ke)
 {
         struct ati_remote2 *ar2 = input_get_drvdata(idev);
         unsigned int mode;
-        int index;
+        int offset;
+        unsigned int index;
+        unsigned int scancode;
+
+        if (ke->flags & INPUT_KEYMAP_BY_INDEX) {
+                index = ke->index;
+                if (index >= ATI_REMOTE2_MODES *
+                                ARRAY_SIZE(ati_remote2_key_table))
+                        return -EINVAL;
+
+                mode = ke->index / ARRAY_SIZE(ati_remote2_key_table);
+                offset = ke->index % ARRAY_SIZE(ati_remote2_key_table);
+                scancode = (mode << 8) + ati_remote2_key_table[offset].hw_code;
+        } else {
+                if (input_scancode_to_scalar(ke, &scancode))
+                        return -EINVAL;
+
+                mode = scancode >> 8;
+                if (mode > ATI_REMOTE2_PC)
+                        return -EINVAL;
+
+                offset = ati_remote2_lookup(scancode & 0xff);
+                if (offset < 0)
+                        return -EINVAL;
+
+                index = mode * ARRAY_SIZE(ati_remote2_key_table) + offset;
+        }
 
-        mode = scancode >> 8;
-        if (mode > ATI_REMOTE2_PC || !((1 << mode) & ar2->mode_mask))
-                return -EINVAL;
+        ke->keycode = ar2->keycode[mode][offset];
+        ke->len = sizeof(scancode);
+        memcpy(&ke->scancode, &scancode, sizeof(scancode));
+        ke->index = index;
 
-        index = ati_remote2_lookup(scancode & 0xFF);
-        if (index < 0)
-                return -EINVAL;
-
-        *keycode = ar2->keycode[mode][index];
         return 0;
 }
 
 static int ati_remote2_setkeycode(struct input_dev *idev,
-                                  unsigned int scancode, unsigned int keycode)
+                                  const struct input_keymap_entry *ke,
+                                  unsigned int *old_keycode)
 {
         struct ati_remote2 *ar2 = input_get_drvdata(idev);
-        unsigned int mode, old_keycode;
-        int index;
-
-        mode = scancode >> 8;
-        if (mode > ATI_REMOTE2_PC || !((1 << mode) & ar2->mode_mask))
-                return -EINVAL;
-
-        index = ati_remote2_lookup(scancode & 0xFF);
-        if (index < 0)
-                return -EINVAL;
+        unsigned int mode;
+        int offset;
+        unsigned int index;
+        unsigned int scancode;
+
+        if (ke->flags & INPUT_KEYMAP_BY_INDEX) {
+                if (ke->index >= ATI_REMOTE2_MODES *
+                                ARRAY_SIZE(ati_remote2_key_table))
+                        return -EINVAL;
+
+                mode = ke->index / ARRAY_SIZE(ati_remote2_key_table);
+                offset = ke->index % ARRAY_SIZE(ati_remote2_key_table);
+        } else {
+                if (input_scancode_to_scalar(ke, &scancode))
+                        return -EINVAL;
+
+                mode = scancode >> 8;
+                if (mode > ATI_REMOTE2_PC)
+                        return -EINVAL;
+
+                offset = ati_remote2_lookup(scancode & 0xff);
+                if (offset < 0)
+                        return -EINVAL;
+        }
 
-        old_keycode = ar2->keycode[mode][index];
-        ar2->keycode[mode][index] = keycode;
-        __set_bit(keycode, idev->keybit);
+        *old_keycode = ar2->keycode[mode][offset];
+        ar2->keycode[mode][offset] = ke->keycode;
+        __set_bit(ke->keycode, idev->keybit);
 
         for (mode = 0; mode < ATI_REMOTE2_MODES; mode++) {
                 for (index = 0; index < ARRAY_SIZE(ati_remote2_key_table); index++) {
-                        if (ar2->keycode[mode][index] == old_keycode)
+                        if (ar2->keycode[mode][index] == *old_keycode)
                                 return 0;
                 }
         }
 
-        __clear_bit(old_keycode, idev->keybit);
+        __clear_bit(*old_keycode, idev->keybit);
 
         return 0;
 }
@@ -575,8 +612,8 @@ static int ati_remote2_input_init(struct ati_remote2 *ar2)
         idev->open = ati_remote2_open;
         idev->close = ati_remote2_close;
 
-        idev->getkeycode = ati_remote2_getkeycode;
-        idev->setkeycode = ati_remote2_setkeycode;
+        idev->getkeycode_new = ati_remote2_getkeycode;
+        idev->setkeycode_new = ati_remote2_setkeycode;
 
         idev->name = ar2->name;
         idev->phys = ar2->phys;
diff --git a/drivers/input/misc/powermate.c b/drivers/input/misc/powermate.c
index bf170f6b4422..f45947190e4f 100644
--- a/drivers/input/misc/powermate.c
+++ b/drivers/input/misc/powermate.c
@@ -280,7 +280,7 @@ static int powermate_alloc_buffers(struct usb_device *udev, struct powermate_dev
 
         pm->configcr = kmalloc(sizeof(*(pm->configcr)), GFP_KERNEL);
         if (!pm->configcr)
-                return -1;
+                return -ENOMEM;
 
         return 0;
 }