From patchwork Wed Jul 21 16:16:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anisse Astier X-Patchwork-Id: 113381 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6LGHZdC027051 for ; Wed, 21 Jul 2010 16:17:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760831Ab0GUQRQ (ORCPT ); Wed, 21 Jul 2010 12:17:16 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:63609 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760660Ab0GUQRO (ORCPT ); Wed, 21 Jul 2010 12:17:14 -0400 Received: by eya25 with SMTP id 25so1713656eya.19 for ; Wed, 21 Jul 2010 09:17:13 -0700 (PDT) Received: by 10.213.27.68 with SMTP id h4mr3512417ebc.98.1279729033027; Wed, 21 Jul 2010 09:17:13 -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 a48sm53579448eei.18.2010.07.21.09.17.12 (version=SSLv3 cipher=RC4-MD5); Wed, 21 Jul 2010 09:17:12 -0700 (PDT) Date: Wed, 21 Jul 2010 18:16:25 +0200 From: Anisse Astier To: linux-input@vger.kernel.org, Dmitry Torokhov Subject: [PATCH] [resend] Input: i8042 - introduce noaux dmi quirk for MSI AE2220 Message-ID: <20100721181625.286f147c@destiny.ordissimo> X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; 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]); Wed, 21 Jul 2010 16:17:35 +0000 (UTC) diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index 6168469..f5f81e2 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[] = { { @@ -871,6 +885,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;