1 files changed, 99 insertions, 8 deletions

diff --git a/drivers/platform/x86/touchscreen_dmi.c b/drivers/platform/x86/touchscreen_dmi.c
index cb204f973491..5f2d7ea912b5 100644
--- a/drivers/platform/x86/touchscreen_dmi.c
+++ b/drivers/platform/x86/touchscreen_dmi.c
@@ -42,10 +42,13 @@ static const struct ts_dmi_data chuwi_hi8_data = {
 };
 
 static const struct property_entry chuwi_hi8_pro_props[] = {
+        PROPERTY_ENTRY_U32("touchscreen-min-x", 6),
+        PROPERTY_ENTRY_U32("touchscreen-min-y", 3),
         PROPERTY_ENTRY_U32("touchscreen-size-x", 1728),
         PROPERTY_ENTRY_U32("touchscreen-size-y", 1148),
         PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
         PROPERTY_ENTRY_STRING("firmware-name", "gsl3680-chuwi-hi8-pro.fw"),
+        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
         PROPERTY_ENTRY_BOOL("silead,home-button"),
         { }
 };
@@ -56,6 +59,8 @@ static const struct ts_dmi_data chuwi_hi8_pro_data = {
 };
 
 static const struct property_entry chuwi_vi8_props[] = {
+        PROPERTY_ENTRY_U32("touchscreen-min-x", 4),
+        PROPERTY_ENTRY_U32("touchscreen-min-y", 6),
         PROPERTY_ENTRY_U32("touchscreen-size-x", 1724),
         PROPERTY_ENTRY_U32("touchscreen-size-y", 1140),
         PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
@@ -88,9 +93,9 @@ static const struct ts_dmi_data chuwi_vi10_data = {
 
 static const struct property_entry connect_tablet9_props[] = {
         PROPERTY_ENTRY_U32("touchscreen-min-x", 9),
-        PROPERTY_ENTRY_U32("touchscreen-min-y", 8),
+        PROPERTY_ENTRY_U32("touchscreen-min-y", 10),
         PROPERTY_ENTRY_U32("touchscreen-size-x", 1664),
-        PROPERTY_ENTRY_U32("touchscreen-size-y", 878),
+        PROPERTY_ENTRY_U32("touchscreen-size-y", 880),
         PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
         PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
         PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-connect-tablet9.fw"),
@@ -104,8 +109,10 @@ static const struct ts_dmi_data connect_tablet9_data = {
 };
 
 static const struct property_entry cube_iwork8_air_props[] = {
-        PROPERTY_ENTRY_U32("touchscreen-size-x", 1660),
-        PROPERTY_ENTRY_U32("touchscreen-size-y", 900),
+        PROPERTY_ENTRY_U32("touchscreen-min-x", 1),
+        PROPERTY_ENTRY_U32("touchscreen-min-y", 3),
+        PROPERTY_ENTRY_U32("touchscreen-size-x", 1664),
+        PROPERTY_ENTRY_U32("touchscreen-size-y", 896),
         PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
         PROPERTY_ENTRY_STRING("firmware-name", "gsl3670-cube-iwork8-air.fw"),
         PROPERTY_ENTRY_U32("silead,max-fingers", 10),
@@ -179,11 +186,14 @@ static const struct ts_dmi_data gp_electronic_t701_data = {
 };
 
 static const struct property_entry itworks_tw891_props[] = {
+        PROPERTY_ENTRY_U32("touchscreen-min-x", 1),
+        PROPERTY_ENTRY_U32("touchscreen-min-y", 5),
         PROPERTY_ENTRY_U32("touchscreen-size-x", 1600),
-        PROPERTY_ENTRY_U32("touchscreen-size-y", 890),
+        PROPERTY_ENTRY_U32("touchscreen-size-y", 896),
         PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
         PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
         PROPERTY_ENTRY_STRING("firmware-name", "gsl3670-itworks-tw891.fw"),
+        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
         { }
 };
 
@@ -207,8 +217,10 @@ static const struct ts_dmi_data jumper_ezpad_6_pro_data = {
 };
 
 static const struct property_entry jumper_ezpad_mini3_props[] = {
+        PROPERTY_ENTRY_U32("touchscreen-min-x", 23),
+        PROPERTY_ENTRY_U32("touchscreen-min-y", 16),
         PROPERTY_ENTRY_U32("touchscreen-size-x", 1700),
-        PROPERTY_ENTRY_U32("touchscreen-size-y", 1150),
+        PROPERTY_ENTRY_U32("touchscreen-size-y", 1138),
         PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
         PROPERTY_ENTRY_STRING("firmware-name", "gsl3676-jumper-ezpad-mini3.fw"),
         PROPERTY_ENTRY_U32("silead,max-fingers", 10),
@@ -237,6 +249,24 @@ static const struct ts_dmi_data onda_obook_20_plus_data = {
         .properties     = onda_obook_20_plus_props,
 };
 
+static const struct property_entry onda_v80_plus_v3_props[] = {
+        PROPERTY_ENTRY_U32("touchscreen-min-x", 22),
+        PROPERTY_ENTRY_U32("touchscreen-min-y", 15),
+        PROPERTY_ENTRY_U32("touchscreen-size-x", 1698),
+        PROPERTY_ENTRY_U32("touchscreen-size-y", 1140),
+        PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
+        PROPERTY_ENTRY_STRING("firmware-name",
+                              "gsl3676-onda-v80-plus-v3.fw"),
+        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
+        PROPERTY_ENTRY_BOOL("silead,home-button"),
+        { }
+};
+
+static const struct ts_dmi_data onda_v80_plus_v3_data = {
+        .acpi_name      = "MSSL1680:00",
+        .properties     = onda_v80_plus_v3_props,
+};
+
 static const struct property_entry onda_v820w_32g_props[] = {
         PROPERTY_ENTRY_U32("touchscreen-size-x", 1665),
         PROPERTY_ENTRY_U32("touchscreen-size-y", 1140),
@@ -322,11 +352,14 @@ static const struct ts_dmi_data pov_mobii_wintab_p800w_v20_data = {
 };
 
 static const struct property_entry pov_mobii_wintab_p800w_v21_props[] = {
-        PROPERTY_ENTRY_U32("touchscreen-size-x", 1800),
-        PROPERTY_ENTRY_U32("touchscreen-size-y", 1150),
+        PROPERTY_ENTRY_U32("touchscreen-min-x", 1),
+        PROPERTY_ENTRY_U32("touchscreen-min-y", 8),
+        PROPERTY_ENTRY_U32("touchscreen-size-x", 1794),
+        PROPERTY_ENTRY_U32("touchscreen-size-y", 1148),
         PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
         PROPERTY_ENTRY_STRING("firmware-name",
                               "gsl3692-pov-mobii-wintab-p800w.fw"),
+        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
         PROPERTY_ENTRY_BOOL("silead,home-button"),
         { }
 };
@@ -366,6 +399,22 @@ static const struct ts_dmi_data teclast_x98plus2_data = {
         .properties     = teclast_x98plus2_props,
 };
 
+static const struct property_entry trekstor_primebook_c11_props[] = {
+        PROPERTY_ENTRY_U32("touchscreen-size-x", 1970),
+        PROPERTY_ENTRY_U32("touchscreen-size-y", 1530),
+        PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
+        PROPERTY_ENTRY_STRING("firmware-name",
+                              "gsl1680-trekstor-primebook-c11.fw"),
+        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
+        PROPERTY_ENTRY_BOOL("silead,home-button"),
+        { }
+};
+
+static const struct ts_dmi_data trekstor_primebook_c11_data = {
+        .acpi_name      = "MSSL1680:00",
+        .properties     = trekstor_primebook_c11_props,
+};
+
 static const struct property_entry trekstor_primebook_c13_props[] = {
         PROPERTY_ENTRY_U32("touchscreen-size-x", 2624),
         PROPERTY_ENTRY_U32("touchscreen-size-y", 1920),
@@ -381,6 +430,22 @@ static const struct ts_dmi_data trekstor_primebook_c13_data = {
         .properties     = trekstor_primebook_c13_props,
 };
 
+static const struct property_entry trekstor_primetab_t13b_props[] = {
+        PROPERTY_ENTRY_U32("touchscreen-size-x", 2500),
+        PROPERTY_ENTRY_U32("touchscreen-size-y", 1900),
+        PROPERTY_ENTRY_STRING("firmware-name",
+                              "gsl1680-trekstor-primetab-t13b.fw"),
+        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
+        PROPERTY_ENTRY_BOOL("silead,home-button"),
+        PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
+        { }
+};
+
+static const struct ts_dmi_data trekstor_primetab_t13b_data = {
+        .acpi_name  = "MSSL1680:00",
+        .properties = trekstor_primetab_t13b_props,
+};
+
 static const struct property_entry trekstor_surftab_twin_10_1_props[] = {
         PROPERTY_ENTRY_U32("touchscreen-size-x", 1900),
         PROPERTY_ENTRY_U32("touchscreen-size-y", 1280),
@@ -397,6 +462,8 @@ static const struct ts_dmi_data trekstor_surftab_twin_10_1_data = {
 };
 
 static const struct property_entry trekstor_surftab_wintron70_props[] = {
+        PROPERTY_ENTRY_U32("touchscreen-min-x", 12),
+        PROPERTY_ENTRY_U32("touchscreen-min-y", 8),
         PROPERTY_ENTRY_U32("touchscreen-size-x", 884),
         PROPERTY_ENTRY_U32("touchscreen-size-y", 632),
         PROPERTY_ENTRY_STRING("firmware-name",
@@ -556,6 +623,14 @@ static const struct dmi_system_id touchscreen_dmi_table[] = {
                 },
         },
         {
+                /* ONDA V80 plus v3 (P80PSBG9V3A01501) */
+                .driver_data = (void *)&onda_v80_plus_v3_data,
+                .matches = {
+                        DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ONDA"),
+                        DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "V80 PLUS")
+                },
+        },
+        {
                 /* ONDA V820w DualOS */
                 .driver_data = (void *)&onda_v820w_32g_data,
                 .matches = {
@@ -641,6 +716,14 @@ static const struct dmi_system_id touchscreen_dmi_table[] = {
                 },
         },
         {
+                /* Trekstor Primebook C11 */
+                .driver_data = (void *)&trekstor_primebook_c11_data,
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "TREKSTOR"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Primebook C11"),
+                },
+        },
+        {
                 /* Trekstor Primebook C13 */
                 .driver_data = (void *)&trekstor_primebook_c13_data,
                 .matches = {
@@ -649,6 +732,14 @@ static const struct dmi_system_id touchscreen_dmi_table[] = {
                 },
         },
         {
+                /* Trekstor Primetab T13B */
+                .driver_data = (void *)&trekstor_primetab_t13b_data,
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "TREKSTOR"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Primetab T13B"),
+                },
+        },
+        {
                 /* TrekStor SurfTab twin 10.1 ST10432-8 */
                 .driver_data = (void *)&trekstor_surftab_twin_10_1_data,
                 .matches = {