Apply k4412 kernel from HardKernel for ODROID-X.

4 files changed, 28 insertions, 7 deletions

diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index bae48745bb4..9a243ca96e6 100644
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -450,6 +450,11 @@ void hid_dump_field(struct hid_field *field, int n, struct seq_file *f) {
                 seq_printf(f, "Logical(");
                 hid_resolv_usage(field->logical, f); seq_printf(f, ")\n");
         }
+        if (field->application) {
+                tab(n, f);
+                seq_printf(f, "Application(");
+                hid_resolv_usage(field->application, f); seq_printf(f, ")\n");
+        }
         tab(n, f); seq_printf(f, "Usage(%d)\n", field->maxusage);
         for (j = 0; j < field->maxusage; j++) {
                 tab(n+2, f); hid_resolv_usage(field->usage[j].hid, f); seq_printf(f, "\n");
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 6559e2e3364..1483c8296d5 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -971,6 +971,9 @@ int hidinput_connect(struct hid_device *hid, unsigned int force)
                                  * UGCI) cram a lot of unrelated inputs into the
                                  * same interface. */
                                 hidinput->report = report;
+                                if (hid->driver->input_register &&
+                                                hid->driver->input_register(hid, hidinput))
+                                        goto out_cleanup;
                                 if (input_register_device(hidinput->input))
                                         goto out_cleanup;
                                 hidinput = NULL;
@@ -978,6 +981,10 @@ int hidinput_connect(struct hid_device *hid, unsigned int force)
                 }
         }
 
+        if (hidinput && hid->driver->input_register &&
+                        hid->driver->input_register(hid, hidinput))
+                goto out_cleanup;
+
         if (hidinput && input_register_device(hidinput->input))
                 goto out_cleanup;
 
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
index 56d0539f2a3..c696f7f20e4 100644
--- a/drivers/hid/hid-magicmouse.c
+++ b/drivers/hid/hid-magicmouse.c
@@ -365,8 +365,10 @@ static int magicmouse_raw_event(struct hid_device *hdev,
         return 1;
 }
 
-static void magicmouse_setup_input(struct input_dev *input, struct hid_device *hdev)
+static int magicmouse_setup_input(struct hid_device *hdev, struct hid_input *hi)
 {
+        struct input_dev *input = hi->input;
+
         __set_bit(EV_KEY, input->evbit);
 
         if (input->id.product == USB_DEVICE_ID_APPLE_MAGICMOUSE) {
@@ -426,6 +428,8 @@ static void magicmouse_setup_input(struct input_dev *input, struct hid_device *h
                 __set_bit(EV_MSC, input->evbit);
                 __set_bit(MSC_RAW, input->mscbit);
         }
+
+        return 0;
 }
 
 static int magicmouse_input_mapping(struct hid_device *hdev,
@@ -478,12 +482,6 @@ static int magicmouse_probe(struct hid_device *hdev,
                 goto err_free;
         }
 
-        /* We do this after hid-input is done parsing reports so that
-         * hid-input uses the most natural button and axis IDs.
-         */
-        if (msc->input)
-                magicmouse_setup_input(msc->input, hdev);
-
         if (id->product == USB_DEVICE_ID_APPLE_MAGICMOUSE)
                 report = hid_register_report(hdev, HID_INPUT_REPORT,
                         MOUSE_REPORT_ID);
@@ -548,6 +546,7 @@ static struct hid_driver magicmouse_driver = {
         .remove = magicmouse_remove,
         .raw_event = magicmouse_raw_event,
         .input_mapping = magicmouse_input_mapping,
+        .input_register = magicmouse_setup_input,
 };
 
 static int __init magicmouse_init(void)
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 1308703afdb..91319f90a16 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -213,6 +213,16 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
         struct mt_class *cls = td->mtclass;
         __s32 quirks = cls->quirks;
 
+        /* Only map fields from TouchScreen or TouchPad collections.
+         * We need to ignore fields that belong to other collections
+         * such as Mouse that might have the same GenericDesktop usages. */
+        if (field->application == HID_DG_TOUCHSCREEN)
+                set_bit(INPUT_PROP_DIRECT, hi->input->propbit);
+        else if (field->application == HID_DG_TOUCHPAD)
+                set_bit(INPUT_PROP_POINTER, hi->input->propbit);
+        else
+                return 0;
+
         switch (usage->hid & HID_USAGE_PAGE) {
 
         case HID_UP_GENDESK: