1 files changed, 79 insertions, 0 deletions

diff --git a/drivers/platform/x86/touchscreen_dmi.c b/drivers/platform/x86/touchscreen_dmi.c
index 8c5d47c0aea6..2d56ff7c8230 100644
--- a/drivers/platform/x86/touchscreen_dmi.c
+++ b/drivers/platform/x86/touchscreen_dmi.c
@@ -41,6 +41,20 @@ static const struct ts_dmi_data chuwi_hi8_data = {
         .properties     = chuwi_hi8_props,
 };
 
+static const struct property_entry chuwi_hi8_air_props[] = {
+        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", "gsl3676-chuwi-hi8-air.fw"),
+        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
+        { }
+};
+
+static const struct ts_dmi_data chuwi_hi8_air_data = {
+        .acpi_name      = "MSSL1680:00",
+        .properties     = chuwi_hi8_air_props,
+};
+
 static const struct property_entry chuwi_hi8_pro_props[] = {
         PROPERTY_ENTRY_U32("touchscreen-min-x", 6),
         PROPERTY_ENTRY_U32("touchscreen-min-y", 3),
@@ -58,6 +72,25 @@ static const struct ts_dmi_data chuwi_hi8_pro_data = {
         .properties     = chuwi_hi8_pro_props,
 };
 
+static const struct property_entry chuwi_hi10_air_props[] = {
+        PROPERTY_ENTRY_U32("touchscreen-size-x", 1981),
+        PROPERTY_ENTRY_U32("touchscreen-size-y", 1271),
+        PROPERTY_ENTRY_U32("touchscreen-min-x", 99),
+        PROPERTY_ENTRY_U32("touchscreen-min-y", 9),
+        PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
+        PROPERTY_ENTRY_U32("touchscreen-fuzz-x", 5),
+        PROPERTY_ENTRY_U32("touchscreen-fuzz-y", 4),
+        PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-chuwi-hi10-air.fw"),
+        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
+        PROPERTY_ENTRY_BOOL("silead,home-button"),
+        { }
+};
+
+static const struct ts_dmi_data chuwi_hi10_air_data = {
+        .acpi_name      = "MSSL1680:00",
+        .properties     = chuwi_hi10_air_props,
+};
+
 static const struct property_entry chuwi_vi8_props[] = {
         PROPERTY_ENTRY_U32("touchscreen-min-x", 4),
         PROPERTY_ENTRY_U32("touchscreen-min-y", 6),
@@ -369,6 +402,24 @@ static const struct ts_dmi_data pov_mobii_wintab_p800w_v21_data = {
         .properties     = pov_mobii_wintab_p800w_v21_props,
 };
 
+static const struct property_entry pov_mobii_wintab_p1006w_v10_props[] = {
+        PROPERTY_ENTRY_U32("touchscreen-min-x", 1),
+        PROPERTY_ENTRY_U32("touchscreen-min-y", 3),
+        PROPERTY_ENTRY_U32("touchscreen-size-x", 1984),
+        PROPERTY_ENTRY_U32("touchscreen-size-y", 1520),
+        PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
+        PROPERTY_ENTRY_STRING("firmware-name",
+                              "gsl3692-pov-mobii-wintab-p1006w-v10.fw"),
+        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
+        PROPERTY_ENTRY_BOOL("silead,home-button"),
+        { }
+};
+
+static const struct ts_dmi_data pov_mobii_wintab_p1006w_v10_data = {
+        .acpi_name      = "MSSL1680:00",
+        .properties     = pov_mobii_wintab_p1006w_v10_props,
+};
+
 static const struct property_entry teclast_x3_plus_props[] = {
         PROPERTY_ENTRY_U32("touchscreen-size-x", 1980),
         PROPERTY_ENTRY_U32("touchscreen-size-y", 1500),
@@ -498,6 +549,15 @@ static const struct dmi_system_id touchscreen_dmi_table[] = {
                 },
         },
         {
+                /* Chuwi Hi8 Air (CWI543) */
+                .driver_data = (void *)&chuwi_hi8_air_data,
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "Default string"),
+                        DMI_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Hi8 Air"),
+                },
+        },
+        {
                 /* Chuwi Hi8 Pro (CWI513) */
                 .driver_data = (void *)&chuwi_hi8_pro_data,
                 .matches = {
@@ -506,6 +566,14 @@ static const struct dmi_system_id touchscreen_dmi_table[] = {
                 },
         },
         {
+                /* Chuwi Hi10 Air */
+                .driver_data = (void *)&chuwi_hi10_air_data,
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "Hampoo"),
+                        DMI_MATCH(DMI_PRODUCT_SKU, "P1W6_C109D_B"),
+                },
+        },
+        {
                 /* Chuwi Vi8 (CWI506) */
                 .driver_data = (void *)&chuwi_vi8_data,
                 .matches = {
@@ -707,6 +775,17 @@ static const struct dmi_system_id touchscreen_dmi_table[] = {
                 },
         },
         {
+                /* Point of View mobii wintab p1006w (v1.0) */
+                .driver_data = (void *)&pov_mobii_wintab_p1006w_v10_data,
+                .matches = {
+                        DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Insyde"),
+                        DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "BayTrail"),
+                        /* Note 105b is Foxcon's USB/PCI vendor id */
+                        DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "105B"),
+                        DMI_EXACT_MATCH(DMI_BOARD_NAME, "0E57"),
+                },
+        },
+        {
                 /* Teclast X3 Plus */
                 .driver_data = (void *)&teclast_x3_plus_data,
                 .matches = {