Merge tag 'input-for-v5.20-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-microblaze.git] / drivers / input / serio / i8042-x86ia64io.h
index 148a7c5..4fbec7b 100644 (file)
@@ -67,612 +67,775 @@ static inline void i8042_write_command(int val)
 
 #include <linux/dmi.h>
 
-static const struct dmi_system_id __initconst i8042_dmi_noloop_table[] = {
+#define SERIO_QUIRK_NOKBD              BIT(0)
+#define SERIO_QUIRK_NOAUX              BIT(1)
+#define SERIO_QUIRK_NOMUX              BIT(2)
+#define SERIO_QUIRK_FORCEMUX           BIT(3)
+#define SERIO_QUIRK_UNLOCK             BIT(4)
+#define SERIO_QUIRK_PROBE_DEFER                BIT(5)
+#define SERIO_QUIRK_RESET_ALWAYS       BIT(6)
+#define SERIO_QUIRK_RESET_NEVER                BIT(7)
+#define SERIO_QUIRK_DIECT              BIT(8)
+#define SERIO_QUIRK_DUMBKBD            BIT(9)
+#define SERIO_QUIRK_NOLOOP             BIT(10)
+#define SERIO_QUIRK_NOTIMEOUT          BIT(11)
+#define SERIO_QUIRK_KBDRESET           BIT(12)
+#define SERIO_QUIRK_DRITEK             BIT(13)
+#define SERIO_QUIRK_NOPNP              BIT(14)
+
+/* Quirk table for different mainboards. Options similar or identical to i8042
+ * module parameters.
+ * ORDERING IS IMPORTANT! The first match will be apllied and the rest ignored.
+ * This allows entries to overwrite vendor wide quirks on a per device basis.
+ * Where this is irrelevant, entries are sorted case sensitive by DMI_SYS_VENDOR
+ * and/or DMI_BOARD_VENDOR to make it easier to avoid dublicate entries.
+ */
+static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = {
        {
-               /*
-                * Arima-Rioworks HDAMB -
-                * AUX LOOP command does not raise AUX IRQ
-                */
                .matches = {
-                       DMI_MATCH(DMI_BOARD_VENDOR, "RIOWORKS"),
-                       DMI_MATCH(DMI_BOARD_NAME, "HDAMB"),
-                       DMI_MATCH(DMI_BOARD_VERSION, "Rev E"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "ALIENWARE"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Sentia"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /* ASUS G1S */
                .matches = {
-                       DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer Inc."),
-                       DMI_MATCH(DMI_BOARD_NAME, "G1S"),
-                       DMI_MATCH(DMI_BOARD_VERSION, "1.0"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "X750LN"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOLOOP)
        },
        {
-               /* ASUS P65UP5 - AUX LOOP command does not raise AUX IRQ */
+               /* Asus X450LCP */
                .matches = {
-                       DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
-                       DMI_MATCH(DMI_BOARD_NAME, "P/I-P65UP5"),
-                       DMI_MATCH(DMI_BOARD_VERSION, "REV 2.X"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "X450LCP"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_NEVER)
        },
        {
+               /* ASUS ZenBook UX425UA */
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "X750LN"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "ZenBook UX425UA"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_PROBE_DEFER | SERIO_QUIRK_RESET_NEVER)
        },
        {
+               /* ASUS ZenBook UM325UA */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Compaq"),
-                       DMI_MATCH(DMI_PRODUCT_NAME , "ProLiant"),
-                       DMI_MATCH(DMI_PRODUCT_VERSION, "8500"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "ZenBook UX325UA_UM325UA"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_PROBE_DEFER | SERIO_QUIRK_RESET_NEVER)
        },
+       /*
+        * On some Asus laptops, just running self tests cause problems.
+        */
        {
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Compaq"),
-                       DMI_MATCH(DMI_PRODUCT_NAME , "ProLiant"),
-                       DMI_MATCH(DMI_PRODUCT_VERSION, "DL760"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
+                       DMI_MATCH(DMI_CHASSIS_TYPE, "10"), /* Notebook */
                },
+               .driver_data = (void *)(SERIO_QUIRK_RESET_NEVER)
        },
        {
-               /* Dell Embedded Box PC 3000 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Embedded Box PC 3000"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
+                       DMI_MATCH(DMI_CHASSIS_TYPE, "31"), /* Convertible Notebook */
                },
+               .driver_data = (void *)(SERIO_QUIRK_RESET_NEVER)
        },
        {
-               /* OQO Model 01 */
+               /* ASUS P65UP5 - AUX LOOP command does not raise AUX IRQ */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "OQO"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "ZEPTO"),
-                       DMI_MATCH(DMI_PRODUCT_VERSION, "00"),
+                       DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
+                       DMI_MATCH(DMI_BOARD_NAME, "P/I-P65UP5"),
+                       DMI_MATCH(DMI_BOARD_VERSION, "REV 2.X"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOLOOP)
        },
        {
-               /* ULI EV4873 - AUX LOOP does not work properly */
+               /* ASUS G1S */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ULI"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "EV4873"),
-                       DMI_MATCH(DMI_PRODUCT_VERSION, "5a"),
+                       DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer Inc."),
+                       DMI_MATCH(DMI_BOARD_NAME, "G1S"),
+                       DMI_MATCH(DMI_BOARD_VERSION, "1.0"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOLOOP)
        },
        {
-               /* Microsoft Virtual Machine */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Virtual Machine"),
-                       DMI_MATCH(DMI_PRODUCT_VERSION, "VS2005R2"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 1360"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /* Medion MAM 2070 */
+               /* Acer Aspire 5710 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Notebook"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "MAM 2070"),
-                       DMI_MATCH(DMI_PRODUCT_VERSION, "5a"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5710"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /* Medion Akoya E7225 */
+               /* Acer Aspire 7738 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Medion"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Akoya E7225"),
-                       DMI_MATCH(DMI_PRODUCT_VERSION, "1.0"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 7738"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /* Blue FB5601 */
+               /* Acer Aspire 5536 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "blue"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "FB5601"),
-                       DMI_MATCH(DMI_PRODUCT_VERSION, "M606"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5536"),
+                       DMI_MATCH(DMI_PRODUCT_VERSION, "0100"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /* Gigabyte M912 */
+               /*
+                * Acer Aspire 5738z
+                * Touchpad stops working in mux mode when dis- + re-enabled
+                * with the touchpad enable/disable toggle hotkey
+                */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "M912"),
-                       DMI_MATCH(DMI_PRODUCT_VERSION, "01"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /* Gigabyte M1022M netbook */
+               /* Acer Aspire One 150 */
                .matches = {
-                       DMI_MATCH(DMI_BOARD_VENDOR, "Gigabyte Technology Co.,Ltd."),
-                       DMI_MATCH(DMI_BOARD_NAME, "M1022E"),
-                       DMI_MATCH(DMI_BOARD_VERSION, "1.02"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "AOA150"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS)
        },
        {
-               /* Gigabyte Spring Peak - defines wrong chassis type */
+               /* Acer Aspire One 532h */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Spring Peak"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "AO532h"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_DRITEK)
        },
        {
-               /* Gigabyte T1005 - defines wrong chassis type ("Other") */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "T1005"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire A114-31"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS)
        },
        {
-               /* Gigabyte T1005M/P - defines wrong chassis type ("Other") */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "T1005M/P"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire A314-31"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS)
        },
        {
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv9700"),
-                       DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire A315-31"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS)
        },
        {
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "PEGATRON CORPORATION"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "C15B"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire ES1-132"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS)
        },
        {
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ByteSpeed LLC"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "ByteSpeed Laptop C15B"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire ES1-332"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS)
        },
-       { }
-};
-
-/*
- * Some Fujitsu notebooks are having trouble with touchpads if
- * active multiplexing mode is activated. Luckily they don't have
- * external PS/2 ports so we can safely disable it.
- * ... apparently some Toshibas don't like MUX mode either and
- * die horrible death on reboot.
- */
-static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = {
        {
-               /* Fujitsu Lifebook P7010/P7010D */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "P7010"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire ES1-432"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS)
        },
        {
-               /* Fujitsu Lifebook P7010 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "0000000000"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate Spin B118-RN"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS)
        },
+       /*
+        * Some Wistron based laptops need us to explicitly enable the 'Dritek
+        * keyboard extension' to make their extra keys start generating scancodes.
+        * Originally, this was just confined to older laptops, but a few Acer laptops
+        * have turned up in 2007 that also need this again.
+        */
        {
-               /* Fujitsu Lifebook P5020D */
+               /* Acer Aspire 5100 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook P Series"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5100"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_DRITEK)
        },
        {
-               /* Fujitsu Lifebook S2000 */
+               /* Acer Aspire 5610 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook S Series"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5610"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_DRITEK)
        },
        {
-               /* Fujitsu Lifebook S6230 */
+               /* Acer Aspire 5630 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook S6230"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5630"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_DRITEK)
        },
        {
-               /* Fujitsu Lifebook T725 laptop */
+               /* Acer Aspire 5650 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK T725"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5650"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_DRITEK)
        },
        {
-               /* Fujitsu Lifebook U745 */
+               /* Acer Aspire 5680 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK U745"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5680"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_DRITEK)
        },
        {
-               /* Fujitsu T70H */
+               /* Acer Aspire 5720 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "FMVLT70H"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5720"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_DRITEK)
        },
        {
-               /* Fujitsu-Siemens Lifebook T3010 */
+               /* Acer Aspire 9110 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK T3010"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 9110"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_DRITEK)
        },
        {
-               /* Fujitsu-Siemens Lifebook E4010 */
+               /* Acer TravelMate 660 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E4010"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 660"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_DRITEK)
        },
        {
-               /* Fujitsu-Siemens Amilo Pro 2010 */
+               /* Acer TravelMate 2490 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pro V2010"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 2490"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_DRITEK)
        },
        {
-               /* Fujitsu-Siemens Amilo Pro 2030 */
+               /* Acer TravelMate 4280 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "AMILO PRO V2030"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4280"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_DRITEK)
        },
        {
-               /*
-                * No data is coming from the touchscreen unless KBC
-                * is in legacy mode.
-                */
-               /* Panasonic CF-29 */
+               /* Amoi M636/A737 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Matsushita"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "CF-29"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Amoi Electronics CO.,LTD."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "M636/A737 platform"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /*
-                * HP Pavilion DV4017EA -
-                * errors on MUX ports are reported without raising AUXDATA
-                * causing "spurious NAK" messages.
-                */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Pavilion dv4000 (EA032EA#ABF)"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "ByteSpeed LLC"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "ByteSpeed Laptop C15B"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOLOOP)
        },
        {
-               /*
-                * HP Pavilion ZT1000 -
-                * like DV4017EA does not raise AUXERR for errors on MUX ports.
-                */
+               /* Compal HEL80I */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion Notebook PC"),
-                       DMI_MATCH(DMI_PRODUCT_VERSION, "HP Pavilion Notebook ZT1000"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "COMPAL"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "HEL80I"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /*
-                * HP Pavilion DV4270ca -
-                * like DV4017EA does not raise AUXERR for errors on MUX ports.
-                */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Pavilion dv4000 (EH476UA#ABL)"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Compaq"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant"),
+                       DMI_MATCH(DMI_PRODUCT_VERSION, "8500"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOLOOP)
        },
        {
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Satellite P10"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Compaq"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant"),
+                       DMI_MATCH(DMI_PRODUCT_VERSION, "DL760"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOLOOP)
        },
        {
+               /* Advent 4211 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "EQUIUM A110"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "DIXONSXP"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Advent 4211"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS)
        },
        {
+               /* Dell Embedded Box PC 3000 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "SATELLITE C850D"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Embedded Box PC 3000"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOLOOP)
        },
        {
+               /* Dell XPS M1530 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ALIENWARE"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Sentia"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "XPS M1530"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /* Sharp Actius MM20 */
+               /* Dell Vostro 1510 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "SHARP"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "PC-MM20 Series"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Vostro1510"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /* Sony Vaio FS-115b */
+               /* Dell Vostro V13 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FS115B"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V13"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_NOTIMEOUT)
        },
        {
-               /*
-                * Sony Vaio FZ-240E -
-                * reset and GET ID commands issued via KBD port are
-                * sometimes being delivered to AUX3.
-                */
+               /* Dell Vostro 1320 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FZ240E"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1320"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS)
        },
        {
-               /*
-                * Most (all?) VAIOs do not have external PS/2 ports nor
-                * they implement active multiplexing properly, and
-                * MUX discovery usually messes up keyboard/touchpad.
-                */
+               /* Dell Vostro 1520 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-                       DMI_MATCH(DMI_BOARD_NAME, "VAIO"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1520"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS)
        },
        {
-               /* Amoi M636/A737 */
+               /* Dell Vostro 1720 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Amoi Electronics CO.,LTD."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "M636/A737 platform"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1720"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS)
        },
        {
-               /* Lenovo 3000 n100 */
+               /* Entroware Proteus */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "076804U"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Entroware"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Proteus"),
+                       DMI_MATCH(DMI_PRODUCT_VERSION, "EL07R4"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS)
        },
+       /*
+        * Some Fujitsu notebooks are having trouble with touchpads if
+        * active multiplexing mode is activated. Luckily they don't have
+        * external PS/2 ports so we can safely disable it.
+        * ... apparently some Toshibas don't like MUX mode either and
+        * die horrible death on reboot.
+        */
        {
-               /* Lenovo XiaoXin Air 12 */
+               /* Fujitsu Lifebook P7010/P7010D */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "80UN"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "P7010"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
+               /* Fujitsu Lifebook P5020D */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 1360"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook P Series"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /* Acer Aspire 5710 */
+               /* Fujitsu Lifebook S2000 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5710"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook S Series"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /* Acer Aspire 7738 */
+               /* Fujitsu Lifebook S6230 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 7738"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook S6230"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /* Gericom Bellagio */
+               /* Fujitsu Lifebook T725 laptop */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Gericom"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "N34AS6"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK T725"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_NOTIMEOUT)
        },
        {
-               /* IBM 2656 */
+               /* Fujitsu Lifebook U745 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "2656"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK U745"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /* Dell XPS M1530 */
+               /* Fujitsu T70H */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "XPS M1530"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "FMVLT70H"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /* Compal HEL80I */
+               /* Fujitsu A544 laptop */
+               /* https://bugzilla.redhat.com/show_bug.cgi?id=1111138 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "COMPAL"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "HEL80I"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK A544"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOTIMEOUT)
        },
        {
-               /* Dell Vostro 1510 */
+               /* Fujitsu AH544 laptop */
+               /* https://bugzilla.kernel.org/show_bug.cgi?id=69731 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Vostro1510"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK AH544"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOTIMEOUT)
        },
        {
-               /* Acer Aspire 5536 */
+               /* Fujitsu U574 laptop */
+               /* https://bugzilla.kernel.org/show_bug.cgi?id=69731 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5536"),
-                       DMI_MATCH(DMI_PRODUCT_VERSION, "0100"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK U574"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOTIMEOUT)
        },
        {
-               /* Dell Vostro V13 */
+               /* Fujitsu UH554 laptop */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V13"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK UH544"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOTIMEOUT)
        },
        {
-               /* Newer HP Pavilion dv4 models */
+               /* Fujitsu Lifebook P7010 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv4 Notebook PC"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "0000000000"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /* Asus X450LCP */
+               /* Fujitsu-Siemens Lifebook T3010 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "X450LCP"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK T3010"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /* Avatar AVIU-145A6 */
+               /* Fujitsu-Siemens Lifebook E4010 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Intel"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "IC4I"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E4010"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /* TUXEDO BU1406 */
+               /* Fujitsu-Siemens Amilo Pro 2010 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Notebook"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "N24_25BU"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pro V2010"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /* Lenovo LaVie Z */
+               /* Fujitsu-Siemens Amilo Pro 2030 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-                       DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo LaVie Z"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "AMILO PRO V2030"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /*
-                * Acer Aspire 5738z
-                * Touchpad stops working in mux mode when dis- + re-enabled
-                * with the touchpad enable/disable toggle hotkey
-                */
+               /* Gigabyte M912 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "M912"),
+                       DMI_MATCH(DMI_PRODUCT_VERSION, "01"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOLOOP)
        },
        {
-               /* Entroware Proteus */
+               /* Gigabyte Spring Peak - defines wrong chassis type */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Entroware"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Proteus"),
-                       DMI_MATCH(DMI_PRODUCT_VERSION, "EL07R4"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Spring Peak"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOLOOP)
+       },
+       {
+               /* Gigabyte T1005 - defines wrong chassis type ("Other") */
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "T1005"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_NOLOOP)
+       },
+       {
+               /* Gigabyte T1005M/P - defines wrong chassis type ("Other") */
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "T1005M/P"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_NOLOOP)
+       },
+       /*
+        * Some laptops need keyboard reset before probing for the trackpad to get
+        * it detected, initialised & finally work.
+        */
+       {
+               /* Gigabyte P35 v2 - Elantech touchpad */
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "P35V2"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_KBDRESET)
+       },
+               {
+               /* Aorus branded Gigabyte X3 Plus - Elantech touchpad */
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "X3"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_KBDRESET)
+       },
+       {
+               /* Gigabyte P34 - Elantech touchpad */
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "P34"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_KBDRESET)
+       },
+       {
+               /* Gigabyte P57 - Elantech touchpad */
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "P57"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_KBDRESET)
+       },
+       {
+               /* Gericom Bellagio */
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Gericom"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "N34AS6"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
+       },
+       {
+               /* Gigabyte M1022M netbook */
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "Gigabyte Technology Co.,Ltd."),
+                       DMI_MATCH(DMI_BOARD_NAME, "M1022E"),
+                       DMI_MATCH(DMI_BOARD_VERSION, "1.02"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_NOLOOP)
+       },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv9700"),
+                       DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_NOLOOP)
        },
