Merge commit 'v3.4-rc4' into next

33 files changed, 202 insertions, 98 deletions

diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index cfe78597eb68..4b2e10d5d641 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -341,7 +341,7 @@ static ssize_t evdev_write(struct file *file, const char __user *buffer,
         struct evdev_client *client = file->private_data;
         struct evdev *evdev = client->evdev;
         struct input_event event;
-        int retval;
+        int retval = 0;
 
         if (count < input_event_size())
                 return -EINVAL;
diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
index c351aa421f8f..da739d9d1905 100644
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
@@ -449,7 +449,6 @@ static ssize_t gameport_rebind_driver(struct device *dev, struct device_attribut
         } else if ((drv = driver_find(buf, &gameport_bus)) != NULL) {
                 gameport_disconnect_port(gameport);
                 error = gameport_bind_driver(gameport, to_gameport_driver(drv));
-                put_driver(drv);
         } else {
                 error = -EINVAL;
         }
diff --git a/drivers/input/input-compat.c b/drivers/input/input-compat.c
index e46a86776a6b..64ca7113ff28 100644
--- a/drivers/input/input-compat.c
+++ b/drivers/input/input-compat.c
@@ -17,7 +17,7 @@
 int input_event_from_user(const char __user *buffer,
                           struct input_event *event)
 {
-        if (INPUT_COMPAT_TEST) {
+        if (INPUT_COMPAT_TEST && !COMPAT_USE_64BIT_TIME) {
                 struct input_event_compat compat_event;
 
                 if (copy_from_user(&compat_event, buffer,
@@ -41,7 +41,7 @@ int input_event_from_user(const char __user *buffer,
 int input_event_to_user(char __user *buffer,
                         const struct input_event *event)
 {
-        if (INPUT_COMPAT_TEST) {
+        if (INPUT_COMPAT_TEST && !COMPAT_USE_64BIT_TIME) {
                 struct input_event_compat compat_event;
 
                 compat_event.time.tv_sec = event->time.tv_sec;
diff --git a/drivers/input/input-compat.h b/drivers/input/input-compat.h
index 22be27b424de..148f66fe3205 100644
--- a/drivers/input/input-compat.h
+++ b/drivers/input/input-compat.h
@@ -67,7 +67,7 @@ struct ff_effect_compat {
 
 static inline size_t input_event_size(void)
 {
-        return INPUT_COMPAT_TEST ?
+        return (INPUT_COMPAT_TEST && !COMPAT_USE_64BIT_TIME) ?
                 sizeof(struct input_event_compat) : sizeof(struct input_event);
 }
 
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index c24ec2d5f926..26043cc6a016 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -13,7 +13,6 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <asm/io.h>
-#include <asm/system.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/joystick.h>
diff --git a/drivers/input/joystick/amijoy.c b/drivers/input/joystick/amijoy.c
index 3aa93bf60ae3..c65b5fa69f1e 100644
--- a/drivers/input/joystick/amijoy.c
+++ b/drivers/input/joystick/amijoy.c
@@ -35,7 +35,6 @@
 #include <linux/interrupt.h>
 #include <linux/mutex.h>
 
-#include <asm/system.h>
 #include <asm/amigahw.h>
 #include <asm/amigaints.h>
 
diff --git a/drivers/input/keyboard/jornada720_kbd.c b/drivers/input/keyboard/jornada720_kbd.c
index eeafc30b207b..9d639fa1afbd 100644
--- a/drivers/input/keyboard/jornada720_kbd.c
+++ b/drivers/input/keyboard/jornada720_kbd.c
@@ -27,6 +27,7 @@
 
 #include <mach/jornada720.h>
 #include <mach/hardware.h>
+#include <mach/irqs.h>
 
 MODULE_AUTHOR("Kristoffer Ericson <Kristoffer.Ericson@gmail.com>");
 MODULE_DESCRIPTION("HP Jornada 710/720/728 keyboard driver");
diff --git a/drivers/input/misc/88pm860x_onkey.c b/drivers/input/misc/88pm860x_onkey.c
index f2e0cbc5ab64..f9ce1835e4d7 100644
--- a/drivers/input/misc/88pm860x_onkey.c
+++ b/drivers/input/misc/88pm860x_onkey.c
@@ -105,6 +105,8 @@ static int __devinit pm860x_onkey_probe(struct platform_device *pdev)
         }
 
         platform_set_drvdata(pdev, info);
+        device_init_wakeup(&pdev->dev, 1);
+
         return 0;
 
 out_irq:
@@ -129,10 +131,34 @@ static int __devexit pm860x_onkey_remove(struct platform_device *pdev)
         return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int pm860x_onkey_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);
+
+        if (device_may_wakeup(dev))
+                chip->wakeup_flag |= 1 << PM8607_IRQ_ONKEY;
+        return 0;
+}
+static int pm860x_onkey_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);
+
+        if (device_may_wakeup(dev))
+                chip->wakeup_flag &= ~(1 << PM8607_IRQ_ONKEY);
+        return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(pm860x_onkey_pm_ops, pm860x_onkey_suspend, pm860x_onkey_resume);
+
 static struct platform_driver pm860x_onkey_driver = {
         .driver         = {
                 .name   = "88pm860x-onkey",
                 .owner  = THIS_MODULE,
+                .pm     = &pm860x_onkey_pm_ops,
         },
         .probe          = pm860x_onkey_probe,
         .remove         = __devexit_p(pm860x_onkey_remove),
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index d62827271802..7faf4a7fcaa9 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -380,8 +380,7 @@ config INPUT_TWL4030_VIBRA
 
 config INPUT_TWL6040_VIBRA
         tristate "Support for TWL6040 Vibrator"
-        depends on TWL4030_CORE
-        select TWL6040_CORE
+        depends on TWL6040_CORE
         select INPUT_FF_MEMLESS
         help
           This option enables support for TWL6040 Vibrator Driver.
@@ -580,7 +579,7 @@ config INPUT_CMA3000_I2C
 
 config INPUT_XEN_KBDDEV_FRONTEND
         tristate "Xen virtual keyboard and mouse support"
-        depends on XEN_FBDEV_FRONTEND
+        depends on XEN
         default y
         select XEN_XENBUS_FRONTEND
         help
diff --git a/drivers/input/misc/da9052_onkey.c b/drivers/input/misc/da9052_onkey.c
index 34aebb8cd080..3c843cd725fa 100644
--- a/drivers/input/misc/da9052_onkey.c
+++ b/drivers/input/misc/da9052_onkey.c
@@ -95,7 +95,8 @@ static int __devinit da9052_onkey_probe(struct platform_device *pdev)
         input_dev = input_allocate_device();
         if (!onkey || !input_dev) {
                 dev_err(&pdev->dev, "Failed to allocate memory\n");
-                return -ENOMEM;
+                error = -ENOMEM;
+                goto err_free_mem;
         }
 
         onkey->input = input_dev;
diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c
index 37651373a95b..fc0ed9b43424 100644
--- a/drivers/input/misc/twl4030-vibra.c
+++ b/drivers/input/misc/twl4030-vibra.c
@@ -172,7 +172,7 @@ static void twl4030_vibra_close(struct input_dev *input)
 }
 
 /*** Module ***/
-#if CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int twl4030_vibra_suspend(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
@@ -189,10 +189,10 @@ static int twl4030_vibra_resume(struct device *dev)
         vibra_disable_leds();
         return 0;
 }
+#endif
 
 static SIMPLE_DEV_PM_OPS(twl4030_vibra_pm_ops,
                          twl4030_vibra_suspend, twl4030_vibra_resume);
-#endif
 
 static int __devinit twl4030_vibra_probe(struct platform_device *pdev)
 {
@@ -273,9 +273,7 @@ static struct platform_driver twl4030_vibra_driver = {
         .driver         = {
                 .name   = "twl4030-vibra",
                 .owner  = THIS_MODULE,
-#ifdef CONFIG_PM
                 .pm     = &twl4030_vibra_pm_ops,
-#endif
         },
 };
 module_platform_driver(twl4030_vibra_driver);
diff --git a/drivers/input/misc/twl6040-vibra.c b/drivers/input/misc/twl6040-vibra.c
index 45874fed523a..14e94f56cb7d 100644
--- a/drivers/input/misc/twl6040-vibra.c
+++ b/drivers/input/misc/twl6040-vibra.c
@@ -28,7 +28,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/workqueue.h>
-#include <linux/i2c/twl.h>
+#include <linux/input.h>
 #include <linux/mfd/twl6040.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
@@ -257,7 +257,7 @@ static SIMPLE_DEV_PM_OPS(twl6040_vibra_pm_ops, twl6040_vibra_suspend, NULL);
 
 static int __devinit twl6040_vibra_probe(struct platform_device *pdev)
 {
-        struct twl4030_vibra_data *pdata = pdev->dev.platform_data;
+        struct twl6040_vibra_data *pdata = pdev->dev.platform_data;
         struct vibra_info *info;
         int ret;
 
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index bd87380bd879..4c6a72d3d48c 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -952,7 +952,9 @@ static const struct alps_model_info *alps_get_model(struct psmouse *psmouse, int
 
         /*
          * First try "E6 report".
-         * ALPS should return 0,0,10 or 0,0,100
+         * ALPS should return 0,0,10 or 0,0,100 if no buttons are pressed.
+         * The bits 0-2 of the first byte will be 1s if some buttons are
+         * pressed.
          */
         param[0] = 0;
         if (ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES) ||
@@ -968,7 +970,8 @@ static const struct alps_model_info *alps_get_model(struct psmouse *psmouse, int
         psmouse_dbg(psmouse, "E6 report: %2.2x %2.2x %2.2x",
                     param[0], param[1], param[2]);
 
-        if (param[0] != 0 || param[1] != 0 || (param[2] != 10 && param[2] != 100))
+        if ((param[0] & 0xf8) != 0 || param[1] != 0 ||
+            (param[2] != 10 && param[2] != 100))
                 return NULL;
 
         /*
diff --git a/drivers/input/mouse/amimouse.c b/drivers/input/mouse/amimouse.c
index ff5f61a0fd3a..5fa99341a39d 100644
--- a/drivers/input/mouse/amimouse.c
+++ b/drivers/input/mouse/amimouse.c
@@ -25,7 +25,6 @@
 
 #include <asm/irq.h>
 #include <asm/setup.h>
-#include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/amigahw.h>
 #include <asm/amigaints.h>
diff --git a/drivers/input/mouse/atarimouse.c b/drivers/input/mouse/atarimouse.c
index 5c4a692bf73a..d1c43236b125 100644
--- a/drivers/input/mouse/atarimouse.c
+++ b/drivers/input/mouse/atarimouse.c
@@ -47,7 +47,6 @@
 
 #include <asm/irq.h>
 #include <asm/setup.h>
-#include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/atarihw.h>
 #include <asm/atarikb.h>
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index d2c0db159b18..479011004a11 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -486,7 +486,6 @@ static void elantech_input_sync_v4(struct psmouse *psmouse)
         unsigned char *packet = psmouse->packet;
 
         input_report_key(dev, BTN_LEFT, packet[0] & 0x01);
-        input_report_key(dev, BTN_RIGHT, packet[0] & 0x02);
         input_mt_report_pointer_emulation(dev, true);
         input_sync(dev);
 }
@@ -967,6 +966,7 @@ static int elantech_set_input_params(struct psmouse *psmouse)
         if (elantech_set_range(psmouse, &x_min, &y_min, &x_max, &y_max, &width))
                 return -1;
 
+        __set_bit(INPUT_PROP_POINTER, dev->propbit);
         __set_bit(EV_KEY, dev->evbit);
         __set_bit(EV_ABS, dev->evbit);
         __clear_bit(EV_REL, dev->evbit);
@@ -1017,7 +1017,9 @@ static int elantech_set_input_params(struct psmouse *psmouse)
                          */
                         psmouse_warn(psmouse, "couldn't query resolution data.\n");
                 }
-
+                /* v4 is clickpad, with only one button. */
+                __set_bit(INPUT_PROP_BUTTONPAD, dev->propbit);
+                __clear_bit(BTN_RIGHT, dev->keybit);
                 __set_bit(BTN_TOOL_QUADTAP, dev->keybit);
                 /* For X to recognize me as touchpad. */
                 input_set_abs_params(dev, ABS_X, x_min, x_max, 0, 0);
@@ -1245,6 +1247,8 @@ static void elantech_disconnect(struct psmouse *psmouse)
  */
 static int elantech_reconnect(struct psmouse *psmouse)
 {
+        psmouse_reset(psmouse);
+
         if (elantech_detect(psmouse, 0))
                 return -1;
 
@@ -1324,6 +1328,8 @@ int elantech_init(struct psmouse *psmouse)
         if (!etd)
                 return -ENOMEM;
 
+        psmouse_reset(psmouse);
+
         etd->parity[0] = 1;
         for (i = 1; i < 256; i++)
                 etd->parity[i] = etd->parity[i & (i - 1)] ^ 1;
diff --git a/drivers/input/mouse/gpio_mouse.c b/drivers/input/mouse/gpio_mouse.c
index a9ad8e1402be..39fe9b737cae 100644
--- a/drivers/input/mouse/gpio_mouse.c
+++ b/drivers/input/mouse/gpio_mouse.c
@@ -12,9 +12,9 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/input-polldev.h>
+#include <linux/gpio.h>
 #include <linux/gpio_mouse.h>
 
-#include <asm/gpio.h>
 
 /*
  * Timer function which is run every scan_ms ms when the device is opened.
diff --git a/drivers/input/mouse/sentelic.c b/drivers/input/mouse/sentelic.c
index a977bfaa6821..661a0ca3b3d6 100644
--- a/drivers/input/mouse/sentelic.c
+++ b/drivers/input/mouse/sentelic.c
@@ -741,6 +741,14 @@ static psmouse_ret_t fsp_process_byte(struct psmouse *psmouse)
                         }
                 } else {
                         /* SFAC packet */
+                        if ((packet[0] & (FSP_PB0_LBTN|FSP_PB0_PHY_BTN)) ==
+                                FSP_PB0_LBTN) {
+                                /* On-pad click in SFAC mode should be handled
+                                 * by userspace.  On-pad clicks in MFMC mode
+                                 * are real clickpad clicks, and not ignored.
+                                 */
+                                packet[0] &= ~FSP_PB0_LBTN;
+                        }
 
                         /* no multi-finger information */
                         ad->last_mt_fgr = 0;
diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c
index 22b218018137..f3102494237d 100644
--- a/drivers/input/mouse/trackpoint.c
+++ b/drivers/input/mouse/trackpoint.c
@@ -304,7 +304,7 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
                 return 0;
 
         if (trackpoint_read(&psmouse->ps2dev, TP_EXT_BTN, &button_info)) {
-                printk(KERN_WARNING "trackpoint.c: failed to get extended button data\n");
+                psmouse_warn(psmouse, "failed to get extended button data\n");
                 button_info = 0;
         }
 
@@ -326,16 +326,18 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
 
         error = sysfs_create_group(&ps2dev->serio->dev.kobj, &trackpoint_attr_group);
         if (error) {
-                printk(KERN_ERR
-                        "trackpoint.c: failed to create sysfs attributes, error: %d\n",
-                        error);
+                psmouse_err(psmouse,
+                            "failed to create sysfs attributes, error: %d\n",
+                            error);
                 kfree(psmouse->private);
                 psmouse->private = NULL;
                 return -1;
         }
 
-        printk(KERN_INFO "IBM TrackPoint firmware: 0x%02x, buttons: %d/%d\n",
-                firmware_id, (button_info & 0xf0) >> 4, button_info & 0x0f);
+        psmouse_info(psmouse,
+                     "IBM TrackPoint firmware: 0x%02x, buttons: %d/%d\n",
+                     firmware_id,
+                     (button_info & 0xf0) >> 4, button_info & 0x0f);
 
         return 0;
 }
diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c
index 8407d5b0ced8..2ffd110bd5bc 100644
--- a/drivers/input/serio/ambakmi.c
+++ b/drivers/input/serio/ambakmi.c
@@ -208,18 +208,7 @@ static struct amba_driver ambakmi_driver = {
         .resume         = amba_kmi_resume,
 };
 
-static int __init amba_kmi_init(void)
-{
-        return amba_driver_register(&ambakmi_driver);
-}
-
-static void __exit amba_kmi_exit(void)
-{
-        amba_driver_unregister(&ambakmi_driver);
-}
-
-module_init(amba_kmi_init);
-module_exit(amba_kmi_exit);
+module_amba_driver(ambakmi_driver);
 
 MODULE_AUTHOR("Russell King <rmk@arm.linux.org.uk>");
 MODULE_DESCRIPTION("AMBA KMI controller driver");
diff --git a/drivers/input/serio/ams_delta_serio.c b/drivers/input/serio/ams_delta_serio.c
index d4d08bd9205b..f5fbdf94de3b 100644
--- a/drivers/input/serio/ams_delta_serio.c
+++ b/drivers/input/serio/ams_delta_serio.c
@@ -92,8 +92,7 @@ static irqreturn_t ams_delta_serio_interrupt(int irq, void *dev_id)
 static int ams_delta_serio_open(struct serio *serio)
 {
         /* enable keyboard */
-        ams_delta_latch2_write(AMD_DELTA_LATCH2_KEYBRD_PWR,
-                        AMD_DELTA_LATCH2_KEYBRD_PWR);
+        gpio_set_value(AMS_DELTA_GPIO_PIN_KEYBRD_PWR, 1);
 
         return 0;
 }
@@ -101,9 +100,32 @@ static int ams_delta_serio_open(struct serio *serio)
 static void ams_delta_serio_close(struct serio *serio)
 {
         /* disable keyboard */
-        ams_delta_latch2_write(AMD_DELTA_LATCH2_KEYBRD_PWR, 0);
+        gpio_set_value(AMS_DELTA_GPIO_PIN_KEYBRD_PWR, 0);
 }
 
+static const struct gpio ams_delta_gpios[] __initconst_or_module = {
+        {
+                .gpio   = AMS_DELTA_GPIO_PIN_KEYBRD_DATA,
+                .flags  = GPIOF_DIR_IN,
+                .label  = "serio-data",
+        },
+        {
+                .gpio   = AMS_DELTA_GPIO_PIN_KEYBRD_CLK,
+                .flags  = GPIOF_DIR_IN,
+                .label  = "serio-clock",
+        },
+        {
+                .gpio   = AMS_DELTA_GPIO_PIN_KEYBRD_PWR,
+                .flags  = GPIOF_OUT_INIT_LOW,
+                .label  = "serio-power",
+        },
+        {
+                .gpio   = AMS_DELTA_GPIO_PIN_KEYBRD_DATAOUT,
+                .flags  = GPIOF_OUT_INIT_LOW,
+                .label  = "serio-dataout",
+        },
+};
+
 static int __init ams_delta_serio_init(void)
 {
         int err;
@@ -123,19 +145,12 @@ static int __init ams_delta_serio_init(void)
         strlcpy(ams_delta_serio->phys, "GPIO/serio0",
                         sizeof(ams_delta_serio->phys));
 
-        err = gpio_request(AMS_DELTA_GPIO_PIN_KEYBRD_DATA, "serio-data");
+        err = gpio_request_array(ams_delta_gpios,
+                                ARRAY_SIZE(ams_delta_gpios));
         if (err) {
-                pr_err("ams_delta_serio: Couldn't request gpio pin for data\n");
+                pr_err("ams_delta_serio: Couldn't request gpio pins\n");
                 goto serio;
         }
-        gpio_direction_input(AMS_DELTA_GPIO_PIN_KEYBRD_DATA);
-
-        err = gpio_request(AMS_DELTA_GPIO_PIN_KEYBRD_CLK, "serio-clock");
-        if (err) {
-                pr_err("ams_delta_serio: couldn't request gpio pin for clock\n");
-                goto gpio_data;
-        }
-        gpio_direction_input(AMS_DELTA_GPIO_PIN_KEYBRD_CLK);
 
         err = request_irq(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK),
                         ams_delta_serio_interrupt, IRQ_TYPE_EDGE_RISING,
@@ -143,7 +158,7 @@ static int __init ams_delta_serio_init(void)
         if (err < 0) {
                 pr_err("ams_delta_serio: couldn't request gpio interrupt %d\n",
                                 gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK));
-                goto gpio_clk;
+                goto gpio;
         }
         /*
          * Since GPIO register handling for keyboard clock pin is performed
@@ -157,10 +172,9 @@ static int __init ams_delta_serio_init(void)
         dev_info(&ams_delta_serio->dev, "%s\n", ams_delta_serio->name);
 
         return 0;
-gpio_clk:
-        gpio_free(AMS_DELTA_GPIO_PIN_KEYBRD_CLK);
-gpio_data:
-        gpio_free(AMS_DELTA_GPIO_PIN_KEYBRD_DATA);
+gpio:
+        gpio_free_array(ams_delta_gpios,
+                        ARRAY_SIZE(ams_delta_gpios));
 serio:
         kfree(ams_delta_serio);
         return err;
@@ -170,8 +184,8 @@ module_init(ams_delta_serio_init);
 static void __exit ams_delta_serio_exit(void)
 {
         serio_unregister_port(ams_delta_serio);
-        free_irq(OMAP_GPIO_IRQ(AMS_DELTA_GPIO_PIN_KEYBRD_CLK), 0);
-        gpio_free(AMS_DELTA_GPIO_PIN_KEYBRD_CLK);
-        gpio_free(AMS_DELTA_GPIO_PIN_KEYBRD_DATA);
+        free_irq(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK), 0);
+        gpio_free_array(ams_delta_gpios,
+                        ARRAY_SIZE(ams_delta_gpios));
 }
 module_exit(ams_delta_serio_exit);
diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c
index be3316073ae7..09a089996ded 100644
--- a/drivers/input/serio/hp_sdc.c
+++ b/drivers/input/serio/hp_sdc.c
@@ -71,7 +71,6 @@
 #include <linux/slab.h>
 #include <linux/hil.h>
 #include <asm/io.h>
-#include <asm/system.h>
 
 /* Machine-specific abstraction */
 
diff --git a/drivers/input/serio/maceps2.c b/drivers/input/serio/maceps2.c
index 558200e96d0f..61da763b1209 100644
--- a/drivers/input/serio/maceps2.c
+++ b/drivers/input/serio/maceps2.c
@@ -21,7 +21,6 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/system.h>
 #include <asm/ip32/mace.h>
 #include <asm/ip32/ip32_ints.h>
 
diff --git a/drivers/input/serio/rpckbd.c b/drivers/input/serio/rpckbd.c
index 8b44ddc8041c..2af5df6a8fba 100644
--- a/drivers/input/serio/rpckbd.c
+++ b/drivers/input/serio/rpckbd.c
@@ -36,16 +36,19 @@
 #include <linux/io.h>
 #include <linux/slab.h>
 
-#include <asm/irq.h>
 #include <mach/hardware.h>
 #include <asm/hardware/iomd.h>
-#include <asm/system.h>
 
 MODULE_AUTHOR("Vojtech Pavlik, Russell King");
 MODULE_DESCRIPTION("Acorn RiscPC PS/2 keyboard controller driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:kart");
 
+struct rpckbd_data {
+        int tx_irq;
+        int rx_irq;
+};
+
 static int rpckbd_write(struct serio *port, unsigned char val)
 {
         while (!(iomd_readb(IOMD_KCTRL) & (1 << 7)))
@@ -78,19 +81,21 @@ static irqreturn_t rpckbd_tx(int irq, void *dev_id)
 
 static int rpckbd_open(struct serio *port)
 {
+        struct rpckbd_data *rpckbd = port->port_data;
+
         /* Reset the keyboard state machine. */
         iomd_writeb(0, IOMD_KCTRL);
         iomd_writeb(8, IOMD_KCTRL);
         iomd_readb(IOMD_KARTRX);
 
-        if (request_irq(IRQ_KEYBOARDRX, rpckbd_rx, 0, "rpckbd", port) != 0) {
+        if (request_irq(rpckbd->rx_irq, rpckbd_rx, 0, "rpckbd", port) != 0) {
                 printk(KERN_ERR "rpckbd.c: Could not allocate keyboard receive IRQ\n");
                 return -EBUSY;
         }
 
-        if (request_irq(IRQ_KEYBOARDTX, rpckbd_tx, 0, "rpckbd", port) != 0) {
+        if (request_irq(rpckbd->tx_irq, rpckbd_tx, 0, "rpckbd", port) != 0) {
                 printk(KERN_ERR "rpckbd.c: Could not allocate keyboard transmit IRQ\n");
-                free_irq(IRQ_KEYBOARDRX, port);
+                free_irq(rpckbd->rx_irq, port);
                 return -EBUSY;
         }
 
@@ -99,8 +104,10 @@ static int rpckbd_open(struct serio *port)
 
 static void rpckbd_close(struct serio *port)
 {
-        free_irq(IRQ_KEYBOARDRX, port);
-        free_irq(IRQ_KEYBOARDTX, port);
+        struct rpckbd_data *rpckbd = port->port_data;
+
+        free_irq(rpckbd->rx_irq, port);
+        free_irq(rpckbd->tx_irq, port);
 }
 
 /*
@@ -109,17 +116,35 @@ static void rpckbd_close(struct serio *port)
  */
 static int __devinit rpckbd_probe(struct platform_device *dev)
 {
+        struct rpckbd_data *rpckbd;
         struct serio *serio;
+        int tx_irq, rx_irq;
+
+        rx_irq = platform_get_irq(dev, 0);
+        if (rx_irq <= 0)
+                return rx_irq < 0 ? rx_irq : -ENXIO;
+
+        tx_irq = platform_get_irq(dev, 1);
+        if (tx_irq <= 0)
+                return tx_irq < 0 ? tx_irq : -ENXIO;
 
         serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
-        if (!serio)
+        rpckbd = kzalloc(sizeof(*rpckbd), GFP_KERNEL);
+        if (!serio || !rpckbd) {
+                kfree(rpckbd);
+                kfree(serio);
                 return -ENOMEM;
+        }
+
+        rpckbd->rx_irq = rx_irq;
+        rpckbd->tx_irq = tx_irq;
 
         serio->id.type          = SERIO_8042;
         serio->write            = rpckbd_write;
         serio->open             = rpckbd_open;
         serio->close            = rpckbd_close;
         serio->dev.parent       = &dev->dev;
+        serio->port_data        = rpckbd;
         strlcpy(serio->name, "RiscPC PS/2 kbd port", sizeof(serio->name));
         strlcpy(serio->phys, "rpckbd/serio0", sizeof(serio->phys));
 
@@ -131,7 +156,11 @@ static int __devinit rpckbd_probe(struct platform_device *dev)
 static int __devexit rpckbd_remove(struct platform_device *dev)
 {
         struct serio *serio = platform_get_drvdata(dev);
+        struct rpckbd_data *rpckbd = serio->port_data;
+
         serio_unregister_port(serio);
+        kfree(rpckbd);
+
         return 0;
 }
 
diff --git a/drivers/input/serio/sa1111ps2.c b/drivers/input/serio/sa1111ps2.c
index 44fc8b4bcd81..389766707534 100644
--- a/drivers/input/serio/sa1111ps2.c
+++ b/drivers/input/serio/sa1111ps2.c
@@ -20,10 +20,29 @@
 #include <linux/spinlock.h>
 
 #include <asm/io.h>
-#include <asm/system.h>
 
 #include <asm/hardware/sa1111.h>
 
+#define PS2CR           0x0000
+#define PS2STAT         0x0004
+#define PS2DATA         0x0008
+#define PS2CLKDIV       0x000c
+#define PS2PRECNT       0x0010
+
+#define PS2CR_ENA       0x08
+#define PS2CR_FKD       0x02
+#define PS2CR_FKC       0x01
+
+#define PS2STAT_STP     0x0100
+#define PS2STAT_TXE     0x0080
+#define PS2STAT_TXB     0x0040
+#define PS2STAT_RXF     0x0020
+#define PS2STAT_RXB     0x0010
+#define PS2STAT_ENA     0x0008
+#define PS2STAT_RXP     0x0004
+#define PS2STAT_KBD     0x0002
+#define PS2STAT_KBC     0x0001
+
 struct ps2if {
         struct serio            *io;
         struct sa1111_dev       *dev;
@@ -45,22 +64,22 @@ static irqreturn_t ps2_rxint(int irq, void *dev_id)
         struct ps2if *ps2if = dev_id;
         unsigned int scancode, flag, status;
 
-        status = sa1111_readl(ps2if->base + SA1111_PS2STAT);
+        status = sa1111_readl(ps2if->base + PS2STAT);
         while (status & PS2STAT_RXF) {
                 if (status & PS2STAT_STP)
-                        sa1111_writel(PS2STAT_STP, ps2if->base + SA1111_PS2STAT);
+                        sa1111_writel(PS2STAT_STP, ps2if->base + PS2STAT);
 
                 flag = (status & PS2STAT_STP ? SERIO_FRAME : 0) |
                        (status & PS2STAT_RXP ? 0 : SERIO_PARITY);
 
-                scancode = sa1111_readl(ps2if->base + SA1111_PS2DATA) & 0xff;
+                scancode = sa1111_readl(ps2if->base + PS2DATA) & 0xff;
 
                 if (hweight8(scancode) & 1)
                         flag ^= SERIO_PARITY;
 
                 serio_interrupt(ps2if->io, scancode, flag);
 
-                status = sa1111_readl(ps2if->base + SA1111_PS2STAT);
+                status = sa1111_readl(ps2if->base + PS2STAT);
         }
 
         return IRQ_HANDLED;
@@ -75,12 +94,12 @@ static irqreturn_t ps2_txint(int irq, void *dev_id)
         unsigned int status;
 
         spin_lock(&ps2if->lock);
-        status = sa1111_readl(ps2if->base + SA1111_PS2STAT);
+        status = sa1111_readl(ps2if->base + PS2STAT);
         if (ps2if->head == ps2if->tail) {
                 disable_irq_nosync(irq);
                 /* done */
         } else if (status & PS2STAT_TXE) {
-                sa1111_writel(ps2if->buf[ps2if->tail], ps2if->base + SA1111_PS2DATA);
+                sa1111_writel(ps2if->buf[ps2if->tail], ps2if->base + PS2DATA);
                 ps2if->tail = (ps2if->tail + 1) & (sizeof(ps2if->buf) - 1);
         }
         spin_unlock(&ps2if->lock);
@@ -103,8 +122,8 @@ static int ps2_write(struct serio *io, unsigned char val)
         /*
          * If the TX register is empty, we can go straight out.
          */
-        if (sa1111_readl(ps2if->base + SA1111_PS2STAT) & PS2STAT_TXE) {
-                sa1111_writel(val, ps2if->base + SA1111_PS2DATA);
+        if (sa1111_readl(ps2if->base + PS2STAT) & PS2STAT_TXE) {
+                sa1111_writel(val, ps2if->base + PS2DATA);
         } else {
                 if (ps2if->head == ps2if->tail)
                         enable_irq(ps2if->dev->irq[1]);
@@ -124,13 +143,16 @@ static int ps2_open(struct serio *io)
         struct ps2if *ps2if = io->port_data;
         int ret;
 
-        sa1111_enable_device(ps2if->dev);
+        ret = sa1111_enable_device(ps2if->dev);
+        if (ret)
+                return ret;
 
         ret = request_irq(ps2if->dev->irq[0], ps2_rxint, 0,
                           SA1111_DRIVER_NAME(ps2if->dev), ps2if);
         if (ret) {
                 printk(KERN_ERR "sa1111ps2: could not allocate IRQ%d: %d\n",
                         ps2if->dev->irq[0], ret);
+                sa1111_disable_device(ps2if->dev);
                 return ret;
         }
 
@@ -140,6 +162,7 @@ static int ps2_open(struct serio *io)
                 printk(KERN_ERR "sa1111ps2: could not allocate IRQ%d: %d\n",
                         ps2if->dev->irq[1], ret);
                 free_irq(ps2if->dev->irq[0], ps2if);
+                sa1111_disable_device(ps2if->dev);
                 return ret;
         }
 
@@ -147,7 +170,7 @@ static int ps2_open(struct serio *io)
 
         enable_irq_wake(ps2if->dev->irq[0]);
 
-        sa1111_writel(PS2CR_ENA, ps2if->base + SA1111_PS2CR);
+        sa1111_writel(PS2CR_ENA, ps2if->base + PS2CR);
         return 0;
 }
 
@@ -155,7 +178,7 @@ static void ps2_close(struct serio *io)
 {
         struct ps2if *ps2if = io->port_data;
 
-        sa1111_writel(0, ps2if->base + SA1111_PS2CR);
+        sa1111_writel(0, ps2if->base + PS2CR);
 
         disable_irq_wake(ps2if->dev->irq[0]);
 
@@ -175,7 +198,7 @@ static void __devinit ps2_clear_input(struct ps2if *ps2if)
         int maxread = 100;
 
         while (maxread--) {
-                if ((sa1111_readl(ps2if->base + SA1111_PS2DATA) & 0xff) == 0xff)
+                if ((sa1111_readl(ps2if->base + PS2DATA) & 0xff) == 0xff)
                         break;
         }
 }
@@ -185,11 +208,11 @@ static unsigned int __devinit ps2_test_one(struct ps2if *ps2if,
 {
         unsigned int val;
 
-        sa1111_writel(PS2CR_ENA | mask, ps2if->base + SA1111_PS2CR);
+        sa1111_writel(PS2CR_ENA | mask, ps2if->base + PS2CR);
 
         udelay(2);
 
-        val = sa1111_readl(ps2if->base + SA1111_PS2STAT);
+        val = sa1111_readl(ps2if->base + PS2STAT);
         return val & (PS2STAT_KBC | PS2STAT_KBD);
 }
 
@@ -220,7 +243,7 @@ static int __devinit ps2_test(struct ps2if *ps2if)
                 ret = -ENODEV;
         }
 
-        sa1111_writel(0, ps2if->base + SA1111_PS2CR);
+        sa1111_writel(0, ps2if->base + PS2CR);
 
         return ret;
 }
@@ -274,8 +297,8 @@ static int __devinit ps2_probe(struct sa1111_dev *dev)
         sa1111_enable_device(ps2if->dev);
 
         /* Incoming clock is 8MHz */
-        sa1111_writel(0, ps2if->base + SA1111_PS2CLKDIV);
-        sa1111_writel(127, ps2if->base + SA1111_PS2PRECNT);
+        sa1111_writel(0, ps2if->base + PS2CLKDIV);
+        sa1111_writel(127, ps2if->base + PS2PRECNT);
 
         /*
          * Flush any pending input.
@@ -330,6 +353,7 @@ static int __devexit ps2_remove(struct sa1111_dev *dev)
 static struct sa1111_driver ps2_driver = {
         .drv = {
                 .name   = "sa1111-ps2",
+                .owner  = THIS_MODULE,
         },
         .devid          = SA1111_DEVID_PS2,
         .probe          = ps2_probe,
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index ba70058e2be3..d0f7533dbf88 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -441,7 +441,6 @@ static ssize_t serio_rebind_driver(struct device *dev, struct device_attribute *
         } else if ((drv = driver_find(buf, &serio_bus)) != NULL) {
                 serio_disconnect_port(serio);
                 error = serio_bind_driver(serio, to_serio_driver(drv));
-                put_driver(drv);
                 serio_remove_duplicate_events(serio, SERIO_RESCAN_PORT);
         } else {
                 error = -EINVAL;
diff --git a/drivers/input/tablet/Kconfig b/drivers/input/tablet/Kconfig
index 0edeb949109b..bed7cbf84cfd 100644
--- a/drivers/input/tablet/Kconfig
+++ b/drivers/input/tablet/Kconfig
@@ -78,6 +78,8 @@ config TABLET_USB_WACOM
         depends on USB_ARCH_HAS_HCD
         select POWER_SUPPLY
         select USB
+        select NEW_LEDS
+        select LEDS_CLASS
         help
           Say Y here if you want to use the USB version of the Wacom Intuos
           or Graphire tablet.  Make sure to say Y to "Mouse support"
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index 1c874adb7053..98e9dd692d68 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -1052,6 +1052,8 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
                 return -EINVAL;
 
         wacom = kzalloc(sizeof(struct wacom), GFP_KERNEL);
+        if (!wacom)
+                return -ENOMEM;
 
         wacom_wac = &wacom->wacom_wac;
         wacom_wac->features = *((struct wacom_features *)id->driver_info);
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index a6173431d803..d96e186f71dc 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -977,7 +977,7 @@ static int wacom_bpt3_touch(struct wacom_wac *wacom)
 {
         struct input_dev *input = wacom->input;
         unsigned char *data = wacom->data;
-        int count = data[1] & 0x03;
+        int count = data[1] & 0x07;
         int i;
 
         if (data[0] != 0x02)
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index c5eb2b925be6..ba7c56567ee7 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -260,7 +260,7 @@ config TOUCHSCREEN_ILI210X
 
 config TOUCHSCREEN_S3C2410
         tristate "Samsung S3C2410/generic touchscreen input driver"
-        depends on ARCH_S3C2410 || SAMSUNG_DEV_TS
+        depends on ARCH_S3C24XX || SAMSUNG_DEV_TS
         select S3C_ADC
         help
           Say Y here if you have the s3c2410 touchscreen.
diff --git a/drivers/input/touchscreen/jornada720_ts.c b/drivers/input/touchscreen/jornada720_ts.c
index c3848ad2325b..d9be6eac99b1 100644
--- a/drivers/input/touchscreen/jornada720_ts.c
+++ b/drivers/input/touchscreen/jornada720_ts.c
@@ -22,6 +22,7 @@
 
 #include <mach/hardware.h>
 #include <mach/jornada720.h>
+#include <mach/irqs.h>
 
 MODULE_AUTHOR("Kristoffer Ericson <kristoffer.ericson@gmail.com>");
 MODULE_DESCRIPTION("HP Jornada 710/720/728 touchscreen driver");
diff --git a/drivers/input/touchscreen/mc13783_ts.c b/drivers/input/touchscreen/mc13783_ts.c
index ede02743eac1..48dc5b0d26f1 100644
--- a/drivers/input/touchscreen/mc13783_ts.c
+++ b/drivers/input/touchscreen/mc13783_ts.c
@@ -39,6 +39,7 @@ struct mc13783_ts_priv {
         struct delayed_work work;
         struct workqueue_struct *workq;
         unsigned int sample[4];
+        struct mc13xxx_ts_platform_data *touch;
 };
 
 static irqreturn_t mc13783_ts_handler(int irq, void *data)
@@ -125,7 +126,9 @@ static void mc13783_ts_work(struct work_struct *work)
         unsigned int channel = 12;
 
         if (mc13xxx_adc_do_conversion(priv->mc13xxx,
-                                mode, channel, priv->sample) == 0)
+                                mode, channel,
+                                priv->touch->ato, priv->touch->atox,
+                                priv->sample) == 0)
                 mc13783_ts_report_sample(priv);
 }
 
@@ -179,6 +182,12 @@ static int __init mc13783_ts_probe(struct platform_device *pdev)
         INIT_DELAYED_WORK(&priv->work, mc13783_ts_work);
         priv->mc13xxx = dev_get_drvdata(pdev->dev.parent);
         priv->idev = idev;
+        priv->touch = dev_get_platdata(&pdev->dev);
+        if (!priv->touch) {
+                dev_err(&pdev->dev, "missing platform data\n");
+                ret = -ENODEV;
+                goto err_free_mem;
+        }
 
         /*
          * We need separate workqueue because mc13783_adc_do_conversion
diff --git a/drivers/input/touchscreen/tps6507x-ts.c b/drivers/input/touchscreen/tps6507x-ts.c
index 6c6f6d8ea9b4..f7eda3d00fad 100644
--- a/drivers/input/touchscreen/tps6507x-ts.c
+++ b/drivers/input/touchscreen/tps6507x-ts.c
@@ -1,6 +1,4 @@
 /*
- * drivers/input/touchscreen/tps6507x_ts.c
- *
  * Touchscreen driver for the tps6507x chip.
  *
  * Copyright (c) 2009 RidgeRun (todd.fischer@ridgerun.com)
@@ -376,4 +374,4 @@ module_platform_driver(tps6507x_ts_driver);
 MODULE_AUTHOR("Todd Fischer <todd.fischer@ridgerun.com>");
 MODULE_DESCRIPTION("TPS6507x - TouchScreen driver");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:tps6507x-tsc");
+MODULE_ALIAS("platform:tps6507x-ts");