]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop platform-x86-touchscreen_dmi-add-upside-down-quirk-for-gdix1002-ts-on-the-juno...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 13 May 2023 08:08:40 +0000 (17:08 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 13 May 2023 08:08:40 +0000 (17:08 +0900)
from 4.19 and 5.4

queue-4.19/platform-x86-touchscreen_dmi-add-info-for-the-dexp-ursus-kx210i.patch
queue-4.19/platform-x86-touchscreen_dmi-add-upside-down-quirk-for-gdix1002-ts-on-the-juno-tablet.patch [deleted file]
queue-4.19/series
queue-5.4/platform-x86-touchscreen_dmi-add-info-for-the-dexp-ursus-kx210i.patch
queue-5.4/platform-x86-touchscreen_dmi-add-upside-down-quirk-for-gdix1002-ts-on-the-juno-tablet.patch [deleted file]
queue-5.4/series

index 4ac5a479d412dd122010fa1e17f1f992813f8bb9..52cf9193854eeca5cf5f3c8c381608d5adf6b2e6 100644 (file)
@@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  static const struct property_entry digma_citi_e200_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-size-x", 1980),
        PROPERTY_ENTRY_U32("touchscreen-size-y", 1500),
-@@ -508,6 +524,14 @@ static const struct dmi_system_id touchs
+@@ -503,6 +519,14 @@ static const struct dmi_system_id touchs
                },
        },
        {
diff --git a/queue-4.19/platform-x86-touchscreen_dmi-add-upside-down-quirk-for-gdix1002-ts-on-the-juno-tablet.patch b/queue-4.19/platform-x86-touchscreen_dmi-add-upside-down-quirk-for-gdix1002-ts-on-the-juno-tablet.patch
deleted file mode 100644 (file)
index e4d8cb2..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From 6abfa99ce52f61a31bcfc2aaaae09006f5665495 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Fri, 5 May 2023 23:03:23 +0200
-Subject: platform/x86: touchscreen_dmi: Add upside-down quirk for GDIX1002 ts on the Juno Tablet
-
-From: Hans de Goede <hdegoede@redhat.com>
-
-commit 6abfa99ce52f61a31bcfc2aaaae09006f5665495 upstream.
-
-The Juno Computers Juno Tablet has an upside-down mounted Goodix
-touchscreen. Add a quirk to invert both axis to correct for this.
-
-Link: https://junocomputers.com/us/product/juno-tablet/
-Cc: stable@vger.kernel.org
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Link: https://lore.kernel.org/r/20230505210323.43177-1-hdegoede@redhat.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/platform/x86/touchscreen_dmi.c |   17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
---- a/drivers/platform/x86/touchscreen_dmi.c
-+++ b/drivers/platform/x86/touchscreen_dmi.c
-@@ -173,6 +173,11 @@ static const struct ts_dmi_data estar_be
-       .properties     = estar_beauty_hd_props,
- };
-+static const struct ts_dmi_data gdix1002_00_upside_down_data = {
-+      .acpi_name      = "GDIX1002:00",
-+      .properties     = gdix1001_upside_down_props,
-+};
-+
- static const struct property_entry gp_electronic_t701_props[] = {
-       PROPERTY_ENTRY_U32("touchscreen-size-x", 960),
-       PROPERTY_ENTRY_U32("touchscreen-size-y", 640),
-@@ -696,6 +701,18 @@ static const struct dmi_system_id touchs
-               },
-       },
-       {
-+              /* Juno Tablet */
-+              .driver_data = (void *)&gdix1002_00_upside_down_data,
-+              .matches = {
-+                      DMI_MATCH(DMI_SYS_VENDOR, "Default string"),
-+                      /* Both product- and board-name being "Default string" is somewhat rare */
-+                      DMI_MATCH(DMI_PRODUCT_NAME, "Default string"),
-+                      DMI_MATCH(DMI_BOARD_NAME, "Default string"),
-+                      /* Above matches are too generic, add partial bios-version match */
-+                      DMI_MATCH(DMI_BIOS_VERSION, "JP2V1."),
-+              },
-+      },
-+      {
-               /* Yours Y8W81, same case and touchscreen as Chuwi Vi8 */
-               .driver_data = (void *)&chuwi_vi8_data,
-               .matches = {
index eeadb92da12832cff610c5b4c8f46887b97cf93e..f2bfc4780e6347d73e0450b6832f2540c57c177d 100644 (file)
@@ -167,7 +167,6 @@ perf-symbols-fix-return-incorrect-build_id-size-in-e.patch
 btrfs-fix-btrfs_prev_leaf-to-not-return-the-same-key-twice.patch
 btrfs-print-tree-parent-bytenr-must-be-aligned-to-sector-size.patch
 cifs-fix-pcchunk-length-type-in-smb2_copychunk_range.patch
-platform-x86-touchscreen_dmi-add-upside-down-quirk-for-gdix1002-ts-on-the-juno-tablet.patch
 platform-x86-touchscreen_dmi-add-info-for-the-dexp-ursus-kx210i.patch
 sh-math-emu-fix-macro-redefined-warning.patch
 sh-init-use-of_early_flattree-for-early-init.patch
index 9c67160583f6c13a5515c9857956659e10ac2beb..5d3cbd78ec55e029b01b4120be7540ddcfb8dc1e 100644 (file)
@@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  static const struct property_entry digma_citi_e200_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-size-x", 1980),
        PROPERTY_ENTRY_U32("touchscreen-size-y", 1500),
-@@ -779,6 +795,14 @@ static const struct dmi_system_id touchs
+@@ -774,6 +790,14 @@ static const struct dmi_system_id touchs
                },
        },
        {
diff --git a/queue-5.4/platform-x86-touchscreen_dmi-add-upside-down-quirk-for-gdix1002-ts-on-the-juno-tablet.patch b/queue-5.4/platform-x86-touchscreen_dmi-add-upside-down-quirk-for-gdix1002-ts-on-the-juno-tablet.patch
deleted file mode 100644 (file)
index a39dba8..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From 6abfa99ce52f61a31bcfc2aaaae09006f5665495 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Fri, 5 May 2023 23:03:23 +0200
-Subject: platform/x86: touchscreen_dmi: Add upside-down quirk for GDIX1002 ts on the Juno Tablet
-
-From: Hans de Goede <hdegoede@redhat.com>
-
-commit 6abfa99ce52f61a31bcfc2aaaae09006f5665495 upstream.
-
-The Juno Computers Juno Tablet has an upside-down mounted Goodix
-touchscreen. Add a quirk to invert both axis to correct for this.
-
-Link: https://junocomputers.com/us/product/juno-tablet/
-Cc: stable@vger.kernel.org
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Link: https://lore.kernel.org/r/20230505210323.43177-1-hdegoede@redhat.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/platform/x86/touchscreen_dmi.c |   17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
---- a/drivers/platform/x86/touchscreen_dmi.c
-+++ b/drivers/platform/x86/touchscreen_dmi.c
-@@ -258,6 +258,11 @@ static const struct ts_dmi_data estar_be
-       .properties     = estar_beauty_hd_props,
- };
-+static const struct ts_dmi_data gdix1002_00_upside_down_data = {
-+      .acpi_name      = "GDIX1002:00",
-+      .properties     = gdix1001_upside_down_props,
-+};
-+
- static const struct property_entry gp_electronic_t701_props[] = {
-       PROPERTY_ENTRY_U32("touchscreen-size-x", 960),
-       PROPERTY_ENTRY_U32("touchscreen-size-y", 640),
-@@ -864,6 +869,18 @@ static const struct dmi_system_id touchs
-               },
-       },
-       {
-+              /* Juno Tablet */
-+              .driver_data = (void *)&gdix1002_00_upside_down_data,
-+              .matches = {
-+                      DMI_MATCH(DMI_SYS_VENDOR, "Default string"),
-+                      /* Both product- and board-name being "Default string" is somewhat rare */
-+                      DMI_MATCH(DMI_PRODUCT_NAME, "Default string"),
-+                      DMI_MATCH(DMI_BOARD_NAME, "Default string"),
-+                      /* Above matches are too generic, add partial bios-version match */
-+                      DMI_MATCH(DMI_BIOS_VERSION, "JP2V1."),
-+              },
-+      },
-+      {
-               /* Mediacom WinPad 7.0 W700 (same hw as Wintron surftab 7") */
-               .driver_data = (void *)&trekstor_surftab_wintron70_data,
-               .matches = {
index 97c8e91c62f0769176be5bec50e7a6f70d26fc5a..af63e98113565e4845a02c5316e9f19d5eab8932 100644 (file)
@@ -241,7 +241,6 @@ btrfs-fix-btrfs_prev_leaf-to-not-return-the-same-key-twice.patch
 btrfs-don-t-free-qgroup-space-unless-specified.patch
 btrfs-print-tree-parent-bytenr-must-be-aligned-to-sector-size.patch
 cifs-fix-pcchunk-length-type-in-smb2_copychunk_range.patch
-platform-x86-touchscreen_dmi-add-upside-down-quirk-for-gdix1002-ts-on-the-juno-tablet.patch
 platform-x86-touchscreen_dmi-add-info-for-the-dexp-ursus-kx210i.patch
 inotify-avoid-reporting-event-with-invalid-wd.patch
 sh-math-emu-fix-macro-redefined-warning.patch