Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull more input updates from Dmitry Torokhov:
 "The second round of updates for the input subsystem.

  Updates to ALPS an bfin_roraty drivers and a couple oother fixups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: psmouse - use IS_ENABLED instead of homegrown code
  Input: bfin_rotary - introduce open and close methods
  Input: bfin_rotary - convert to use managed resources
  Input: bfin_rotary - use generic IO functions
  Input: bfin_rotary - move pin lists into into platform data
  Input: bfin_rotary - move platform header to linux/platform_data
  Input: bfin_rotary - mark suspend and resume code as __maybe_unused
  Input: bfin_rotary - fix potential oops in interrupt handler
  Input: ALPS - move v7 packet info to Documentation and v6 packet info
  Input: ALPS - fix confusing comment in protocol data
  Input: ALPS - do not mix trackstick and external PS/2 mouse data
  Input: ALPS - fix trackstick detection on some Dell Latitudes
  Input: ALPS - consolidate setting protocol parameters
  Input: ALPS - split protocol data from model info
  Input: ALPS - make Rushmore a separate protocol
  Input: ALPS - renumber protocol numbers
  Input: adi - remove an unnecessary check
  Input: pxa27x_keypad - remove an unneeded NULL check
  Input: soc_button_array - use "Windows" key for "Home"

2 files changed, 118 insertions, 92 deletions

diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c
index 3f4351579372..a0fc18fdfc0c 100644
--- a/drivers/input/misc/bfin_rotary.c
+++ b/drivers/input/misc/bfin_rotary.c
@@ -7,29 +7,37 @@
 
 #include <linux/module.h>
 #include <linux/interrupt.h>
+#include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/pm.h>
 #include <linux/platform_device.h>
 #include <linux/input.h>
 #include <linux/slab.h>
+#include <linux/platform_data/bfin_rotary.h>
 
 #include <asm/portmux.h>
-#include <asm/bfin_rotary.h>
 
