From: Greg Kroah-Hartman Date: Tue, 11 Apr 2017 14:36:07 +0000 (+0200) Subject: drop some surface touch patches X-Git-Tag: v4.4.61~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6e5ed01a55a169461bb1272c0dcfdf2d014cfd89;p=thirdparty%2Fkernel%2Fstable-queue.git drop some surface touch patches --- diff --git a/queue-4.10/hid-multitouch-enable-the-surface-4-type-cover-pro-jp-to-report-multitouch-data.patch b/queue-4.10/hid-multitouch-enable-the-surface-4-type-cover-pro-jp-to-report-multitouch-data.patch deleted file mode 100644 index c46197eefcd..00000000000 --- a/queue-4.10/hid-multitouch-enable-the-surface-4-type-cover-pro-jp-to-report-multitouch-data.patch +++ /dev/null @@ -1,80 +0,0 @@ -From foo@baz Mon Apr 10 18:08:16 CEST 2017 -From: alexander.levin@verizon.com -Date: Tue, 4 Apr 2017 19:32:16 +0000 -Subject: HID: multitouch: enable the Surface 4 Type Cover Pro (JP) to report multitouch data -To: "gregkh@linuxfoundation.org" -Cc: "stable@vger.kernel.org" -Message-ID: <20170404193158.19041-39-alexander.levin@verizon.com> - -From: Yuta Kobayashi - -[ Upstream commit 4fed0231994b27b3896bc63885ac66d02fff625b ] - -Since commit 8fe89ef076fa1 ("HID: multitouch: enable the Surface 3 Type -Cover to report multitouch data"), the TypeCover can be properly handled -by hid-multitouch and don't require any special quirk in the kernel. - -Remove the support of the Surface 4 Type Cover Pro (JP) from -hid-microsoft so it can properly report multitouch from the touchpad. - -Signed-off-by: Yuta Kobayashi -Reviewed-by: Benjamin Tissoires -Signed-off-by: Jiri Kosina -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/hid/hid-core.c | 2 -- - drivers/hid/hid-ids.h | 1 - - drivers/hid/hid-microsoft.c | 2 -- - drivers/hid/usbhid/hid-quirks.c | 1 - - 4 files changed, 6 deletions(-) - ---- a/drivers/hid/hid-core.c -+++ b/drivers/hid/hid-core.c -@@ -729,7 +729,6 @@ static void hid_scan_collection(struct h - hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP || - hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4 || - hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2 || -- hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP || - hid->product == USB_DEVICE_ID_MS_POWER_COVER) && - hid->group == HID_GROUP_MULTITOUCH) - hid->group = HID_GROUP_GENERIC; -@@ -1990,7 +1989,6 @@ static const struct hid_device_id hid_ha - { 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_PRO_4) }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2) }, -- { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP) }, - { 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) }, ---- a/drivers/hid/hid-ids.h -+++ b/drivers/hid/hid-ids.h -@@ -730,7 +730,6 @@ - #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP 0x07dd - #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4 0x07e4 - #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2 0x07e8 --#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP 0x07e9 - #define USB_DEVICE_ID_MS_POWER_COVER 0x07da - - #define USB_VENDOR_ID_MOJO 0x8282 ---- a/drivers/hid/hid-microsoft.c -+++ b/drivers/hid/hid-microsoft.c -@@ -284,8 +284,6 @@ static const struct hid_device_id ms_dev - .driver_data = MS_HIDINPUT }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2), - .driver_data = MS_HIDINPUT }, -- { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP), -- .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), ---- a/drivers/hid/usbhid/hid-quirks.c -+++ b/drivers/hid/usbhid/hid-quirks.c -@@ -108,7 +108,6 @@ static const struct hid_blacklist { - { 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_PRO_4, HID_QUIRK_NO_INIT_REPORTS }, - { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2, HID_QUIRK_NO_INIT_REPORTS }, -- { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_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_GT683R_LED_PANEL, HID_QUIRK_NO_INIT_REPORTS }, - { USB_VENDOR_ID_NEXIO, USB_DEVICE_ID_NEXIO_MULTITOUCH_PTI0750, HID_QUIRK_NO_INIT_REPORTS }, diff --git a/queue-4.10/series b/queue-4.10/series index 9b1a7042557..58039737f19 100644 --- a/queue-4.10/series +++ b/queue-4.10/series @@ -65,7 +65,6 @@ documentation-stable-kernel-rules-fix-stable-tag-format.patch mm-mempolicy.c-fix-error-handling-in-set_mempolicy-and-mbind.patch random-use-chacha20-for-get_random_int-long.patch kvm-fix-page-struct-leak-in-handle_vmon.patch -hid-multitouch-enable-the-surface-4-type-cover-pro-jp-to-report-multitouch-data.patch drm-edid-constify-edid-quirk-list.patch drm-i915-fix-intel_bdw_ids-definition.patch drm-i915-more-.is_mobile-cleanups-for-bdw.patch diff --git a/queue-4.9/hid-microsoft-add-surface-4-type-cover-pro-4-not-jp-versions.patch b/queue-4.9/hid-microsoft-add-surface-4-type-cover-pro-4-not-jp-versions.patch deleted file mode 100644 index 36b3b39634e..00000000000 --- a/queue-4.9/hid-microsoft-add-surface-4-type-cover-pro-4-not-jp-versions.patch +++ /dev/null @@ -1,84 +0,0 @@ -From foo@baz Mon Apr 10 17:43:56 CEST 2017 -From: alexander.levin@verizon.com -Date: Tue, 4 Apr 2017 19:32:16 +0000 -Subject: HID: microsoft: Add Surface 4 type cover pro 4 not JP versions -To: "gregkh@linuxfoundation.org" -Cc: "stable@vger.kernel.org" -Message-ID: <20170404193158.19041-38-alexander.levin@verizon.com> - -From: Daniel Keller - -[ Upstream commit 2ae3986b84e9d325bc92a1efbcf0c6b0f5016b35 ] - -Adding support for not JP versions of the Microsoft Surface 4 Type Cover Pro - -[jkosina@suse.cz: The identical patch has been sent by Jeff Farthing, so I am - including his signoff as well] - -Signed-off-by: Jeff Farthing -Signed-off-by: Daniel Keller -Signed-off-by: Jiri Kosina -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/hid/hid-core.c | 4 ++++ - drivers/hid/hid-ids.h | 2 ++ - drivers/hid/hid-microsoft.c | 4 ++++ - drivers/hid/usbhid/hid-quirks.c | 2 ++ - 4 files changed, 12 insertions(+) - ---- a/drivers/hid/hid-core.c -+++ b/drivers/hid/hid-core.c -@@ -727,6 +727,8 @@ static void hid_scan_collection(struct h - (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_PRO_4 || -+ hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2 || - hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP || - hid->product == USB_DEVICE_ID_MS_POWER_COVER) && - hid->group == HID_GROUP_MULTITOUCH) -@@ -1982,6 +1984,8 @@ static const struct hid_device_id hid_ha - { 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_PRO_4) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2) }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP) }, - { 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) }, ---- a/drivers/hid/hid-ids.h -+++ b/drivers/hid/hid-ids.h -@@ -723,6 +723,8 @@ - #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_PRO_4 0x07e4 -+#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2 0x07e8 - #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP 0x07e9 - #define USB_DEVICE_ID_MS_POWER_COVER 0x07da - ---- a/drivers/hid/hid-microsoft.c -+++ b/drivers/hid/hid-microsoft.c -@@ -280,6 +280,10 @@ static const struct hid_device_id ms_dev - .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_PRO_4), -+ .driver_data = MS_HIDINPUT }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2), -+ .driver_data = MS_HIDINPUT }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP), - .driver_data = MS_HIDINPUT }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER), ---- a/drivers/hid/usbhid/hid-quirks.c -+++ b/drivers/hid/usbhid/hid-quirks.c -@@ -104,6 +104,8 @@ 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_PRO_4, HID_QUIRK_NO_INIT_REPORTS }, -+ { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2, HID_QUIRK_NO_INIT_REPORTS }, - { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_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_GT683R_LED_PANEL, HID_QUIRK_NO_INIT_REPORTS }, diff --git a/queue-4.9/hid-multitouch-enable-the-surface-4-type-cover-pro-jp-to-report-multitouch-data.patch b/queue-4.9/hid-multitouch-enable-the-surface-4-type-cover-pro-jp-to-report-multitouch-data.patch deleted file mode 100644 index 56fbb28a6f8..00000000000 --- a/queue-4.9/hid-multitouch-enable-the-surface-4-type-cover-pro-jp-to-report-multitouch-data.patch +++ /dev/null @@ -1,80 +0,0 @@ -From foo@baz Mon Apr 10 17:43:56 CEST 2017 -From: alexander.levin@verizon.com -Date: Tue, 4 Apr 2017 19:32:16 +0000 -Subject: HID: multitouch: enable the Surface 4 Type Cover Pro (JP) to report multitouch data -To: "gregkh@linuxfoundation.org" -Cc: "stable@vger.kernel.org" -Message-ID: <20170404193158.19041-39-alexander.levin@verizon.com> - -From: Yuta Kobayashi - -[ Upstream commit 4fed0231994b27b3896bc63885ac66d02fff625b ] - -Since commit 8fe89ef076fa1 ("HID: multitouch: enable the Surface 3 Type -Cover to report multitouch data"), the TypeCover can be properly handled -by hid-multitouch and don't require any special quirk in the kernel. - -Remove the support of the Surface 4 Type Cover Pro (JP) from -hid-microsoft so it can properly report multitouch from the touchpad. - -Signed-off-by: Yuta Kobayashi -Reviewed-by: Benjamin Tissoires -Signed-off-by: Jiri Kosina -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/hid/hid-core.c | 2 -- - drivers/hid/hid-ids.h | 1 - - drivers/hid/hid-microsoft.c | 2 -- - drivers/hid/usbhid/hid-quirks.c | 1 - - 4 files changed, 6 deletions(-) - ---- a/drivers/hid/hid-core.c -+++ b/drivers/hid/hid-core.c -@@ -729,7 +729,6 @@ static void hid_scan_collection(struct h - hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP || - hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4 || - hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2 || -- hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP || - hid->product == USB_DEVICE_ID_MS_POWER_COVER) && - hid->group == HID_GROUP_MULTITOUCH) - hid->group = HID_GROUP_GENERIC; -@@ -1986,7 +1985,6 @@ static const struct hid_device_id hid_ha - { 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_PRO_4) }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2) }, -- { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP) }, - { 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) }, ---- a/drivers/hid/hid-ids.h -+++ b/drivers/hid/hid-ids.h -@@ -725,7 +725,6 @@ - #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP 0x07dd - #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4 0x07e4 - #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2 0x07e8 --#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP 0x07e9 - #define USB_DEVICE_ID_MS_POWER_COVER 0x07da - - #define USB_VENDOR_ID_MOJO 0x8282 ---- a/drivers/hid/hid-microsoft.c -+++ b/drivers/hid/hid-microsoft.c -@@ -284,8 +284,6 @@ static const struct hid_device_id ms_dev - .driver_data = MS_HIDINPUT }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2), - .driver_data = MS_HIDINPUT }, -- { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP), -- .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), ---- a/drivers/hid/usbhid/hid-quirks.c -+++ b/drivers/hid/usbhid/hid-quirks.c -@@ -106,7 +106,6 @@ static const struct hid_blacklist { - { 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_PRO_4, HID_QUIRK_NO_INIT_REPORTS }, - { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2, HID_QUIRK_NO_INIT_REPORTS }, -- { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_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_GT683R_LED_PANEL, HID_QUIRK_NO_INIT_REPORTS }, - { USB_VENDOR_ID_NEXIO, USB_DEVICE_ID_NEXIO_MULTITOUCH_PTI0750, HID_QUIRK_NO_INIT_REPORTS }, diff --git a/queue-4.9/series b/queue-4.9/series index cb506def028..46bd9c22271 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -82,8 +82,6 @@ alsa-usb-audio-add-implicit-fb-quirk-for-axe-fx-ii.patch pci-expand-vpd-access-disabled-quirk-message.patch alsa-usb-audio-add-native-dsd-support-for-teac-501-503-dac.patch platform-x86-acer-wmi-only-supports-amw0_guid1-on-acer-family.patch -hid-microsoft-add-surface-4-type-cover-pro-4-not-jp-versions.patch -hid-multitouch-enable-the-surface-4-type-cover-pro-jp-to-report-multitouch-data.patch nvme-simplify-stripe-quirk.patch acpi-sysfs-provide-quirk-mechanism-to-prevent-gpe-flooding.patch hid-usbhid-add-quirk-for-the-futaba-tosd-5711bb-vfd.patch