4 files changed, 66 insertions, 55 deletions

diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index fd325ec9f064..de055451d1af 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -108,9 +108,8 @@ static void evdev_queue_syn_dropped(struct evdev_client *client)
         struct input_event ev;
         ktime_t time;
 
-        time = ktime_get();
-        if (client->clkid != CLOCK_MONOTONIC)
-                time = ktime_sub(time, ktime_get_monotonic_offset());
+        time = (client->clkid == CLOCK_MONOTONIC) ?
+                ktime_get() : ktime_get_real();
 
         ev.time = ktime_to_timeval(time);
         ev.type = EV_SYN;
@@ -202,7 +201,7 @@ static void evdev_events(struct input_handle *handle,
         ktime_t time_mono, time_real;
 
         time_mono = ktime_get();
-        time_real = ktime_sub(time_mono, ktime_get_monotonic_offset());
+        time_real = ktime_mono_to_real(time_mono);
 
         rcu_read_lock();
 
diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c
index 408379669d3c..791781ade4e7 100644
--- a/drivers/input/keyboard/cros_ec_keyb.c
+++ b/drivers/input/keyboard/cros_ec_keyb.c
@@ -24,8 +24,8 @@
 #include <linux/module.h>
 #include <linux/i2c.h>
 #include <linux/input.h>
+#include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/notifier.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/input/matrix_keypad.h>
@@ -42,7 +42,6 @@
  * @dev: Device pointer
  * @idev: Input device
  * @ec: Top level ChromeOS device to use to talk to EC
- * @event_notifier: interrupt event notifier for transport devices
  */
 struct cros_ec_keyb {
         unsigned int rows;
@@ -55,7 +54,6 @@ struct cros_ec_keyb {
         struct device *dev;
         struct input_dev *idev;
         struct cros_ec_device *ec;
-        struct notifier_block notifier;
 };
 
 
@@ -173,41 +171,55 @@ static void cros_ec_keyb_process(struct cros_ec_keyb *ckdev,
         input_sync(ckdev->idev);
 }
 
-static int cros_ec_keyb_open(struct input_dev *dev)
-{
-        struct cros_ec_keyb *ckdev = input_get_drvdata(dev);
-
-        return blocking_notifier_chain_register(&ckdev->ec->event_notifier,
-                                                &ckdev->notifier);
-}
-
-static void cros_ec_keyb_close(struct input_dev *dev)
-{
-        struct cros_ec_keyb *ckdev = input_get_drvdata(dev);
-
-        blocking_notifier_chain_unregister(&ckdev->ec->event_notifier,
-                                           &ckdev->notifier);
-}
-
 static int cros_ec_keyb_get_state(struct cros_ec_keyb *ckdev, uint8_t *kb_state)
 {
-        return ckdev->ec->command_recv(ckdev->ec, EC_CMD_MKBP_STATE,
-                                          kb_state, ckdev->cols);
+        struct cros_ec_command msg = {
+                .version = 0,
+                .command = EC_CMD_MKBP_STATE,
+                .outdata = NULL,
+                .outsize = 0,
+                .indata = kb_state,
+                .insize = ckdev->cols,
+        };
+
+        return ckdev->ec->cmd_xfer(ckdev->ec, &msg);
 }
 
-static int cros_ec_keyb_work(struct notifier_block *nb,
-                     unsigned long state, void *_notify)
+static irqreturn_t cros_ec_keyb_irq(int irq, void *data)
 {
+        struct cros_ec_keyb *ckdev = data;
+        struct cros_ec_device *ec = ckdev->ec;
         int ret;
-        struct cros_ec_keyb *ckdev = container_of(nb, struct cros_ec_keyb,
-                                                    notifier);
         uint8_t kb_state[ckdev->cols];
 
+        if (device_may_wakeup(ec->dev))
+                pm_wakeup_event(ec->dev, 0);
+
         ret = cros_ec_keyb_get_state(ckdev, kb_state);
         if (ret >= 0)
                 cros_ec_keyb_process(ckdev, kb_state, ret);
+        else
+                dev_err(ec->dev, "failed to get keyboard state: %d\n", ret);
 
-        return NOTIFY_DONE;
+        return IRQ_HANDLED;
+}
+
+static int cros_ec_keyb_open(struct input_dev *dev)
+{
+        struct cros_ec_keyb *ckdev = input_get_drvdata(dev);
+        struct cros_ec_device *ec = ckdev->ec;
+
+        return request_threaded_irq(ec->irq, NULL, cros_ec_keyb_irq,
+                                        IRQF_TRIGGER_LOW | IRQF_ONESHOT,
+                                        "cros_ec_keyb", ckdev);
+}
+
+static void cros_ec_keyb_close(struct input_dev *dev)
+{
+        struct cros_ec_keyb *ckdev = input_get_drvdata(dev);
+        struct cros_ec_device *ec = ckdev->ec;
+
+        free_irq(ec->irq, ckdev);
 }
 
 static int cros_ec_keyb_probe(struct platform_device *pdev)
@@ -238,8 +250,12 @@ static int cros_ec_keyb_probe(struct platform_device *pdev)
         if (!idev)
                 return -ENOMEM;
 
+        if (!ec->irq) {
+                dev_err(dev, "no EC IRQ specified\n");
+                return -EINVAL;
+        }
+
         ckdev->ec = ec;
-        ckdev->notifier.notifier_call = cros_ec_keyb_work;
         ckdev->dev = dev;
         dev_set_drvdata(&pdev->dev, ckdev);
 
diff --git a/drivers/input/keyboard/lm8323.c b/drivers/input/keyboard/lm8323.c
index 0b42118cbf8f..cb32e2b506b7 100644
--- a/drivers/input/keyboard/lm8323.c
+++ b/drivers/input/keyboard/lm8323.c
@@ -558,6 +558,12 @@ static ssize_t lm8323_pwm_store_time(struct device *dev,
 }
 static DEVICE_ATTR(time, 0644, lm8323_pwm_show_time, lm8323_pwm_store_time);
 
+static struct attribute *lm8323_pwm_attrs[] = {
+        &dev_attr_time.attr,
+        NULL
+};
+ATTRIBUTE_GROUPS(lm8323_pwm);
+
 static int init_pwm(struct lm8323_chip *lm, int id, struct device *dev,
                     const char *name)
 {
@@ -580,16 +586,11 @@ static int init_pwm(struct lm8323_chip *lm, int id, struct device *dev,
         if (name) {
                 pwm->cdev.name = name;
                 pwm->cdev.brightness_set = lm8323_pwm_set_brightness;
+                pwm->cdev.groups = lm8323_pwm_groups;
                 if (led_classdev_register(dev, &pwm->cdev) < 0) {
                         dev_err(dev, "couldn't register PWM %d\n", id);
                         return -1;
                 }
-                if (device_create_file(pwm->cdev.dev,
-                                        &dev_attr_time) < 0) {
-                        dev_err(dev, "couldn't register time attribute\n");
-                        led_classdev_unregister(&pwm->cdev);
-                        return -1;
-                }
                 pwm->enabled = true;
         }
 
@@ -753,11 +754,8 @@ fail3:
         device_remove_file(&client->dev, &dev_attr_disable_kp);
 fail2:
         while (--pwm >= 0)
-                if (lm->pwm[pwm].enabled) {
-                        device_remove_file(lm->pwm[pwm].cdev.dev,
-                                           &dev_attr_time);
+                if (lm->pwm[pwm].enabled)
                         led_classdev_unregister(&lm->pwm[pwm].cdev);
-                }
 fail1:
         input_free_device(idev);
         kfree(lm);
@@ -777,10 +775,8 @@ static int lm8323_remove(struct i2c_client *client)
         device_remove_file(&lm->client->dev, &dev_attr_disable_kp);
 
         for (i = 0; i < 3; i++)
-                if (lm->pwm[i].enabled) {
-                        device_remove_file(lm->pwm[i].cdev.dev, &dev_attr_time);
+                if (lm->pwm[i].enabled)
                         led_classdev_unregister(&lm->pwm[i].cdev);
-                }
 
         kfree(lm);
 
diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c
index 65fd3150919b..179ff1cd6f6b 100644
--- a/drivers/input/misc/sparcspkr.c
+++ b/drivers/input/misc/sparcspkr.c
@@ -86,13 +86,13 @@ static int bbc_spkr_event(struct input_dev *dev, unsigned int type, unsigned int
         spin_lock_irqsave(&state->lock, flags);
 
         if (count) {
-                outb(0x01,                 info->regs + 0);
-                outb(0x00,                 info->regs + 2);
-                outb((count >> 16) & 0xff, info->regs + 3);
-                outb((count >>  8) & 0xff, info->regs + 4);
-                outb(0x00,                 info->regs + 5);
+                sbus_writeb(0x01,                 info->regs + 0);
+                sbus_writeb(0x00,                 info->regs + 2);
+                sbus_writeb((count >> 16) & 0xff, info->regs + 3);
+                sbus_writeb((count >>  8) & 0xff, info->regs + 4);
+                sbus_writeb(0x00,                 info->regs + 5);
         } else {
-                outb(0x00,                 info->regs + 0);
+                sbus_writeb(0x00,                 info->regs + 0);
         }
 
         spin_unlock_irqrestore(&state->lock, flags);
@@ -123,15 +123,15 @@ static int grover_spkr_event(struct input_dev *dev, unsigned int type, unsigned
 
         if (count) {
                 /* enable counter 2 */
-                outb(inb(info->enable_reg) | 3, info->enable_reg);
+                sbus_writeb(sbus_readb(info->enable_reg) | 3, info->enable_reg);
                 /* set command for counter 2, 2 byte write */
-                outb(0xB6, info->freq_regs + 1);
+                sbus_writeb(0xB6, info->freq_regs + 1);
                 /* select desired HZ */
-                outb(count & 0xff, info->freq_regs + 0);
-                outb((count >> 8) & 0xff, info->freq_regs + 0);
+                sbus_writeb(count & 0xff, info->freq_regs + 0);
+                sbus_writeb((count >> 8) & 0xff, info->freq_regs + 0);
         } else {
                 /* disable counter 2 */
-                outb(inb_p(info->enable_reg) & 0xFC, info->enable_reg);
+                sbus_writeb(sbus_readb(info->enable_reg) & 0xFC, info->enable_reg);
         }
 
         spin_unlock_irqrestore(&state->lock, flags);