platform/x86: silead_dmi: Sort entries alphabetically
[sfrench/cifs-2.6.git] / drivers / platform / x86 / silead_dmi.c
index 1f0246e69967f6f0d31bbad2d406d6a35262a6c3..e466e6d8226f66eccebc8d27e35fcb4eeed2482e 100644 (file)
@@ -25,46 +25,63 @@ struct silead_ts_dmi_data {
        const struct property_entry *properties;
 };
 
-static const struct property_entry cube_iwork8_air_props[] = {
-       PROPERTY_ENTRY_U32("touchscreen-size-x", 1660),
-       PROPERTY_ENTRY_U32("touchscreen-size-y", 900),
+/* NOTE: Please keep all entries sorted alphabetically */
+
+static const struct property_entry chuwi_hi8_props[] = {
+       PROPERTY_ENTRY_U32("touchscreen-size-x", 1665),
+       PROPERTY_ENTRY_U32("touchscreen-size-y", 1140),
        PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
-       PROPERTY_ENTRY_STRING("firmware-name", "gsl3670-cube-iwork8-air.fw"),
-       PROPERTY_ENTRY_U32("silead,max-fingers", 10),
+       PROPERTY_ENTRY_BOOL("silead,home-button"),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-chuwi-hi8.fw"),
        { }
 };
 
-static const struct silead_ts_dmi_data cube_iwork8_air_data = {
-       .acpi_name      = "MSSL1680:00",
-       .properties     = cube_iwork8_air_props,
+static const struct silead_ts_dmi_data chuwi_hi8_data = {
+       .acpi_name      = "MSSL0001:00",
+       .properties     = chuwi_hi8_props,
 };
 
-static const struct property_entry jumper_ezpad_mini3_props[] = {
-       PROPERTY_ENTRY_U32("touchscreen-size-x", 1700),
-       PROPERTY_ENTRY_U32("touchscreen-size-y", 1150),
+static const struct property_entry chuwi_hi8_pro_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-jumper-ezpad-mini3.fw"),
-       PROPERTY_ENTRY_U32("silead,max-fingers", 10),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl3680-chuwi-hi8-pro.fw"),
+       PROPERTY_ENTRY_BOOL("silead,home-button"),
        { }
 };
 
-static const struct silead_ts_dmi_data jumper_ezpad_mini3_data = {
+static const struct silead_ts_dmi_data chuwi_hi8_pro_data = {
        .acpi_name      = "MSSL1680:00",
-       .properties     = jumper_ezpad_mini3_props,
+       .properties     = chuwi_hi8_pro_props,
 };
 
-static const struct property_entry jumper_ezpad_6_pro_props[] = {
-       PROPERTY_ENTRY_U32("touchscreen-size-x", 1980),
-       PROPERTY_ENTRY_U32("touchscreen-size-y", 1500),
-       PROPERTY_ENTRY_STRING("firmware-name", "gsl3692-jumper-ezpad-6-pro.fw"),
+static const struct property_entry chuwi_vi8_props[] = {
+       PROPERTY_ENTRY_U32("touchscreen-size-x", 1724),
+       PROPERTY_ENTRY_U32("touchscreen-size-y", 1140),
+       PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl3676-chuwi-vi8.fw"),
        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        PROPERTY_ENTRY_BOOL("silead,home-button"),
        { }
 };
 
-static const struct silead_ts_dmi_data jumper_ezpad_6_pro_data = {
+static const struct silead_ts_dmi_data chuwi_vi8_data = {
+       .acpi_name      = "MSSL1680:00",
+       .properties     = chuwi_vi8_props,
+};
+
+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_BOOL("touchscreen-swapped-x-y"),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl3670-cube-iwork8-air.fw"),
+       PROPERTY_ENTRY_U32("silead,max-fingers", 10),
+       { }
+};
+
+static const struct silead_ts_dmi_data cube_iwork8_air_data = {
        .acpi_name      = "MSSL1680:00",
-       .properties     = jumper_ezpad_6_pro_props,
+       .properties     = cube_iwork8_air_props,
 };
 
 static const struct property_entry dexp_ursus_7w_props[] = {
@@ -81,34 +98,20 @@ static const struct silead_ts_dmi_data dexp_ursus_7w_data = {
        .properties     = dexp_ursus_7w_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),
-       PROPERTY_ENTRY_U32("touchscreen-inverted-y", 1),
-       PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl3670-surftab-twin-10-1-st10432-8.fw"),
-       PROPERTY_ENTRY_U32("silead,max-fingers", 10),
-       { }
-};
-
-static const struct silead_ts_dmi_data trekstor_surftab_twin_10_1_data = {
-       .acpi_name      = "MSSL1680:00",
-       .properties     = trekstor_surftab_twin_10_1_props,
-};
-
-static const struct property_entry trekstor_surftab_wintron70_props[] = {
-       PROPERTY_ENTRY_U32("touchscreen-size-x", 884),
-       PROPERTY_ENTRY_U32("touchscreen-size-y", 632),
+static const struct property_entry digma_citi_e200_props[] = {
+       PROPERTY_ENTRY_U32("touchscreen-size-x", 1980),
+       PROPERTY_ENTRY_U32("touchscreen-size-y", 1500),
+       PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
        PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl1686-surftab-wintron70-st70416-6.fw"),
+                             "gsl1686-digma_citi_e200.fw"),
        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        PROPERTY_ENTRY_BOOL("silead,home-button"),
        { }
 };
 
-static const struct silead_ts_dmi_data trekstor_surftab_wintron70_data = {
+static const struct silead_ts_dmi_data digma_citi_e200_data = {
        .acpi_name      = "MSSL1680:00",
-       .properties     = trekstor_surftab_wintron70_props,
+       .properties     = digma_citi_e200_props,
 };
 
 static const struct property_entry gp_electronic_t701_props[] = {
@@ -126,157 +129,142 @@ static const struct silead_ts_dmi_data gp_electronic_t701_data = {
        .properties     = gp_electronic_t701_props,
 };
 
-static const struct property_entry pipo_w2s_props[] = {
-       PROPERTY_ENTRY_U32("touchscreen-size-x", 1660),
-       PROPERTY_ENTRY_U32("touchscreen-size-y", 880),
-       PROPERTY_ENTRY_BOOL("touchscreen-inverted-x"),
+static const struct property_entry itworks_tw891_props[] = {
+       PROPERTY_ENTRY_U32("touchscreen-size-x", 1600),
+       PROPERTY_ENTRY_U32("touchscreen-size-y", 890),
+       PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
        PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
-       PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl1680-pipo-w2s.fw"),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl3670-itworks-tw891.fw"),
        { }
 };
 
-static const struct silead_ts_dmi_data pipo_w2s_data = {
+static const struct silead_ts_dmi_data itworks_tw891_data = {
        .acpi_name      = "MSSL1680:00",
-       .properties     = pipo_w2s_props,
+       .properties     = itworks_tw891_props,
 };
 
-static const struct property_entry pov_mobii_wintab_p800w_v20_props[] = {
-       PROPERTY_ENTRY_U32("touchscreen-min-x", 32),
-       PROPERTY_ENTRY_U32("touchscreen-min-y", 16),
-       PROPERTY_ENTRY_U32("touchscreen-size-x", 1692),
-       PROPERTY_ENTRY_U32("touchscreen-size-y", 1146),
-       PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
-       PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl3680-pov-mobii-wintab-p800w-v20.fw"),
+static const struct property_entry jumper_ezpad_6_pro_props[] = {
+       PROPERTY_ENTRY_U32("touchscreen-size-x", 1980),
+       PROPERTY_ENTRY_U32("touchscreen-size-y", 1500),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl3692-jumper-ezpad-6-pro.fw"),
        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        PROPERTY_ENTRY_BOOL("silead,home-button"),
        { }
 };
 
-static const struct silead_ts_dmi_data pov_mobii_wintab_p800w_v20_data = {
+static const struct silead_ts_dmi_data jumper_ezpad_6_pro_data = {
        .acpi_name      = "MSSL1680:00",
-       .properties     = pov_mobii_wintab_p800w_v20_props,
+       .properties     = jumper_ezpad_6_pro_props,
 };
 
-static const struct property_entry pov_mobii_wintab_p800w_v21_props[] = {
-       PROPERTY_ENTRY_U32("touchscreen-size-x", 1800),
+static const struct property_entry jumper_ezpad_mini3_props[] = {
+       PROPERTY_ENTRY_U32("touchscreen-size-x", 1700),
        PROPERTY_ENTRY_U32("touchscreen-size-y", 1150),
        PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
-       PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl3692-pov-mobii-wintab-p800w.fw"),
-       PROPERTY_ENTRY_BOOL("silead,home-button"),
-       { }
-};
-
-static const struct silead_ts_dmi_data pov_mobii_wintab_p800w_v21_data = {
-       .acpi_name      = "MSSL1680:00",
-       .properties     = pov_mobii_wintab_p800w_v21_props,
-};
-
-static const struct property_entry itworks_tw891_props[] = {
-       PROPERTY_ENTRY_U32("touchscreen-size-x", 1600),
-       PROPERTY_ENTRY_U32("touchscreen-size-y", 890),
-       PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
-       PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
-       PROPERTY_ENTRY_STRING("firmware-name", "gsl3670-itworks-tw891.fw"),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl3676-jumper-ezpad-mini3.fw"),
+       PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        { }
 };
 
-static const struct silead_ts_dmi_data itworks_tw891_data = {
+static const struct silead_ts_dmi_data jumper_ezpad_mini3_data = {
        .acpi_name      = "MSSL1680:00",
-       .properties     = itworks_tw891_props,
+       .properties     = jumper_ezpad_mini3_props,
 };
 
-static const struct property_entry chuwi_hi8_pro_props[] = {
+static const struct property_entry onda_obook_20_plus_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-size-x", 1728),
        PROPERTY_ENTRY_U32("touchscreen-size-y", 1148),
+       PROPERTY_ENTRY_BOOL("touchscreen-inverted-x"),
+       PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
        PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
-       PROPERTY_ENTRY_STRING("firmware-name", "gsl3680-chuwi-hi8-pro.fw"),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl3676-onda-obook-20-plus.fw"),
+       PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        PROPERTY_ENTRY_BOOL("silead,home-button"),
        { }
 };
 
-static const struct silead_ts_dmi_data chuwi_hi8_pro_data = {
+static const struct silead_ts_dmi_data onda_obook_20_plus_data = {
        .acpi_name      = "MSSL1680:00",
-       .properties     = chuwi_hi8_pro_props,
+       .properties     = onda_obook_20_plus_props,
 };
 
-static const struct property_entry digma_citi_e200_props[] = {
-       PROPERTY_ENTRY_U32("touchscreen-size-x", 1980),
-       PROPERTY_ENTRY_U32("touchscreen-size-y", 1500),
-       PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
+static const struct property_entry onda_v891w_v1_props[] = {
+       PROPERTY_ENTRY_U32("touchscreen-min-x", 46),
+       PROPERTY_ENTRY_U32("touchscreen-min-y",  8),
+       PROPERTY_ENTRY_U32("touchscreen-size-x", 1676),
+       PROPERTY_ENTRY_U32("touchscreen-size-y", 1130),
        PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl1686-digma_citi_e200.fw"),
+                             "gsl3680-onda-v891w-v1.fw"),
        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        PROPERTY_ENTRY_BOOL("silead,home-button"),
        { }
 };
 
-static const struct silead_ts_dmi_data digma_citi_e200_data = {
+static const struct silead_ts_dmi_data onda_v891w_v1_data = {
        .acpi_name      = "MSSL1680:00",
-       .properties     = digma_citi_e200_props,
+       .properties     = onda_v891w_v1_props,
 };
 
-static const struct property_entry onda_obook_20_plus_props[] = {
-       PROPERTY_ENTRY_U32("touchscreen-size-x", 1728),
-       PROPERTY_ENTRY_U32("touchscreen-size-y", 1148),
+static const struct property_entry pipo_w2s_props[] = {
+       PROPERTY_ENTRY_U32("touchscreen-size-x", 1660),
+       PROPERTY_ENTRY_U32("touchscreen-size-y", 880),
        PROPERTY_ENTRY_BOOL("touchscreen-inverted-x"),
-       PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
        PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
-       PROPERTY_ENTRY_STRING("firmware-name", "gsl3676-onda-obook-20-plus.fw"),
-       PROPERTY_ENTRY_U32("silead,max-fingers", 10),
-       PROPERTY_ENTRY_BOOL("silead,home-button"),
+       PROPERTY_ENTRY_STRING("firmware-name",
+                             "gsl1680-pipo-w2s.fw"),
        { }
 };
 
-static const struct silead_ts_dmi_data onda_obook_20_plus_data = {
+static const struct silead_ts_dmi_data pipo_w2s_data = {
        .acpi_name      = "MSSL1680:00",
-       .properties     = onda_obook_20_plus_props,
+       .properties     = pipo_w2s_props,
 };
 
-static const struct property_entry chuwi_hi8_props[] = {
-       PROPERTY_ENTRY_U32("touchscreen-size-x", 1665),
-       PROPERTY_ENTRY_U32("touchscreen-size-y", 1140),
+static const struct property_entry pov_mobii_wintab_p800w_v20_props[] = {
+       PROPERTY_ENTRY_U32("touchscreen-min-x", 32),
+       PROPERTY_ENTRY_U32("touchscreen-min-y", 16),
+       PROPERTY_ENTRY_U32("touchscreen-size-x", 1692),
+       PROPERTY_ENTRY_U32("touchscreen-size-y", 1146),
        PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
+       PROPERTY_ENTRY_STRING("firmware-name",
+                             "gsl3680-pov-mobii-wintab-p800w-v20.fw"),
+       PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        PROPERTY_ENTRY_BOOL("silead,home-button"),
-       PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-chuwi-hi8.fw"),
        { }
 };
 
-static const struct silead_ts_dmi_data chuwi_hi8_data = {
-       .acpi_name      = "MSSL0001:00",
-       .properties     = chuwi_hi8_props,
+static const struct silead_ts_dmi_data pov_mobii_wintab_p800w_v20_data = {
+       .acpi_name      = "MSSL1680:00",
+       .properties     = pov_mobii_wintab_p800w_v20_props,
 };
 
-static const struct property_entry chuwi_vi8_props[] = {
-       PROPERTY_ENTRY_U32("touchscreen-size-x", 1724),
-       PROPERTY_ENTRY_U32("touchscreen-size-y", 1140),
+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_BOOL("touchscreen-swapped-x-y"),
-       PROPERTY_ENTRY_STRING("firmware-name", "gsl3676-chuwi-vi8.fw"),
-       PROPERTY_ENTRY_U32("silead,max-fingers", 10),
+       PROPERTY_ENTRY_STRING("firmware-name",
+                             "gsl3692-pov-mobii-wintab-p800w.fw"),
        PROPERTY_ENTRY_BOOL("silead,home-button"),
        { }
 };
 
-static const struct silead_ts_dmi_data chuwi_vi8_data = {
-       .acpi_name      = "MSSL1680:00",
-       .properties     = chuwi_vi8_props,
+static const struct silead_ts_dmi_data pov_mobii_wintab_p800w_v21_data = {
+       .acpi_name      = "MSSL1680:00",
+       .properties     = pov_mobii_wintab_p800w_v21_props,
 };
 
-static const struct property_entry trekstor_primebook_c13_props[] = {
-       PROPERTY_ENTRY_U32("touchscreen-size-x", 2624),
-       PROPERTY_ENTRY_U32("touchscreen-size-y", 1920),
-       PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl1680-trekstor-primebook-c13.fw"),
+static const struct property_entry teclast_x3_plus_props[] = {
+       PROPERTY_ENTRY_U32("touchscreen-size-x", 1980),
+       PROPERTY_ENTRY_U32("touchscreen-size-y", 1500),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-teclast-x3-plus.fw"),
        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        PROPERTY_ENTRY_BOOL("silead,home-button"),
        { }
 };
 
-static const struct silead_ts_dmi_data trekstor_primebook_c13_data = {
+static const struct silead_ts_dmi_data teclast_x3_plus_data = {
        .acpi_name      = "MSSL1680:00",
-       .properties     = trekstor_primebook_c13_props,
+       .properties     = teclast_x3_plus_props,
 };
 
 static const struct property_entry teclast_x98plus2_props[] = {
@@ -295,38 +283,87 @@ static const struct silead_ts_dmi_data teclast_x98plus2_data = {
        .properties     = teclast_x98plus2_props,
 };
 
-static const struct property_entry teclast_x3_plus_props[] = {
-       PROPERTY_ENTRY_U32("touchscreen-size-x", 1980),
-       PROPERTY_ENTRY_U32("touchscreen-size-y", 1500),
-       PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-teclast-x3-plus.fw"),
+static const struct property_entry trekstor_primebook_c13_props[] = {
+       PROPERTY_ENTRY_U32("touchscreen-size-x", 2624),
+       PROPERTY_ENTRY_U32("touchscreen-size-y", 1920),
+       PROPERTY_ENTRY_STRING("firmware-name",
+                             "gsl1680-trekstor-primebook-c13.fw"),
        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        PROPERTY_ENTRY_BOOL("silead,home-button"),
        { }
 };
 
-static const struct silead_ts_dmi_data teclast_x3_plus_data = {
+static const struct silead_ts_dmi_data trekstor_primebook_c13_data = {
        .acpi_name      = "MSSL1680:00",
-       .properties     = teclast_x3_plus_props,
+       .properties     = trekstor_primebook_c13_props,
 };
 
-static const struct property_entry onda_v891w_v1_props[] = {
-       PROPERTY_ENTRY_U32("touchscreen-min-x", 46),
-       PROPERTY_ENTRY_U32("touchscreen-min-y",  8),
-       PROPERTY_ENTRY_U32("touchscreen-size-x", 1676),
-       PROPERTY_ENTRY_U32("touchscreen-size-y", 1130),
+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),
+       PROPERTY_ENTRY_U32("touchscreen-inverted-y", 1),
        PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl3680-onda-v891w-v1.fw"),
+                             "gsl3670-surftab-twin-10-1-st10432-8.fw"),
+       PROPERTY_ENTRY_U32("silead,max-fingers", 10),
+       { }
+};
+
+static const struct silead_ts_dmi_data trekstor_surftab_twin_10_1_data = {
+       .acpi_name      = "MSSL1680:00",
+       .properties     = trekstor_surftab_twin_10_1_props,
+};
+
+static const struct property_entry trekstor_surftab_wintron70_props[] = {
+       PROPERTY_ENTRY_U32("touchscreen-size-x", 884),
+       PROPERTY_ENTRY_U32("touchscreen-size-y", 632),
+       PROPERTY_ENTRY_STRING("firmware-name",
+                             "gsl1686-surftab-wintron70-st70416-6.fw"),
        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        PROPERTY_ENTRY_BOOL("silead,home-button"),
        { }
 };
 
-static const struct silead_ts_dmi_data onda_v891w_v1_data = {
+static const struct silead_ts_dmi_data trekstor_surftab_wintron70_data = {
        .acpi_name      = "MSSL1680:00",
-       .properties     = onda_v891w_v1_props,
+       .properties     = trekstor_surftab_wintron70_props,
 };
 
+/* NOTE: Please keep this table sorted alphabetically */
 static const struct dmi_system_id silead_ts_dmi_table[] = {
+       {
+               /* Chuwi Hi8 */
+               .driver_data = (void *)&chuwi_hi8_data,
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "ilife"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "S806"),
+               },
+       },
+       {
+               /* Chuwi Hi8 (H1D_S806_206) */
+               .driver_data = (void *)&chuwi_hi8_data,
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "BayTrail"),
+                       DMI_MATCH(DMI_BIOS_VERSION, "H1D_S806_206"),
+               },
+       },
+       {
+               /* Chuwi Hi8 Pro (CWI513) */
+               .driver_data = (void *)&chuwi_hi8_pro_data,
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Hampoo"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "X1D3_C806N"),
+               },
+       },
+       {
+               /* Chuwi Vi8 (CWI506) */
+               .driver_data = (void *)&chuwi_vi8_data,
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "i86"),
+                       DMI_MATCH(DMI_BIOS_VERSION, "CHUWI.D86JLBNR"),
+               },
+       },
        {
                /* CUBE iwork8 Air */
                .driver_data = (void *)&cube_iwork8_air_data,
@@ -337,12 +374,46 @@ static const struct dmi_system_id silead_ts_dmi_table[] = {
                },
        },
        {
-               /* Jumper EZpad mini3 */
-               .driver_data = (void *)&jumper_ezpad_mini3_data,
+               /* DEXP Ursus 7W */
+               .driver_data = (void *)&dexp_ursus_7w_data,
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),
-                       /* jumperx.T87.KFBNEEA02 with the version-nr dropped */
-                       DMI_MATCH(DMI_BIOS_VERSION, "jumperx.T87.KFBNEEA"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "7W"),
+               },
+       },
+       {
+               /* Digma Citi E200 */
+               .driver_data = (void *)&digma_citi_e200_data,
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Digma"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "CITI E200"),
+                       DMI_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"),
+               },
+       },
+       {
+               /* GP-electronic T701 */
+               .driver_data = (void *)&gp_electronic_t701_data,
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "T701"),
+                       DMI_MATCH(DMI_BIOS_VERSION, "BYT70A.YNCHENG.WIN.007"),
+               },
+       },
+       {
+               /* I.T.Works TW701 (same hardware as the Trekstor ST70416-6) */
+               .driver_data = (void *)&trekstor_surftab_wintron70_data,
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "i71c"),
+                       DMI_MATCH(DMI_BIOS_VERSION, "itWORKS.G.WI71C.JGBMRB"),
+               },
+       },
+       {
+               /* I.T.Works TW891 */
+               .driver_data = (void *)&itworks_tw891_data,
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "To be filled by O.E.M."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TW891"),
                },
        },
        {
@@ -357,40 +428,39 @@ static const struct dmi_system_id silead_ts_dmi_table[] = {
                },
        },
        {
-               /* DEXP Ursus 7W */
-               .driver_data = (void *)&dexp_ursus_7w_data,
+               /* Jumper EZpad mini3 */
+               .driver_data = (void *)&jumper_ezpad_mini3_data,
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "7W"),
+                       /* jumperx.T87.KFBNEEA02 with the version-nr dropped */
+                       DMI_MATCH(DMI_BIOS_VERSION, "jumperx.T87.KFBNEEA"),
                },
        },
        {
-               /* TrekStor SurfTab twin 10.1 ST10432-8 */
-               .driver_data = (void *)&trekstor_surftab_twin_10_1_data,
+               /* Onda oBook 20 Plus */
+               .driver_data = (void *)&onda_obook_20_plus_data,
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "TrekStor"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "SurfTab twin 10.1"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "ONDA"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "OBOOK 20 PLUS"),
                },
        },
        {
-               /* Trekstor Surftab Wintron 7.0 ST70416-6 */
-               .driver_data = (void *)&trekstor_surftab_wintron70_data,
+               /* ONDA V891w revision P891WBEBV1B00 aka v1 */
+               .driver_data = (void *)&onda_v891w_v1_data,
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "ST70416-6"),
+                       DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "ONDA"),
+                       DMI_EXACT_MATCH(DMI_BOARD_NAME, "ONDA Tablet"),
+                       DMI_EXACT_MATCH(DMI_BOARD_VERSION, "V001"),
                        /* Exact match, different versions need different fw */
-                       DMI_MATCH(DMI_BIOS_VERSION, "TREK.G.WI71C.JGBMRBA04"),
+                       DMI_EXACT_MATCH(DMI_BIOS_VERSION, "ONDA.W89EBBN08"),
                },
        },
        {
-               /* Trekstor Surftab Wintron 7.0 ST70416-6, newer BIOS */
-               .driver_data = (void *)&trekstor_surftab_wintron70_data,
+               /* Pipo W2S */
+               .driver_data = (void *)&pipo_w2s_data,
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "TrekStor"),
-                       DMI_MATCH(DMI_PRODUCT_NAME,
-                                            "SurfTab wintron 7.0 ST70416-6"),
-                       /* Exact match, different versions need different fw */
-                       DMI_MATCH(DMI_BIOS_VERSION, "TREK.G.WI71C.JGBMRBA05"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "PIPO"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "W2S"),
                },
        },
        {
@@ -403,23 +473,6 @@ static const struct dmi_system_id silead_ts_dmi_table[] = {
                        DMI_MATCH(DMI_BIOS_VERSION, "MOMO.G.WI71C.MABMRBA02"),
                },
        },
