Merge tag 'platform-drivers-x86-goodix-v5.14-1' into review-hans

Signed tag for the immutable platform-drivers-x86-goodix branch for merging into the input subsystem.

diff --combined drivers/platform/x86/touchscreen_dmi.c
index 455a8302773ad635fa43bfd1bc6ac9dcc77b7a92,d2bbec310726b32e5b5132cd080bb5c380e92a21..0e1451b1d9c6cde93ee3f95e5af26bd6edcd85e3
--- 1/drivers/platform/x86/touchscreen_dmi.c
--- 2/drivers/platform/x86/touchscreen_dmi.c
+++ b/drivers/platform/x86/touchscreen_dmi.c
@@@ -115,32 -115,6 +115,32 @@@ static const struct ts_dmi_data chuwi_h
        .properties     = chuwi_hi10_plus_props,
  };
  
 +static const struct property_entry chuwi_hi10_pro_props[] = {
 +      PROPERTY_ENTRY_U32("touchscreen-min-x", 8),
 +      PROPERTY_ENTRY_U32("touchscreen-min-y", 8),
 +      PROPERTY_ENTRY_U32("touchscreen-size-x", 1912),
 +      PROPERTY_ENTRY_U32("touchscreen-size-y", 1272),
 +      PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
 +      PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-chuwi-hi10-pro.fw"),
 +      PROPERTY_ENTRY_U32("silead,max-fingers", 10),
 +      PROPERTY_ENTRY_BOOL("silead,home-button"),
 +      { }
 +};
 +
 +static const struct ts_dmi_data chuwi_hi10_pro_data = {
 +      .embedded_fw = {
 +              .name   = "silead/gsl1680-chuwi-hi10-pro.fw",
 +              .prefix = { 0xf0, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 },
 +              .length = 42504,
 +              .sha256 = { 0xdb, 0x92, 0x68, 0xa8, 0xdb, 0x81, 0x31, 0x00,
 +                          0x1f, 0x58, 0x89, 0xdb, 0x19, 0x1b, 0x15, 0x8c,
 +                          0x05, 0x14, 0xf4, 0x95, 0xba, 0x15, 0x45, 0x98,
 +                          0x42, 0xa3, 0xbb, 0x65, 0xe3, 0x30, 0xa5, 0x93 },
 +      },
 +      .acpi_name      = "MSSL1680:00",
 +      .properties     = chuwi_hi10_pro_props,
 +};
 +
  static const struct property_entry chuwi_vi8_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-min-x", 4),
        PROPERTY_ENTRY_U32("touchscreen-min-y", 6),
@@@ -299,6 -273,35 +299,35 @@@ static const struct ts_dmi_data estar_b
        .properties     = estar_beauty_hd_props,
  };
  
+ /* Generic props + data for upside-down mounted GDIX1001 touchscreens */
+ static const struct property_entry gdix1001_upside_down_props[] = {
+       PROPERTY_ENTRY_BOOL("touchscreen-inverted-x"),
+       PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
+       { }
+ };
+ 
+ static const struct ts_dmi_data gdix1001_00_upside_down_data = {
+       .acpi_name      = "GDIX1001:00",
+       .properties     = gdix1001_upside_down_props,
+ };
+ 
+ static const struct ts_dmi_data gdix1001_01_upside_down_data = {
+       .acpi_name      = "GDIX1001:01",
+       .properties     = gdix1001_upside_down_props,
+ };
+ 
+ static const struct property_entry glavey_tm800a550l_props[] = {
+       PROPERTY_ENTRY_STRING("firmware-name", "gt912-glavey-tm800a550l.fw"),
+       PROPERTY_ENTRY_STRING("goodix,config-name", "gt912-glavey-tm800a550l.cfg"),
+       PROPERTY_ENTRY_U32("goodix,main-clk", 54),
+       { }
+ };
+ 
+ static const struct ts_dmi_data glavey_tm800a550l_data = {
+       .acpi_name      = "GDIX1001:00",
+       .properties     = glavey_tm800a550l_props,
+ };
+ 
  static const struct property_entry gp_electronic_t701_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-size-x", 960),
        PROPERTY_ENTRY_U32("touchscreen-size-y", 640),
