]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Input: i8042 - do not try to load on Intel NUC D54250WYK
authorTodor Minchev <todor.minchev@intel.com>
Tue, 2 Dec 2014 23:16:39 +0000 (15:16 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 3 Dec 2014 05:34:40 +0000 (21:34 -0800)
The Intel NUC D54250WYK has no PS/2 controller, however the DSDT declares
PS/2 devices which trigger the loading of the i8042 driver.

Signed-off-by: Todor Minchev <todor.minchev@intel.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/serio/i8042-x86ia64io.h

index a0bcbb64d06d8eebc98ec147987cd75b875db251..a26366a263a518a9e3ea90cbc3052c22b190087e 100644 (file)
@@ -313,6 +313,16 @@ static const struct dmi_system_id __initconst i8042_dmi_nopnp_table[] = {
                        DMI_MATCH(DMI_BOARD_VENDOR, "Intel Corporation"),
                },
        },
+       {
+               /*
+                * Intel NUC D54250WYK - does not have i8042 controller but
+                * declares PS/2 devices in DSDT.
+                */
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_NAME, "D54250WYK"),
+                       DMI_MATCH(DMI_BOARD_VENDOR, "Intel Corporation"),
+               },
+       },
        {
                /* MSI Wind U-100 */
                .matches = {