From patchwork Tue Mar 23 14:50:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anisse Astier X-Patchwork-Id: 87654 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2NEpfgT029956 for ; Tue, 23 Mar 2010 14:51:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754373Ab0CWOvI (ORCPT ); Tue, 23 Mar 2010 10:51:08 -0400 Received: from mail-px0-f184.google.com ([209.85.216.184]:61889 "EHLO mail-px0-f184.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754323Ab0CWOvG (ORCPT ); Tue, 23 Mar 2010 10:51:06 -0400 Received: by pxi14 with SMTP id 14so4058640pxi.15 for ; Tue, 23 Mar 2010 07:51:06 -0700 (PDT) Received: by 10.141.15.10 with SMTP id s10mr6637591rvi.40.1269355865616; Tue, 23 Mar 2010 07:51:05 -0700 (PDT) Received: from destiny.ordissimo (mar92-5-82-225-147-143.fbx.proxad.net [82.225.147.143]) by mx.google.com with ESMTPS id g14sm89213rvb.13.2010.03.23.07.51.00 (version=SSLv3 cipher=RC4-MD5); Tue, 23 Mar 2010 07:51:03 -0700 (PDT) Date: Tue, 23 Mar 2010 15:50:24 +0100 From: Anisse Astier To: Dmitry Torokhov , linux-input@vger.kernel.org Subject: [PATCH] Input: i8042 - introduce noaux dmi quirk for MSI AE2220 Message-ID: <20100323155025.3a541cbd@destiny.ordissimo> In-Reply-To: <20100322144514.45391412@destiny.ordissimo> References: <20100319103450.56c6e278@destiny.ordissimo> <20100322043924.GD31621@core.coreip.homeip.net> <20100322144514.45391412@destiny.ordissimo> X-Mailer: Claws Mail 3.7.4 (GTK+ 2.12.12; i486-pc-linux-gnu) Mime-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 23 Mar 2010 14:51:42 +0000 (UTC) diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index ead0494..de7af20 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -479,6 +479,20 @@ static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = { { } }; +static const struct dmi_system_id __initconst i8042_dmi_noaux_table[] = { + { + /* + * MSI AE2220 + * Timeout (10 sec) at boot if not passed noaux + */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"), + DMI_MATCH(DMI_PRODUCT_NAME, "MS-6657"), + }, + }, + { } +}; + #ifdef CONFIG_PNP static const struct dmi_system_id __initconst i8042_dmi_nopnp_table[] = { { @@ -857,6 +871,9 @@ static int __init i8042_platform_init(void) if (dmi_check_system(i8042_dmi_dritek_table)) i8042_dritek = true; + + if (dmi_check_system(i8042_dmi_noaux_table)) + i8042_noaux = true; #endif /* CONFIG_X86 */ return retval;