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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: add driver for Atmel AT42QT2160 Sensor Chip
  Input: max7359 - use threaded IRQs
  Input: add driver for Maxim MAX7359 key switch controller
  Input: add driver for ADP5588 QWERTY I2C Keypad
  Input: add touchscreen driver for MELFAS MCS-5000 controller
  Input: add driver for OpenCores Keyboard Controller
  Input: dm355evm_keys - remove dm355evm_keys_hardirq
  Input: synaptics_i2c - switch to using __cancel_delayed_work()
  Input: ad7879 - add support for AD7889
  Input: atkbd - rely on input core to restore state on resume
  Input: add generic suspend and resume for input devices
  Input: libps2 - additional locking for i8042 ports

1 files changed, 63 insertions, 1 deletions

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 556539d617a4..e828aab7dace 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -11,6 +11,7 @@
  */
 
 #include <linux/init.h>
+#include <linux/types.h>
 #include <linux/input.h>
 #include <linux/module.h>
 #include <linux/random.h>
@@ -514,7 +515,7 @@ static void input_disconnect_device(struct input_dev *dev)
          * that there are no threads in the middle of input_open_device()
          */
         mutex_lock(&dev->mutex);
-        dev->going_away = 1;
+        dev->going_away = true;
         mutex_unlock(&dev->mutex);
 
         spin_lock_irq(&dev->event_lock);
@@ -1259,10 +1260,71 @@ static int input_dev_uevent(struct device *device, struct kobj_uevent_env *env)
         return 0;
 }
 
+#define INPUT_DO_TOGGLE(dev, type, bits, on)                    \
+        do {                                                    \
+                int i;                                          \
+                if (!test_bit(EV_##type, dev->evbit))           \
+                        break;                                  \
+                for (i = 0; i < type##_MAX; i++) {              \
+                        if (!test_bit(i, dev->bits##bit) ||     \
+                            !test_bit(i, dev->bits))            \
+                                continue;                       \
+                        dev->event(dev, EV_##type, i, on);      \
+                }                                               \
+        } while (0)
+
+static void input_dev_reset(struct input_dev *dev, bool activate)
+{
+        if (!dev->event)
+                return;
+
+        INPUT_DO_TOGGLE(dev, LED, led, activate);
+        INPUT_DO_TOGGLE(dev, SND, snd, activate);
+
+        if (activate && test_bit(EV_REP, dev->evbit)) {
+                dev->event(dev, EV_REP, REP_PERIOD, dev->rep[REP_PERIOD]);
+                dev->event(dev, EV_REP, REP_DELAY, dev->rep[REP_DELAY]);
+        }
+}
+
+#ifdef CONFIG_PM
+static int input_dev_suspend(struct device *dev)
+{
+        struct input_dev *input_dev = to_input_dev(dev);
+
+        mutex_lock(&input_dev->mutex);
+        input_dev_reset(input_dev, false);
+        mutex_unlock(&input_dev->mutex);
+
+        return 0;
+}
+
+static int input_dev_resume(struct device *dev)
+{
+        struct input_dev *input_dev = to_input_dev(dev);
+
+        mutex_lock(&input_dev->mutex);
+        input_dev_reset(input_dev, true);
+        mutex_unlock(&input_dev->mutex);
+
+        return 0;
+}
+
+static const struct dev_pm_ops input_dev_pm_ops = {
+        .suspend        = input_dev_suspend,
+        .resume         = input_dev_resume,
+        .poweroff       = input_dev_suspend,
+        .restore        = input_dev_resume,
+};
+#endif /* CONFIG_PM */
+
 static struct device_type input_dev_type = {
         .groups         = input_dev_attr_groups,
         .release        = input_dev_release,
         .uevent         = input_dev_uevent,
+#ifdef CONFIG_PM
+        .pm             = &input_dev_pm_ops,
+#endif
 };
 
 static char *input_devnode(struct device *dev, mode_t *mode)