0006-hid.patch 7.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151
  1. From 7f34de9f7976e18b2b12c45a4be88fe4be309ac3 Mon Sep 17 00:00:00 2001
  2. From: Maximilian Luz <luzmaximilian@gmail.com>
  3. Date: Fri, 26 Jul 2019 04:45:42 +0200
  4. Subject: [PATCH 06/12] hid
  5. ---
  6. drivers/hid/hid-ids.h | 21 +++++++++----
  7. drivers/hid/hid-microsoft.c | 3 +-
  8. drivers/hid/hid-multitouch.c | 57 ++++++++++++++++++++++++++++++++++++
  9. drivers/hid/hid-quirks.c | 11 +++++++
  10. 4 files changed, 86 insertions(+), 6 deletions(-)
  11. diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
  12. index 264139be7e29..fd396b91d5a8 100644
  13. --- a/drivers/hid/hid-ids.h
  14. +++ b/drivers/hid/hid-ids.h
  15. @@ -823,11 +823,22 @@
  16. #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1 0x0732
  17. #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_600 0x0750
  18. #define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500 0x076c
  19. -#define USB_DEVICE_ID_MS_COMFORT_KEYBOARD 0x00e3
  20. -#define USB_DEVICE_ID_MS_SURFACE_PRO_2 0x0799
  21. -#define USB_DEVICE_ID_MS_TOUCH_COVER_2 0x07a7
  22. -#define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9
  23. -#define USB_DEVICE_ID_MS_POWER_COVER 0x07da
  24. +#define USB_DEVICE_ID_MS_COMFORT_KEYBOARD 0x00e3
  25. +#define USB_DEVICE_ID_MS_SURFACE_PRO_2 0x0799
  26. +#define USB_DEVICE_ID_MS_TOUCH_COVER_2 0x07a7
  27. +#define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9
  28. +#define USB_DEVICE_ID_MS_TYPE_COVER_3 0x07de
  29. +#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 0x07dc
  30. +#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_1 0x07de
  31. +#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 0x07e2
  32. +#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP 0x07dd
  33. +#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4 0x07e8
  34. +#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_1 0x07e4
  35. +#define USB_DEVICE_ID_MS_SURFACE_BOOK 0x07cd
  36. +#define USB_DEVICE_ID_MS_SURFACE_BOOK_2 0x0922
  37. +#define USB_DEVICE_ID_MS_SURFACE_GO 0x096f
  38. +#define USB_DEVICE_ID_MS_SURFACE_VHF 0xf001
  39. +#define USB_DEVICE_ID_MS_POWER_COVER 0x07da
  40. #define USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER 0x02fd
  41. #define USB_DEVICE_ID_MS_PIXART_MOUSE 0x00cb
  42. diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c
  43. index 8b3a922bdad3..0290a16881e5 100644
  44. --- a/drivers/hid/hid-microsoft.c
  45. +++ b/drivers/hid/hid-microsoft.c
  46. @@ -438,7 +438,8 @@ static const struct hid_device_id ms_devices[] = {
  47. .driver_data = MS_HIDINPUT },
  48. { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_KEYBOARD),
  49. .driver_data = MS_ERGONOMY},
  50. -
  51. + { HID_DEVICE(BUS_VIRTUAL, 0, USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_VHF),
  52. + .driver_data = MS_HIDINPUT},
  53. { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT),
  54. .driver_data = MS_PRESENTER },
  55. { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, 0x091B),
  56. diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
  57. index 03448d3a29f2..09ca4b1f2797 100644
  58. --- a/drivers/hid/hid-multitouch.c
  59. +++ b/drivers/hid/hid-multitouch.c
  60. @@ -1983,6 +1983,63 @@ static const struct hid_device_id mt_devices[] = {
  61. HID_USB_DEVICE(USB_VENDOR_ID_LG,
  62. USB_DEVICE_ID_LG_MELFAS_MT) },
  63. + /* Microsoft Touch Cover */
  64. + { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
  65. + MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
  66. + USB_DEVICE_ID_MS_TOUCH_COVER_2) },
  67. +
  68. + /* Microsoft Type Cover */
  69. + { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
  70. + MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
  71. + USB_DEVICE_ID_MS_TYPE_COVER_2) },
  72. + { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
  73. + MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
  74. + USB_DEVICE_ID_MS_TYPE_COVER_3) },
  75. + { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
  76. + MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
  77. + USB_DEVICE_ID_MS_TYPE_COVER_PRO_3) },
  78. + { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
  79. + MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
  80. + USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_1) },
  81. + { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
  82. + MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
  83. + USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2) },
  84. + { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
  85. + MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
  86. + USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) },
  87. + { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
  88. + MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
  89. + USB_DEVICE_ID_MS_TYPE_COVER_PRO_4) },
  90. + { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
  91. + MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
  92. + USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_1) },
  93. +
  94. + /* Microsoft Surface Book */
  95. + { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
  96. + MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
  97. + USB_DEVICE_ID_MS_SURFACE_BOOK) },
  98. +
  99. + /* Microsoft Surface Book 2 */
  100. + { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
  101. + MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
  102. + USB_DEVICE_ID_MS_SURFACE_BOOK_2) },
  103. +
  104. + /* Microsoft Surface Go */
  105. + { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
  106. + MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
  107. + USB_DEVICE_ID_MS_SURFACE_GO) },
  108. +
  109. + /* Microsoft Surface Laptop */
  110. + { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
  111. + HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,
  112. + USB_VENDOR_ID_MICROSOFT,
  113. + USB_DEVICE_ID_MS_SURFACE_VHF) },
  114. +
  115. + /* Microsoft Power Cover */
  116. + { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
  117. + MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
  118. + USB_DEVICE_ID_MS_POWER_COVER) },
  119. +
  120. /* MosArt panels */
  121. { .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
  122. MT_USB_DEVICE(USB_VENDOR_ID_ASUS,
  123. diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
  124. index efeeac5af633..0949e2144dc3 100644
  125. --- a/drivers/hid/hid-quirks.c
  126. +++ b/drivers/hid/hid-quirks.c
  127. @@ -113,6 +113,17 @@ static const struct hid_device_id hid_quirks[] = {
  128. { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_PRO_2), HID_QUIRK_NO_INIT_REPORTS },
  129. { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2), HID_QUIRK_NO_INIT_REPORTS },
  130. { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2), HID_QUIRK_NO_INIT_REPORTS },
  131. + { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3), HID_QUIRK_NO_INIT_REPORTS },
  132. + { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3), HID_QUIRK_NO_INIT_REPORTS },
  133. + { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_1), HID_QUIRK_NO_INIT_REPORTS },
  134. + { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2), HID_QUIRK_NO_INIT_REPORTS },
  135. + { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP), HID_QUIRK_NO_INIT_REPORTS },
  136. + { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4), HID_QUIRK_NO_INIT_REPORTS },
  137. + { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_1), HID_QUIRK_NO_INIT_REPORTS },
  138. + { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_BOOK), HID_QUIRK_NO_INIT_REPORTS },
  139. + { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_BOOK_2), HID_QUIRK_NO_INIT_REPORTS },
  140. + { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_GO), HID_QUIRK_NO_INIT_REPORTS },
  141. + { HID_DEVICE(BUS_VIRTUAL, 0, USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_VHF), HID_QUIRK_ALWAYS_POLL },
  142. { HID_USB_DEVICE(USB_VENDOR_ID_MOJO, USB_DEVICE_ID_RETRO_ADAPTER), HID_QUIRK_MULTI_INPUT },
  143. { HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL), HID_QUIRK_NO_INIT_REPORTS },
  144. { HID_USB_DEVICE(USB_VENDOR_ID_MULTIPLE_1781, USB_DEVICE_ID_RAPHNET_4NES4SNES_OLD), HID_QUIRK_MULTI_INPUT },
  145. --
  146. 2.23.0