-       { }
-};
-
-static const struct dmi_system_id i8042_dmi_forcemux_table[] __initconst = {
        {
                /*
-                * Sony Vaio VGN-CS series require MUX or the touch sensor
-                * buttons will disturb touchpad operation
+                * HP Pavilion DV4017EA -
+                * errors on MUX ports are reported without raising AUXDATA
+                * causing "spurious NAK" messages.
                 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "VGN-CS"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Pavilion dv4000 (EA032EA#ABF)"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
-       { }
-};
-
-/*
- * On some Asus laptops, just running self tests cause problems.
- */
-static const struct dmi_system_id i8042_dmi_noselftest_table[] = {
        {
+               /*
+                * HP Pavilion ZT1000 -
+                * like DV4017EA does not raise AUXERR for errors on MUX ports.
+                */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                       DMI_MATCH(DMI_CHASSIS_TYPE, "10"), /* Notebook */
+                       DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion Notebook PC"),
+                       DMI_MATCH(DMI_PRODUCT_VERSION, "HP Pavilion Notebook ZT1000"),
                },
-       }, {
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
+       },
+       {
+               /*
+                * HP Pavilion DV4270ca -
+                * like DV4017EA does not raise AUXERR for errors on MUX ports.
+                */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                       DMI_MATCH(DMI_CHASSIS_TYPE, "31"), /* Convertible Notebook */
+                       DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Pavilion dv4000 (EH476UA#ABL)"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
-       { }
-};
-static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = {
        {
-               /* MSI Wind U-100 */
+               /* Newer HP Pavilion dv4 models */
                .matches = {
-                       DMI_MATCH(DMI_BOARD_NAME, "U-100"),
-                       DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv4 Notebook PC"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_NOTIMEOUT)
        },
        {
-               /* LG Electronics X110 */
+               /* IBM 2656 */
                .matches = {
-                       DMI_MATCH(DMI_BOARD_NAME, "X110"),
-                       DMI_MATCH(DMI_BOARD_VENDOR, "LG Electronics Inc."),
+                       DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "2656"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /* Acer Aspire One 150 */
+               /* Avatar AVIU-145A6 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "AOA150"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Intel"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "IC4I"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
+               /* Intel MBO Desktop D845PESV */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire A114-31"),
+                       DMI_MATCH(DMI_BOARD_VENDOR, "Intel Corporation"),
+                       DMI_MATCH(DMI_BOARD_NAME, "D845PESV"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOPNP)
        },
        {
+               /*
+                * Intel NUC D54250WYK - does not have i8042 controller but
+                * declares PS/2 devices in DSDT.
+                */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire A314-31"),
+                       DMI_MATCH(DMI_BOARD_VENDOR, "Intel Corporation"),
+                       DMI_MATCH(DMI_BOARD_NAME, "D54250WYK"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOPNP)
        },
        {
+               /* Lenovo 3000 n100 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire A315-31"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "076804U"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
+               /* Lenovo XiaoXin Air 12 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire ES1-132"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "80UN"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
+               /* Lenovo LaVie Z */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire ES1-332"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                       DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo LaVie Z"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
+               /* Lenovo Ideapad U455 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire ES1-432"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "20046"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS)
        },
        {
+               /* Lenovo ThinkPad L460 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate Spin B118-RN"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                       DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L460"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS)
        },
        {
-               /* Advent 4211 */
+               /* Lenovo ThinkPad Twist S230u */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "DIXONSXP"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Advent 4211"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS)
+       },
+       {
+               /* LG Electronics X110 */
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "LG Electronics Inc."),
+                       DMI_MATCH(DMI_BOARD_NAME, "X110"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS)
        },
        {
                /* Medion Akoya Mini E1210 */
@@ -680,6 +843,7 @@ static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = {
                        DMI_MATCH(DMI_SYS_VENDOR, "MEDION"),
                        DMI_MATCH(DMI_PRODUCT_NAME, "E1210"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS)
        },
        {
                /* Medion Akoya E1222 */
@@ -687,331 +851,434 @@ static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = {
                        DMI_MATCH(DMI_SYS_VENDOR, "MEDION"),
                        DMI_MATCH(DMI_PRODUCT_NAME, "E122X"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS)
        },
        {
-               /* Mivvy M310 */
+               /* MSI Wind U-100 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "VIOOO"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "N10"),
+                       DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"),
+                       DMI_MATCH(DMI_BOARD_NAME, "U-100"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS | SERIO_QUIRK_NOPNP)
        },
        {
-               /* Dell Vostro 1320 */
+               /*
+                * No data is coming from the touchscreen unless KBC
+                * is in legacy mode.
+                */
+               /* Panasonic CF-29 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1320"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Matsushita"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "CF-29"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /* Dell Vostro 1520 */
+               /* Medion Akoya E7225 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1520"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Medion"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Akoya E7225"),
+                       DMI_MATCH(DMI_PRODUCT_VERSION, "1.0"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOLOOP)
        },
        {
-               /* Dell Vostro 1720 */
+               /* Microsoft Virtual Machine */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1720"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Virtual Machine"),
+                       DMI_MATCH(DMI_PRODUCT_VERSION, "VS2005R2"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOLOOP)
        },
        {
-               /* Lenovo Ideapad U455 */
+               /* Medion MAM 2070 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "20046"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Notebook"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "MAM 2070"),
+                       DMI_MATCH(DMI_PRODUCT_VERSION, "5a"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOLOOP)
        },
        {
-               /* Lenovo ThinkPad L460 */
+               /* TUXEDO BU1406 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-                       DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L460"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Notebook"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "N24_25BU"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /* Clevo P650RS, 650RP6, Sager NP8152-S, and others */
+               /* OQO Model 01 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Notebook"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "P65xRP"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "OQO"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "ZEPTO"),
+                       DMI_MATCH(DMI_PRODUCT_VERSION, "00"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_NOLOOP)
+       },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "PEGATRON CORPORATION"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "C15B"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_NOLOOP)
+       },
+       {
+               /* Acer Aspire 5 A515 */
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "PK"),
+                       DMI_MATCH(DMI_BOARD_NAME, "Grumpy_PK"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_NOPNP)
+       },
+       {
+               /* ULI EV4873 - AUX LOOP does not work properly */
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "ULI"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "EV4873"),
+                       DMI_MATCH(DMI_PRODUCT_VERSION, "5a"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_NOLOOP)
+       },
+       {
+               /*
+                * Arima-Rioworks HDAMB -
+                * AUX LOOP command does not raise AUX IRQ
+                */
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "RIOWORKS"),
+                       DMI_MATCH(DMI_BOARD_NAME, "HDAMB"),
+                       DMI_MATCH(DMI_BOARD_VERSION, "Rev E"),
+               },
+               .driver_data = (void *)(SERIO_QUIRK_NOLOOP)
+       },
+       {
+               /* Sharp Actius MM20 */
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "SHARP"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "PC-MM20 Series"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /* Lenovo ThinkPad Twist S230u */
+               /*
+                * Sony Vaio FZ-240E -
+                * reset and GET ID commands issued via KBD port are
+                * sometimes being delivered to AUX3.
+                */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FZ240E"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /* Entroware Proteus */
+               /*
+                * Most (all?) VAIOs do not have external PS/2 ports nor
+                * they implement active multiplexing properly, and
+                * MUX discovery usually messes up keyboard/touchpad.
+                */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Entroware"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Proteus"),
-                       DMI_MATCH(DMI_PRODUCT_VERSION, "EL07R4"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+                       DMI_MATCH(DMI_BOARD_NAME, "VAIO"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
-       { }
-};
-
-#ifdef CONFIG_PNP
-static const struct dmi_system_id __initconst i8042_dmi_nopnp_table[] = {
        {
-               /* Intel MBO Desktop D845PESV */
+               /* Sony Vaio FS-115b */
                .matches = {
-                       DMI_MATCH(DMI_BOARD_NAME, "D845PESV"),
-                       DMI_MATCH(DMI_BOARD_VENDOR, "Intel Corporation"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FS115B"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
                /*
-                * Intel NUC D54250WYK - does not have i8042 controller but
-                * declares PS/2 devices in DSDT.
+                * Sony Vaio VGN-CS series require MUX or the touch sensor
+                * buttons will disturb touchpad operation
                 */
                .matches = {
-                       DMI_MATCH(DMI_BOARD_NAME, "D54250WYK"),
-                       DMI_MATCH(DMI_BOARD_VENDOR, "Intel Corporation"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "VGN-CS"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_FORCEMUX)
        },
        {
-               /* MSI Wind U-100 */
                .matches = {
-                       DMI_MATCH(DMI_BOARD_NAME, "U-100"),
-                       DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Satellite P10"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
        {
-               /* Acer Aspire 5 A515 */
                .matches = {
-                       DMI_MATCH(DMI_BOARD_NAME, "Grumpy_PK"),
-                       DMI_MATCH(DMI_BOARD_VENDOR, "PK"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "EQUIUM A110"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
-       { }
-};
-
-static const struct dmi_system_id __initconst i8042_dmi_laptop_table[] = {
        {
                .matches = {
-                       DMI_MATCH(DMI_CHASSIS_TYPE, "8"), /* Portable */
+                       DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "SATELLITE C850D"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX)
        },
+       /*
+        * A lot of modern Clevo barebones have touchpad and/or keyboard issues
+        * after suspend fixable with nomux + reset + noloop + nopnp. Luckily,
+        * none of them have an external PS/2 port so this can safely be set for
+        * all of them. These two are based on a Clevo design, but have the
+        * board_name changed.
+        */
        {
                .matches = {
-                       DMI_MATCH(DMI_CHASSIS_TYPE, "9"), /* Laptop */
+                       DMI_MATCH(DMI_BOARD_VENDOR, "TUXEDO"),
+                       DMI_MATCH(DMI_BOARD_NAME, "AURA1501"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
        },
        {
                .matches = {
-                       DMI_MATCH(DMI_CHASSIS_TYPE, "10"), /* Notebook */
+                       DMI_MATCH(DMI_BOARD_VENDOR, "TUXEDO"),
+                       DMI_MATCH(DMI_BOARD_NAME, "EDUBOOK1502"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
        },
        {
+               /* Mivvy M310 */
                .matches = {
-                       DMI_MATCH(DMI_CHASSIS_TYPE, "14"), /* Sub-Notebook */
+                       DMI_MATCH(DMI_SYS_VENDOR, "VIOOO"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "N10"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS)
        },
-       { }
-};
-#endif
-
-static const struct dmi_system_id __initconst i8042_dmi_notimeout_table[] = {
+       /*
+        * Some laptops need keyboard reset before probing for the trackpad to get
+        * it detected, initialised & finally work.
+        */
        {
-               /* Dell Vostro V13 */
+               /* Schenker XMG C504 - Elantech touchpad */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V13"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "XMG"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "C504"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_KBDRESET)
        },
        {
-               /* Newer HP Pavilion dv4 models */
+               /* Blue FB5601 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv4 Notebook PC"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "blue"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "FB5601"),
+                       DMI_MATCH(DMI_PRODUCT_VERSION, "M606"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOLOOP)
        },
+       /*
+        * A lot of modern Clevo barebones have touchpad and/or keyboard issues
+        * after suspend fixable with nomux + reset + noloop + nopnp. Luckily,
+        * none of them have an external PS/2 port so this can safely be set for
+        * all of them.
+        * Clevo barebones come with board_vendor and/or system_vendor set to
+        * either the very generic string "Notebook" and/or a different value
+        * for each individual reseller. The only somewhat universal way to
+        * identify them is by board_name.
+        */
        {
-               /* Fujitsu A544 laptop */
-               /* https://bugzilla.redhat.com/show_bug.cgi?id=1111138 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK A544"),
+                       DMI_MATCH(DMI_BOARD_NAME, "LAPQC71A"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
        },
        {
-               /* Fujitsu AH544 laptop */
-               /* https://bugzilla.kernel.org/show_bug.cgi?id=69731 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK AH544"),
+                       DMI_MATCH(DMI_BOARD_NAME, "LAPQC71B"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
        },
        {
-               /* Fujitsu Lifebook T725 laptop */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK T725"),
+                       DMI_MATCH(DMI_BOARD_NAME, "N140CU"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
        },
        {
-               /* Fujitsu U574 laptop */
-               /* https://bugzilla.kernel.org/show_bug.cgi?id=69731 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK U574"),
+                       DMI_MATCH(DMI_BOARD_NAME, "N141CU"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
        },
        {
-               /* Fujitsu UH554 laptop */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK UH544"),
+                       DMI_MATCH(DMI_BOARD_NAME, "NH5xAx"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
        },
-       { }
-};
-
-/*
- * Some Wistron based laptops need us to explicitly enable the 'Dritek
- * keyboard extension' to make their extra keys start generating scancodes.
- * Originally, this was just confined to older laptops, but a few Acer laptops
- * have turned up in 2007 that also need this again.
- */
-static const struct dmi_system_id __initconst i8042_dmi_dritek_table[] = {
        {
-               /* Acer Aspire 5100 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5100"),
+                       DMI_MATCH(DMI_BOARD_NAME, "NL5xRU"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
        },
+       /*
+        * At least one modern Clevo barebone has the touchpad connected both
+        * via PS/2 and i2c interface. This causes a race condition between the
+        * psmouse and i2c-hid driver. Since the full capability of the touchpad
+        * is available via the i2c interface and the device has no external
+        * PS/2 port, it is safe to just ignore all ps2 mouses here to avoid
+        * this issue. The known affected device is the
+        * TUXEDO InfinityBook S17 Gen6 / Clevo NS70MU which comes with one of
+        * the two different dmi strings below. NS50MU is not a typo!
+        */
        {
-               /* Acer Aspire 5610 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5610"),
+                       DMI_MATCH(DMI_BOARD_NAME, "NS50MU"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOAUX | SERIO_QUIRK_NOMUX |
+                                       SERIO_QUIRK_RESET_ALWAYS | SERIO_QUIRK_NOLOOP |
+                                       SERIO_QUIRK_NOPNP)
        },
        {
-               /* Acer Aspire 5630 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5630"),
+                       DMI_MATCH(DMI_BOARD_NAME, "NS50_70MU"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOAUX | SERIO_QUIRK_NOMUX |
+                                       SERIO_QUIRK_RESET_ALWAYS | SERIO_QUIRK_NOLOOP |
+                                       SERIO_QUIRK_NOPNP)
        },
        {
-               /* Acer Aspire 5650 */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5650"),
+                       DMI_MATCH(DMI_BOARD_NAME, "NJ50_70CU"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
        },
        {
-               /* Acer Aspire 5680 */
+               /*
+                * This is only a partial board_name and might be followed by
+                * another letter or number. DMI_MATCH however does do partial
+                * matching.
+                */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5680"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "P65xH"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
        },
        {
-               /* Acer Aspire 5720 */
+               /* Clevo P650RS, 650RP6, Sager NP8152-S, and others */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5720"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "P65xRP"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
        },
        {
-               /* Acer Aspire 9110 */
+               /*
+                * This is only a partial board_name and might be followed by
+                * another letter or number. DMI_MATCH however does do partial
+                * matching.
+                */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 9110"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "P65_P67H"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
        },
        {
-               /* Acer TravelMate 660 */
+               /*
+                * This is only a partial board_name and might be followed by
+                * another letter or number. DMI_MATCH however does do partial
+                * matching.
+                */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 660"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "P65_67RP"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
        },
        {
-               /* Acer TravelMate 2490 */
+               /*
+                * This is only a partial board_name and might be followed by
+                * another letter or number. DMI_MATCH however does do partial
+                * matching.
+                */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 2490"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "P65_67RS"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
        },
        {
-               /* Acer TravelMate 4280 */
+               /*
+                * This is only a partial board_name and might be followed by
+                * another letter or number. DMI_MATCH however does do partial
+                * matching.
+                */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4280"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "P67xRP"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
        },
-       { }
-};
-
-/*
- * Some laptops need keyboard reset before probing for the trackpad to get
- * it detected, initialised & finally work.
- */
-static const struct dmi_system_id __initconst i8042_dmi_kbdreset_table[] = {
        {
-               /* Gigabyte P35 v2 - Elantech touchpad */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "P35V2"),
+                       DMI_MATCH(DMI_BOARD_NAME, "PB50_70DFx,DDx"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
        },
-               {
-               /* Aorus branded Gigabyte X3 Plus - Elantech touchpad */
+       {
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "X3"),
+                       DMI_MATCH(DMI_BOARD_NAME, "X170SM"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
        },
        {
-               /* Gigabyte P34 - Elantech touchpad */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "P34"),
+                       DMI_MATCH(DMI_BOARD_NAME, "X170KM-G"),
                },
+               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
+                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
        },
+       { }
+};
+
+#ifdef CONFIG_PNP
+static const struct dmi_system_id i8042_dmi_laptop_table[] __initconst = {
        {
-               /* Gigabyte P57 - Elantech touchpad */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "P57"),
+                       DMI_MATCH(DMI_CHASSIS_TYPE, "8"), /* Portable */
                },
        },
        {
-               /* Schenker XMG C504 - Elantech touchpad */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "XMG"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "C504"),
+                       DMI_MATCH(DMI_CHASSIS_TYPE, "9"), /* Laptop */
                },
        },
-       { }
-};
-
-static const struct dmi_system_id i8042_dmi_probe_defer_table[] __initconst = {
        {
-               /* ASUS ZenBook UX425UA */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "ZenBook UX425UA"),
+                       DMI_MATCH(DMI_CHASSIS_TYPE, "10"), /* Notebook */
                },
        },
        {
-               /* ASUS ZenBook UM325UA */
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "ZenBook UX325UA_UM325UA"),
+                       DMI_MATCH(DMI_CHASSIS_TYPE, "14"), /* Sub-Notebook */
                },
        },
        { }
 };
+#endif
 
 #endif /* CONFIG_X86 */
 
@@ -1167,11 +1434,6 @@ static int __init i8042_pnp_init(void)
        bool pnp_data_busted = false;
        int err;
 
-#ifdef CONFIG_X86
-       if (dmi_check_system(i8042_dmi_nopnp_table))
-               i8042_nopnp = true;
-#endif
-
        if (i8042_nopnp) {
                pr_info("PNP detection disabled\n");
                return 0;
@@ -1275,6 +1537,59 @@ static inline int i8042_pnp_init(void) { return 0; }
 static inline void i8042_pnp_exit(void) { }
 #endif /* CONFIG_PNP */
 
+
+#ifdef CONFIG_X86
+static void __init i8042_check_quirks(void)
+{
+       const struct dmi_system_id *device_quirk_info;
+       uintptr_t quirks;
+
+       device_quirk_info = dmi_first_match(i8042_dmi_quirk_table);
+       if (!device_quirk_info)
+               return;
+
+       quirks = (uintptr_t)device_quirk_info->driver_data;
+
+       if (quirks & SERIO_QUIRK_NOKBD)
+               i8042_nokbd = true;
+       if (quirks & SERIO_QUIRK_NOAUX)
+               i8042_noaux = true;
+       if (quirks & SERIO_QUIRK_NOMUX)
+               i8042_nomux = true;
+       if (quirks & SERIO_QUIRK_FORCEMUX)
+               i8042_nomux = false;
+       if (quirks & SERIO_QUIRK_UNLOCK)
+               i8042_unlock = true;
+       if (quirks & SERIO_QUIRK_PROBE_DEFER)
+               i8042_probe_defer = true;
+       /* Honor module parameter when value is not default */
+       if (i8042_reset == I8042_RESET_DEFAULT) {
+               if (quirks & SERIO_QUIRK_RESET_ALWAYS)
+                       i8042_reset = I8042_RESET_ALWAYS;
+               if (quirks & SERIO_QUIRK_RESET_NEVER)
+                       i8042_reset = I8042_RESET_NEVER;
+       }
+       if (quirks & SERIO_QUIRK_DIECT)
+               i8042_direct = true;
+       if (quirks & SERIO_QUIRK_DUMBKBD)
+               i8042_dumbkbd = true;
+       if (quirks & SERIO_QUIRK_NOLOOP)
+               i8042_noloop = true;
+       if (quirks & SERIO_QUIRK_NOTIMEOUT)
+               i8042_notimeout = true;
+       if (quirks & SERIO_QUIRK_KBDRESET)
+               i8042_kbdreset = true;
+       if (quirks & SERIO_QUIRK_DRITEK)
+               i8042_dritek = true;
+#ifdef CONFIG_PNP
+       if (quirks & SERIO_QUIRK_NOPNP)
+               i8042_nopnp = true;
+#endif
+}
+#else
+static inline void i8042_check_quirks(void) {}
+#endif
+
 static int __init i8042_platform_init(void)
 {
        int retval;
@@ -1297,45 +1612,42 @@ static int __init i8042_platform_init(void)
        i8042_kbd_irq = I8042_MAP_IRQ(1);
        i8042_aux_irq = I8042_MAP_IRQ(12);
 
-       retval = i8042_pnp_init();
-       if (retval)
-               return retval;
-
 #if defined(__ia64__)
-        i8042_reset = I8042_RESET_ALWAYS;
+       i8042_reset = I8042_RESET_ALWAYS;
 #endif
 
+       i8042_check_quirks();
+
+       pr_debug("Active quirks (empty means none):%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
+               i8042_nokbd ? " nokbd" : "",
+               i8042_noaux ? " noaux" : "",
+               i8042_nomux ? " nomux" : "",
+               i8042_unlock ? " unlock" : "",
+               i8042_probe_defer ? "probe_defer" : "",
+               i8042_reset == I8042_RESET_DEFAULT ?
+                       "" : i8042_reset == I8042_RESET_ALWAYS ?
+                               " reset_always" : " reset_never",
+               i8042_direct ? " direct" : "",
+               i8042_dumbkbd ? " dumbkbd" : "",
+               i8042_noloop ? " noloop" : "",
+               i8042_notimeout ? " notimeout" : "",
+               i8042_kbdreset ? " kbdreset" : "",
 #ifdef CONFIG_X86
-       /* Honor module parameter when value is not default */
-       if (i8042_reset == I8042_RESET_DEFAULT) {
-               if (dmi_check_system(i8042_dmi_reset_table))
-                       i8042_reset = I8042_RESET_ALWAYS;
-
-               if (dmi_check_system(i8042_dmi_noselftest_table))
-                       i8042_reset = I8042_RESET_NEVER;
-       }
-
-       if (dmi_check_system(i8042_dmi_noloop_table))
-               i8042_noloop = true;
-
-       if (dmi_check_system(i8042_dmi_nomux_table))
-               i8042_nomux = true;
-
-       if (dmi_check_system(i8042_dmi_forcemux_table))
-               i8042_nomux = false;
-
-       if (dmi_check_system(i8042_dmi_notimeout_table))
-               i8042_notimeout = true;
-
-       if (dmi_check_system(i8042_dmi_dritek_table))
-               i8042_dritek = true;
-
-       if (dmi_check_system(i8042_dmi_kbdreset_table))
-               i8042_kbdreset = true;
+               i8042_dritek ? " dritek" : "",
+#else
+               "",
+#endif
+#ifdef CONFIG_PNP
+               i8042_nopnp ? " nopnp" : "");
+#else
+               "");
+#endif
 
-       if (dmi_check_system(i8042_dmi_probe_defer_table))
-               i8042_probe_defer = true;
+       retval = i8042_pnp_init();
+       if (retval)
+               return retval;
 
+#ifdef CONFIG_X86
        /*
         * A20 was already enabled during early kernel init. But some buggy
         * BIOSes (in MSI Laptops) require A20 to be enabled using 8042 to