-       {
-               /* GP-electronic T701 */
-               .driver_data = (void *)&gp_electronic_t701_data,
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "T701"),
-                       DMI_MATCH(DMI_BIOS_VERSION, "BYT70A.YNCHENG.WIN.007"),
-               },
-       },
-       {
-               /* Pipo W2S */
-               .driver_data = (void *)&pipo_w2s_data,
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "PIPO"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "W2S"),
-               },
-       },
        {
                /* Point of View mobii wintab p800w (v2.0) */
                .driver_data = (void *)&pov_mobii_wintab_p800w_v20_data,
@@ -443,62 +496,20 @@ static const struct dmi_system_id silead_ts_dmi_table[] = {
                },
        },
        {
-               /* I.T.Works TW891 */
-               .driver_data = (void *)&itworks_tw891_data,
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "To be filled by O.E.M."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "TW891"),
-               },
-       },
-       {
-               /* Chuwi Hi8 Pro */
-               .driver_data = (void *)&chuwi_hi8_pro_data,
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Hampoo"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "X1D3_C806N"),
-               },
-       },
-       {
-               /* Digma Citi E200 */
-               .driver_data = (void *)&digma_citi_e200_data,
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Digma"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "CITI E200"),
-                       DMI_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"),
-               },
-       },
-       {
-               /* Onda oBook 20 Plus */
-               .driver_data = (void *)&onda_obook_20_plus_data,
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ONDA"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "OBOOK 20 PLUS"),
-               },
-       },
-       {
-               /* Chuwi Hi8 */
-               .driver_data = (void *)&chuwi_hi8_data,
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ilife"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "S806"),
-               },
-       },
-       {
-               /* Chuwi Hi8 (H1D_S806_206) */
-               .driver_data = (void *)&chuwi_hi8_data,
+               /* Teclast X3 Plus */
+               .driver_data = (void *)&teclast_x3_plus_data,
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "BayTrail"),
-                       DMI_MATCH(DMI_BIOS_VERSION, "H1D_S806_206"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "TECLAST"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "X3 Plus"),
+                       DMI_MATCH(DMI_BOARD_NAME, "X3 Plus"),
                },
        },
        {
-               /* Chuwi Vi8 (CWI506) */
-               .driver_data = (void *)&chuwi_vi8_data,
+               /* Teclast X98 Plus II */
+               .driver_data = (void *)&teclast_x98plus2_data,
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "i86"),
-                       DMI_MATCH(DMI_BIOS_VERSION, "CHUWI.D86JLBNR"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "TECLAST"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "X98 Plus II"),
                },
        },
        {
@@ -510,29 +521,32 @@ static const struct dmi_system_id silead_ts_dmi_table[] = {
                },
        },
        {
-               /* Teclast X98 Plus II */
-               .driver_data = (void *)&teclast_x98plus2_data,
+               /* TrekStor SurfTab twin 10.1 ST10432-8 */
+               .driver_data = (void *)&trekstor_surftab_twin_10_1_data,
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "TECLAST"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "X98 Plus II"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "TrekStor"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "SurfTab twin 10.1"),
                },
        },
        {
-               /* Teclast X3 Plus */
-               .driver_data = (void *)&teclast_x3_plus_data,
+               /* Trekstor Surftab Wintron 7.0 ST70416-6 */
+               .driver_data = (void *)&trekstor_surftab_wintron70_data,
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "TECLAST"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "X3 Plus"),
-                       DMI_MATCH(DMI_BOARD_NAME, "X3 Plus"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "ST70416-6"),
+                       /* Exact match, different versions need different fw */
+                       DMI_MATCH(DMI_BIOS_VERSION, "TREK.G.WI71C.JGBMRBA04"),
                },
        },
        {
-               /* I.T.Works TW701 */
+               /* Trekstor Surftab Wintron 7.0 ST70416-6, newer BIOS */
                .driver_data = (void *)&trekstor_surftab_wintron70_data,
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "i71c"),
-                       DMI_MATCH(DMI_BIOS_VERSION, "itWORKS.G.WI71C.JGBMRB"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "TrekStor"),
+                       DMI_MATCH(DMI_PRODUCT_NAME,
+                                            "SurfTab wintron 7.0 ST70416-6"),
+                       /* Exact match, different versions need different fw */
+                       DMI_MATCH(DMI_BIOS_VERSION, "TREK.G.WI71C.JGBMRBA05"),
                },
        },
        {
@@ -543,17 +557,6 @@ static const struct dmi_system_id silead_ts_dmi_table[] = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "Y8W81"),
                },
        },
-       {
-               /* ONDA V891w revision P891WBEBV1B00 aka v1 */
-               .driver_data = (void *)&onda_v891w_v1_data,
-               .matches = {
-                       DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "ONDA"),
-                       DMI_EXACT_MATCH(DMI_BOARD_NAME, "ONDA Tablet"),
-                       DMI_EXACT_MATCH(DMI_BOARD_VERSION, "V001"),
-                       /* Exact match, different versions need different fw */
-                       DMI_EXACT_MATCH(DMI_BIOS_VERSION, "ONDA.W89EBBN08"),
-               },
-       },
        { },
 };