@@@ -941,15 -944,6 +970,15 @@@ const struct dmi_system_id touchscreen_
                        DMI_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"),
                },
        },
 +      {
 +              /* Chuwi Hi10 Pro (CWI529) */
 +              .driver_data = (void *)&chuwi_hi10_pro_data,
 +              .matches = {
 +                      DMI_MATCH(DMI_BOARD_VENDOR, "Hampoo"),
 +                      DMI_MATCH(DMI_PRODUCT_NAME, "Hi10 pro tablet"),
 +                      DMI_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"),
 +              },
 +      },
        {
                /* Chuwi Vi8 (CWI506) */
                .driver_data = (void *)&chuwi_vi8_data,
@@@ -1038,6 -1032,15 +1067,15 @@@
                        DMI_MATCH(DMI_PRODUCT_NAME, "eSTAR BEAUTY HD Intel Quad core"),
                },
        },
+       {       /* Glavey TM800A550L */
+               .driver_data = (void *)&glavey_tm800a550l_data,
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"),
+                       DMI_MATCH(DMI_BOARD_NAME, "Aptio CRB"),
+                       /* Above strings are too generic, also match on BIOS version */
+                       DMI_MATCH(DMI_BIOS_VERSION, "ZY-8-BI-PX4S70VTR400-X423B-005-D"),
+               },
+       },
        {
                /* GP-electronic T701 */
                .driver_data = (void *)&gp_electronic_t701_data,
@@@ -1131,14 -1134,6 +1169,14 @@@
                        DMI_MATCH(DMI_BIOS_VERSION, "jumperx.T87.KFBNEEA"),
                },
        },
 +      {
 +              /* Mediacom WinPad 7.0 W700 (same hw as Wintron surftab 7") */
 +              .driver_data = (void *)&trekstor_surftab_wintron70_data,
 +              .matches = {
 +                      DMI_MATCH(DMI_SYS_VENDOR, "MEDIACOM"),
 +                      DMI_MATCH(DMI_PRODUCT_NAME, "WinPad 7 W10 - WPW700"),
 +              },
 +      },
        {
                /* Mediacom Flexbook Edge 11 (same hw as TS Primebook C11) */
                .driver_data = (void *)&trekstor_primebook_c11_data,
@@@ -1330,6 -1325,24 +1368,24 @@@
                        DMI_MATCH(DMI_BOARD_NAME, "X3 Plus"),
                },
        },
+       {
+               /* Teclast X89 (Android version / BIOS) */
+               .driver_data = (void *)&gdix1001_00_upside_down_data,
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "WISKY"),
+                       DMI_MATCH(DMI_BOARD_NAME, "3G062i"),
+               },
+       },
+       {
+               /* Teclast X89 (Windows version / BIOS) */
+               .driver_data = (void *)&gdix1001_01_upside_down_data,
+               .matches = {
+                       /* tPAD is too generic, also match on bios date */
+                       DMI_MATCH(DMI_BOARD_VENDOR, "TECLAST"),
+                       DMI_MATCH(DMI_BOARD_NAME, "tPAD"),
+                       DMI_MATCH(DMI_BIOS_DATE, "12/19/2014"),
+               },
+       },
        {
                /* Teclast X98 Plus II */
                .driver_data = (void *)&teclast_x98plus2_data,
@@@ -1338,6 -1351,19 +1394,19 @@@
                        DMI_MATCH(DMI_PRODUCT_NAME, "X98 Plus II"),
                },
        },
+       {
+               /* Teclast X98 Pro */
+               .driver_data = (void *)&gdix1001_00_upside_down_data,
+               .matches = {
+                       /*
+                        * Only match BIOS date, because the manufacturers
+                        * BIOS does not report the board name at all
+                        * (sometimes)...
+                        */
+                       DMI_MATCH(DMI_BOARD_VENDOR, "TECLAST"),
+                       DMI_MATCH(DMI_BIOS_DATE, "10/28/2015"),
+               },
+       },
        {
                /* Trekstor Primebook C11 */
                .driver_data = (void *)&trekstor_primebook_c11_data,
@@@ -1413,6 -1439,22 +1482,22 @@@
                        DMI_MATCH(DMI_PRODUCT_NAME, "VINGA Twizzle J116"),
                },
        },
+       {
+               /* "WinBook TW100" */
+               .driver_data = (void *)&gdix1001_00_upside_down_data,
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "WinBook"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TW100")
+               }
+       },
+       {
+               /* WinBook TW700 */
+               .driver_data = (void *)&gdix1001_00_upside_down_data,
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "WinBook"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TW700")
+               },
+       },
        {
                /* Yours Y8W81, same case and touchscreen as Chuwi Vi8 */
                .driver_data = (void *)&chuwi_vi8_data,