input: touchscreen: add touch screen of gslx680 for rk3399-firefly-edp

[firefly-linux-kernel-4.4.55.git] / drivers / input / keyboard / atkbd.c

diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index 6f5d79569136f3adf0bf9248988b107426b85e9c..ec876b5b1382ff7da2e28b1eed6e953f0729ed32 100644 (file)
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -456,8 +456,9 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
 
        keycode = atkbd->keycode[code];
 
-       if (keycode != ATKBD_KEY_NULL)
-               input_event(dev, EV_MSC, MSC_SCAN, code);
+       if (!(atkbd->release && test_bit(code, atkbd->force_release_mask)))
+               if (keycode != ATKBD_KEY_NULL)
+                       input_event(dev, EV_MSC, MSC_SCAN, code);
 
        switch (keycode) {
        case ATKBD_KEY_NULL:
@@ -511,6 +512,7 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
                input_sync(dev);
 
                if (value && test_bit(code, atkbd->force_release_mask)) {
+                       input_event(dev, EV_MSC, MSC_SCAN, code);
                        input_report_key(dev, keycode, 0);
                        input_sync(dev);
                }
@@ -1397,8 +1399,8 @@ static ssize_t atkbd_set_extra(struct atkbd *atkbd, const char *buf, size_t coun
 
 static ssize_t atkbd_show_force_release(struct atkbd *atkbd, char *buf)
 {
-       size_t len = bitmap_scnlistprintf(buf, PAGE_SIZE - 2,
-                       atkbd->force_release_mask, ATKBD_KEYMAP_SIZE);
+       size_t len = scnprintf(buf, PAGE_SIZE - 1, "%*pbl",
+                              ATKBD_KEYMAP_SIZE, atkbd->force_release_mask);
 
        buf[len++] = '\n';
        buf[len] = '\0';
@@ -1651,6 +1653,12 @@ static int __init atkbd_deactivate_fixup(const struct dmi_system_id *id)
        return 1;
 }
 
+/*
+ * NOTE: do not add any more "force release" quirks to this table.  The
+ * task of adjusting list of keys that should be "released" automatically
+ * by the driver is now delegated to userspace tools, such as udev, so
+ * submit such quirks there.
+ */
 static const struct dmi_system_id atkbd_dmi_quirk_table[] __initconst = {
        {
                .matches = {