-static const u16 per_cnt[] = {
-        P_CNT_CUD,
-        P_CNT_CDG,
-        P_CNT_CZM,
-        0
-};
+#define CNT_CONFIG_OFF          0       /* CNT Config Offset */
+#define CNT_IMASK_OFF           4       /* CNT Interrupt Mask Offset */
+#define CNT_STATUS_OFF          8       /* CNT Status Offset */
+#define CNT_COMMAND_OFF         12      /* CNT Command Offset */
+#define CNT_DEBOUNCE_OFF        16      /* CNT Debounce Offset */
+#define CNT_COUNTER_OFF         20      /* CNT Counter Offset */
+#define CNT_MAX_OFF             24      /* CNT Maximum Count Offset */
+#define CNT_MIN_OFF             28      /* CNT Minimum Count Offset */
 
 struct bfin_rot {
         struct input_dev *input;
+        void __iomem *base;
         int irq;
         unsigned int up_key;
         unsigned int down_key;
         unsigned int button_key;
         unsigned int rel_code;
+
+        unsigned short mode;
+        unsigned short debounce;
+
         unsigned short cnt_config;
         unsigned short cnt_imask;
         unsigned short cnt_debounce;
@@ -59,18 +67,17 @@ static void report_rotary_event(struct bfin_rot *rotary, int delta)
 
 static irqreturn_t bfin_rotary_isr(int irq, void *dev_id)
 {
-        struct platform_device *pdev = dev_id;
-        struct bfin_rot *rotary = platform_get_drvdata(pdev);
+        struct bfin_rot *rotary = dev_id;
         int delta;
 
-        switch (bfin_read_CNT_STATUS()) {
+        switch (readw(rotary->base + CNT_STATUS_OFF)) {
 
         case ICII:
                 break;
 
         case UCII:
         case DCII:
-                delta = bfin_read_CNT_COUNTER();
+                delta = readl(rotary->base + CNT_COUNTER_OFF);
                 if (delta)
                         report_rotary_event(rotary, delta);
                 break;
@@ -83,16 +90,52 @@ static irqreturn_t bfin_rotary_isr(int irq, void *dev_id)
                 break;
         }
 
-        bfin_write_CNT_COMMAND(W1LCNT_ZERO);    /* Clear COUNTER */
-        bfin_write_CNT_STATUS(-1);      /* Clear STATUS */
+        writew(W1LCNT_ZERO, rotary->base + CNT_COMMAND_OFF); /* Clear COUNTER */
+        writew(-1, rotary->base + CNT_STATUS_OFF); /* Clear STATUS */
 
         return IRQ_HANDLED;
 }
 
+static int bfin_rotary_open(struct input_dev *input)
+{
+        struct bfin_rot *rotary = input_get_drvdata(input);
+        unsigned short val;
+
+        if (rotary->mode & ROT_DEBE)
+                writew(rotary->debounce & DPRESCALE,
+                        rotary->base + CNT_DEBOUNCE_OFF);
+
+        writew(rotary->mode & ~CNTE, rotary->base + CNT_CONFIG_OFF);
+
+        val = UCIE | DCIE;
+        if (rotary->button_key)
+                val |= CZMIE;
+        writew(val, rotary->base + CNT_IMASK_OFF);
+
+        writew(rotary->mode | CNTE, rotary->base + CNT_CONFIG_OFF);
+
+        return 0;
+}
+
+static void bfin_rotary_close(struct input_dev *input)
+{
+        struct bfin_rot *rotary = input_get_drvdata(input);
+
+        writew(0, rotary->base + CNT_CONFIG_OFF);
+        writew(0, rotary->base + CNT_IMASK_OFF);
+}
+
+static void bfin_rotary_free_action(void *data)
+{
+        peripheral_free_list(data);
+}
+
 static int bfin_rotary_probe(struct platform_device *pdev)
 {
-        struct bfin_rotary_platform_data *pdata = dev_get_platdata(&pdev->dev);
+        struct device *dev = &pdev->dev;
+        const struct bfin_rotary_platform_data *pdata = dev_get_platdata(dev);
         struct bfin_rot *rotary;
+        struct resource *res;
         struct input_dev *input;
         int error;
 
@@ -102,18 +145,37 @@ static int bfin_rotary_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
-        error = peripheral_request_list(per_cnt, dev_name(&pdev->dev));
-        if (error) {
-                dev_err(&pdev->dev, "requesting peripherals failed\n");
-                return error;
+        if (pdata->pin_list) {
+                error = peripheral_request_list(pdata->pin_list,
+                                                dev_name(&pdev->dev));
+                if (error) {
+                        dev_err(dev, "requesting peripherals failed: %d\n",
+                                error);
+                        return error;
+                }
+
+                error = devm_add_action(dev, bfin_rotary_free_action,
+                                        pdata->pin_list);
+                if (error) {
+                        dev_err(dev, "setting cleanup action failed: %d\n",
+                                error);
+                        peripheral_free_list(pdata->pin_list);
+                        return error;
+                }
         }
 
-        rotary = kzalloc(sizeof(struct bfin_rot), GFP_KERNEL);
-        input = input_allocate_device();
-        if (!rotary || !input) {
-                error = -ENOMEM;
-                goto out1;
-        }
+        rotary = devm_kzalloc(dev, sizeof(struct bfin_rot), GFP_KERNEL);
+        if (!rotary)
+                return -ENOMEM;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        rotary->base = devm_ioremap_resource(dev, res);
+        if (IS_ERR(rotary->base))
+                return PTR_ERR(rotary->base);
+
+        input = devm_input_allocate_device(dev);
+        if (!input)
+                return -ENOMEM;
 
         rotary->input = input;
 
@@ -122,9 +184,8 @@ static int bfin_rotary_probe(struct platform_device *pdev)
         rotary->button_key = pdata->rotary_button_key;
         rotary->rel_code = pdata->rotary_rel_code;
 
-        error = rotary->irq = platform_get_irq(pdev, 0);
-        if (error < 0)
-                goto out1;
+        rotary->mode = pdata->mode;
+        rotary->debounce = pdata->debounce;
 
         input->name = pdev->name;
         input->phys = "bfin-rotary/input0";
@@ -137,6 +198,9 @@ static int bfin_rotary_probe(struct platform_device *pdev)
         input->id.product = 0x0001;
         input->id.version = 0x0100;
 
+        input->open = bfin_rotary_open;
+        input->close = bfin_rotary_close;
+
         if (rotary->up_key) {
                 __set_bit(EV_KEY, input->evbit);
                 __set_bit(rotary->up_key, input->keybit);
@@ -151,75 +215,43 @@ static int bfin_rotary_probe(struct platform_device *pdev)
                 __set_bit(rotary->button_key, input->keybit);
         }
 
-        error = request_irq(rotary->irq, bfin_rotary_isr,
-                            0, dev_name(&pdev->dev), pdev);
+        /* Quiesce the device before requesting irq */
+        bfin_rotary_close(input);
+
+        rotary->irq = platform_get_irq(pdev, 0);
+        if (rotary->irq < 0) {
+                dev_err(dev, "No rotary IRQ specified\n");
+                return -ENOENT;
+        }
+
+        error = devm_request_irq(dev, rotary->irq, bfin_rotary_isr,
+                                 0, dev_name(dev), rotary);
         if (error) {
-                dev_err(&pdev->dev,
-                        "unable to claim irq %d; error %d\n",
+                dev_err(dev, "unable to claim irq %d; error %d\n",
                         rotary->irq, error);
-                goto out1;
+                return error;
         }
 
         error = input_register_device(input);
         if (error) {
-                dev_err(&pdev->dev,
-                        "unable to register input device (%d)\n", error);
-                goto out2;
+                dev_err(dev, "unable to register input device (%d)\n", error);
+                return error;
         }
 
-        if (pdata->rotary_button_key)
-                bfin_write_CNT_IMASK(CZMIE);
-
-        if (pdata->mode & ROT_DEBE)
-                bfin_write_CNT_DEBOUNCE(pdata->debounce & DPRESCALE);
-
-        if (pdata->mode)
-                bfin_write_CNT_CONFIG(bfin_read_CNT_CONFIG() |
-                                        (pdata->mode & ~CNTE));
-
-        bfin_write_CNT_IMASK(bfin_read_CNT_IMASK() | UCIE | DCIE);
-        bfin_write_CNT_CONFIG(bfin_read_CNT_CONFIG() | CNTE);
-
         platform_set_drvdata(pdev, rotary);
         device_init_wakeup(&pdev->dev, 1);
 
         return 0;
-
-out2:
-        free_irq(rotary->irq, pdev);
-out1:
-        input_free_device(input);
-        kfree(rotary);
-        peripheral_free_list(per_cnt);
-
-        return error;
 }
 
-static int bfin_rotary_remove(struct platform_device *pdev)
-{
-        struct bfin_rot *rotary = platform_get_drvdata(pdev);
-
-        bfin_write_CNT_CONFIG(0);
-        bfin_write_CNT_IMASK(0);
-
-        free_irq(rotary->irq, pdev);
-        input_unregister_device(rotary->input);
-        peripheral_free_list(per_cnt);
-
-        kfree(rotary);
-
-        return 0;
-}
-
-#ifdef CONFIG_PM
-static int bfin_rotary_suspend(struct device *dev)
+static int __maybe_unused bfin_rotary_suspend(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
         struct bfin_rot *rotary = platform_get_drvdata(pdev);
 
-        rotary->cnt_config = bfin_read_CNT_CONFIG();
-        rotary->cnt_imask = bfin_read_CNT_IMASK();
-        rotary->cnt_debounce = bfin_read_CNT_DEBOUNCE();
+        rotary->cnt_config = readw(rotary->base + CNT_CONFIG_OFF);
+        rotary->cnt_imask = readw(rotary->base + CNT_IMASK_OFF);
+        rotary->cnt_debounce = readw(rotary->base + CNT_DEBOUNCE_OFF);
 
         if (device_may_wakeup(&pdev->dev))
                 enable_irq_wake(rotary->irq);
@@ -227,38 +259,32 @@ static int bfin_rotary_suspend(struct device *dev)
         return 0;
 }
 
-static int bfin_rotary_resume(struct device *dev)
+static int __maybe_unused bfin_rotary_resume(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
         struct bfin_rot *rotary = platform_get_drvdata(pdev);
 
-        bfin_write_CNT_DEBOUNCE(rotary->cnt_debounce);
-        bfin_write_CNT_IMASK(rotary->cnt_imask);
-        bfin_write_CNT_CONFIG(rotary->cnt_config & ~CNTE);
+        writew(rotary->cnt_debounce, rotary->base + CNT_DEBOUNCE_OFF);
+        writew(rotary->cnt_imask, rotary->base + CNT_IMASK_OFF);
+        writew(rotary->cnt_config & ~CNTE, rotary->base + CNT_CONFIG_OFF);
 
         if (device_may_wakeup(&pdev->dev))
                 disable_irq_wake(rotary->irq);
 
         if (rotary->cnt_config & CNTE)
-                bfin_write_CNT_CONFIG(rotary->cnt_config);
+                writew(rotary->cnt_config, rotary->base + CNT_CONFIG_OFF);
 
         return 0;
 }
 
-static const struct dev_pm_ops bfin_rotary_pm_ops = {
-        .suspend        = bfin_rotary_suspend,
-        .resume         = bfin_rotary_resume,
-};
-#endif
+static SIMPLE_DEV_PM_OPS(bfin_rotary_pm_ops,
+                         bfin_rotary_suspend, bfin_rotary_resume);
 
 static struct platform_driver bfin_rotary_device_driver = {
         .probe          = bfin_rotary_probe,
-        .remove         = bfin_rotary_remove,
         .driver         = {
                 .name   = "bfin-rotary",
-#ifdef CONFIG_PM
                 .pm     = &bfin_rotary_pm_ops,
-#endif
         },
 };
 module_platform_driver(bfin_rotary_device_driver);
diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
index 79cc0f79896f..e8e010a85484 100644
--- a/drivers/input/misc/soc_button_array.c
+++ b/drivers/input/misc/soc_button_array.c
@@ -195,7 +195,7 @@ static int soc_button_probe(struct platform_device *pdev)
 
 static struct soc_button_info soc_button_PNP0C40[] = {
         { "power", 0, EV_KEY, KEY_POWER, false, true },
-        { "home", 1, EV_KEY, KEY_HOME, false, true },
+        { "home", 1, EV_KEY, KEY_LEFTMETA, false, true },
         { "volume_up", 2, EV_KEY, KEY_VOLUMEUP, true, false },
         { "volume_down", 3, EV_KEY, KEY_VOLUMEDOWN, true, false },
         { "rotation_lock", 4, EV_SW, SW_ROTATE_LOCK, false, false },