lkml.org 
[lkml]   [2016]   [Jun]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 06/56] HID: microsoft: Add Surface 3 type cover
    Date
    From: Stephen Just <stephenjust@gmail.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit 0439de75d32c249bd9f5824ffd5e40c4c2109d77 upstream.

    Adding support for the Microsoft Surface 3 (non-pro) Type Cover.

    The existing definitions and quirks are actually for the Surface
    Pro 3 type covers. I've renamed the old constants to reflect that
    they belong to the Surface Pro 3, and added a new constant and
    matching code for the Surface 3.

    Signed-off-by: Stephen Just <stephenjust@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.com>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/hid/hid-core.c | 8 +++++---
    drivers/hid/hid-ids.h | 8 ++++++--
    drivers/hid/hid-microsoft.c | 6 ++++--
    drivers/hid/usbhid/hid-quirks.c | 3 ++-
    4 files changed, 17 insertions(+), 8 deletions(-)

    diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
    index 9d24332e1e27..c8c98f1f22d6 100644
    --- a/drivers/hid/hid-core.c
    +++ b/drivers/hid/hid-core.c
    @@ -704,8 +704,9 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type)
    hid->group = HID_GROUP_SENSOR_HUB;

    if (hid->vendor == USB_VENDOR_ID_MICROSOFT &&
    - (hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3 ||
    - hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3_JP ||
    + (hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 ||
    + 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;
    @@ -1810,8 +1811,9 @@ static const struct hid_device_id hid_have_special_driver[] = {
    { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) },
    { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
    { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_OFFICE_KB) },
    + { 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_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_TYPE_COVER_3_JP) },
    { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER) },
    { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },
    { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },
    diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
    index 64f8fd16e9d7..b33fadc32100 100644
    --- a/drivers/hid/hid-ids.h
    +++ b/drivers/hid/hid-ids.h
    @@ -649,8 +649,12 @@
    #define USB_DEVICE_ID_MS_NE7K 0x071d
    #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K 0x0730
    #define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500 0x076c
    -#define USB_DEVICE_ID_MS_TYPE_COVER_3 0x07dc
    -#define USB_DEVICE_ID_MS_TYPE_COVER_3_JP 0x07dd
    +#define USB_DEVICE_ID_MS_SURFACE_PRO_2 0x0799
    +#define USB_DEVICE_ID_MS_TOUCH_COVER_2 0x07a7
    +#define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9
    +#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 0x07dc
    +#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 755c62d73896..3afea9a98637 100644
    --- a/drivers/hid/hid-microsoft.c
    +++ b/drivers/hid/hid-microsoft.c
    @@ -256,9 +256,11 @@ static const struct hid_device_id ms_devices[] = {
    .driver_data = MS_NOGET },
    { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500),
    .driver_data = MS_DUPLICATE_USAGES },
    - { 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_TYPE_COVER_PRO_3),
    + .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_JP),
    + { 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 },
    diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
    index 3b3fcbd28320..825d052cd2cb 100644
    --- a/drivers/hid/usbhid/hid-quirks.c
    +++ b/drivers/hid/usbhid/hid-quirks.c
    @@ -87,8 +87,9 @@ static const struct hid_blacklist {
    { USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET },
    { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_C077, HID_QUIRK_ALWAYS_POLL },
    { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_NOGET },
    + { 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_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_TYPE_COVER_3_JP, 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_GX680R_LED_PANEL, HID_QUIRK_NO_INIT_REPORTS },
    { USB_VENDOR_ID_NEXIO, USB_DEVICE_ID_NEXIO_MULTITOUCH_PTI0750, HID_QUIRK_NO_INIT_REPORTS },
    --
    2.9.0
    \
     
     \ /
      Last update: 2016-06-15 10:21    [W:9.016 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site