From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Benjamin Tissoires <benjamin.tissoires@redhat.com>,
Jiri Kosina <jikos@kernel.org>,
Bastien Nocera <hadess@hadess.net>
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] HID: multitouch: enable the Surface 3 Type Cover to report multitouch data
Date: Fri, 13 May 2016 17:30:18 +0300 [thread overview]
Message-ID: <1463149818.17131.349.camel@linux.intel.com> (raw)
In-Reply-To: <1463062363-12405-2-git-send-email-benjamin.tissoires@redhat.com>
On Thu, 2016-05-12 at 16:12 +0200, Benjamin Tissoires wrote:
> There is no reasons to filter out keyboard and consumer control
> collections
> in hid-multitouch.
> With the previous hid-input fix, there is now a full support of the
> Type
> Cover and we can remove all specific bits from hid-core and hid-
> microsoft.
>
> hid-multitouch will automatically set HID_QUIRK_NO_INIT_REPORTS so we
> can
> also remove it from the list of ushbid quirks.
>
> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
> ---
>
> Andy, would you mind checking if this series is sufficient to enable
> the
> TypeCover of the Surface Book?
Tested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Noticed little difference that there is no event for the device anymore,
just /dev/usb/hiddev0. Would it work properly under X?
>
> Cheers,
> Benjamin
>
> drivers/hid/hid-core.c | 2 --
> drivers/hid/hid-ids.h | 1 -
> drivers/hid/hid-microsoft.c | 2 --
> drivers/hid/hid-multitouch.c | 4 +++-
> drivers/hid/usbhid/hid-quirks.c | 1 -
> 5 files changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
> index 8ea3a26..f055a68 100644
> --- a/drivers/hid/hid-core.c
> +++ b/drivers/hid/hid-core.c
> @@ -727,7 +727,6 @@ static void hid_scan_collection(struct hid_parser
> *parser, unsigned type)
> (hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 ||
> hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 ||
> hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP ||
> - hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3 ||
> hid->product == USB_DEVICE_ID_MS_POWER_COVER) &&
> hid->group == HID_GROUP_MULTITOUCH)
> hid->group = HID_GROUP_GENERIC;
> @@ -1976,7 +1975,6 @@ static const struct hid_device_id
> hid_have_special_driver[] = {
> { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
> USB_DEVICE_ID_MS_TYPE_COVER_PRO_3) },
> { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
> USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2) },
> { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
> USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) },
> - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
> USB_DEVICE_ID_MS_TYPE_COVER_3) },
> { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
> USB_DEVICE_ID_MS_DIGITAL_MEDIA_7K) },
> { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
> USB_DEVICE_ID_MS_DIGITAL_MEDIA_600) },
> { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
> USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1) },
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index 3eec09a1..99e9852 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -703,7 +703,6 @@
> #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 0x07dc
> #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 0x07e2
> #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP 0x07dd
> -#define USB_DEVICE_ID_MS_TYPE_COVER_3 0x07de
> #define USB_DEVICE_ID_MS_POWER_COVER 0x07da
>
> #define USB_VENDOR_ID_MOJO 0x8282
> diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c
> index e924d55..cf6920b 100644
> --- a/drivers/hid/hid-microsoft.c
> +++ b/drivers/hid/hid-microsoft.c
> @@ -288,8 +288,6 @@ static const struct hid_device_id ms_devices[] = {
> .driver_data = MS_HIDINPUT },
> { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
> USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP),
> .driver_data = MS_HIDINPUT },
> - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
> USB_DEVICE_ID_MS_TYPE_COVER_3),
> - .driver_data = MS_HIDINPUT },
> { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
> USB_DEVICE_ID_MS_POWER_COVER),
> .driver_data = MS_HIDINPUT },
> { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
> USB_DEVICE_ID_MS_COMFORT_KEYBOARD),
> diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-
> multitouch.c
> index c741f5e..ac35731 100644
> --- a/drivers/hid/hid-multitouch.c
> +++ b/drivers/hid/hid-multitouch.c
> @@ -835,7 +835,9 @@ static int mt_input_mapping(struct hid_device
> *hdev, struct hid_input *hi,
> if (!td->mtclass.export_all_inputs &&
> field->application != HID_DG_TOUCHSCREEN &&
> field->application != HID_DG_PEN &&
> - field->application != HID_DG_TOUCHPAD)
> + field->application != HID_DG_TOUCHPAD &&
> + field->application != HID_GD_KEYBOARD &&
> + field->application != HID_CP_CONSUMER_CONTROL)
> return -1;
>
> /*
> diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-
> quirks.c
> index b4b8c6a..baf2bad 100644
> --- a/drivers/hid/usbhid/hid-quirks.c
> +++ b/drivers/hid/usbhid/hid-quirks.c
> @@ -98,7 +98,6 @@ static const struct hid_blacklist {
> { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3,
> HID_QUIRK_NO_INIT_REPORTS },
> { USB_VENDOR_ID_MICROSOFT,
> USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2, HID_QUIRK_NO_INIT_REPORTS },
> { USB_VENDOR_ID_MICROSOFT,
> USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP, HID_QUIRK_NO_INIT_REPORTS },
> - { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3,
> HID_QUIRK_NO_INIT_REPORTS },
> { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER,
> HID_QUIRK_NO_INIT_REPORTS },
> { USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL,
> HID_QUIRK_NO_INIT_REPORTS },
> { USB_VENDOR_ID_NEXIO,
> USB_DEVICE_ID_NEXIO_MULTITOUCH_PTI0750, HID_QUIRK_NO_INIT_REPORTS },
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
next prev parent reply other threads:[~2016-05-13 14:29 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-12 14:12 [PATCH 1/2] HID: input: rework HID_QUIRK_MULTI_INPUT Benjamin Tissoires
2016-05-12 14:12 ` [PATCH 2/2] HID: multitouch: enable the Surface 3 Type Cover to report multitouch data Benjamin Tissoires
2016-05-13 14:30 ` Andy Shevchenko [this message]
2016-05-13 14:49 ` Benjamin Tissoires
2016-05-13 16:09 ` Andy Shevchenko
2016-05-13 16:21 ` Benjamin Tissoires
2016-05-13 16:28 ` Andy Shevchenko
2016-05-20 7:58 ` Benjamin Tissoires
2016-05-31 16:07 ` Benjamin Tissoires
2016-05-31 17:56 ` Andy Shevchenko
2016-06-02 14:11 ` Benjamin Tissoires
2016-06-02 14:40 ` Andy Shevchenko
2016-06-03 9:38 ` Benjamin Tissoires
2016-06-03 11:59 ` Andy Shevchenko
2016-06-03 12:23 ` Benjamin Tissoires
2016-06-03 13:00 ` Andy Shevchenko
2016-06-03 13:32 ` Benjamin Tissoires
2016-06-13 12:32 ` Andy Shevchenko
2016-06-15 14:28 ` Benjamin Tissoires
2016-06-23 7:24 ` Andy Shevchenko
2016-05-17 17:47 ` Bastien Nocera
2016-06-23 1:12 ` Stephen J
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1463149818.17131.349.camel@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=benjamin.tissoires@redhat.com \
--cc=hadess@hadess.net \
--cc=jikos@kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).