From patchwork Fri Jul 2 04:46:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 109800 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 o624kHw9022106 for ; Fri, 2 Jul 2010 04:46:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751884Ab0GBEqQ (ORCPT ); Fri, 2 Jul 2010 00:46:16 -0400 Received: from mail-px0-f174.google.com ([209.85.212.174]:42946 "EHLO mail-px0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751644Ab0GBEqO (ORCPT ); Fri, 2 Jul 2010 00:46:14 -0400 Received: by pxi14 with SMTP id 14so651206pxi.19 for ; Thu, 01 Jul 2010 21:46:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=hWRkcSI5DTINZqGYZ0L7GZfM61+vhsK6XH/yl/OXqVw=; b=LplzP8iMrC6P0DmRVfE6YRVmg4rAgeDcCRH/7E9mcewLNJpO1NZrM4g/Lrgvngvta6 TkaP2AesDVas1lsWbCXb4r2MmL15W4JNHwavSKi1TiURPIwGgqSfFLMIBiz3d7uq9s8q LXSnmBlRqZEUzcJ1614xAoD7LEFwoqqFEfr3M= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=toATotUhvBJzkB3HGnIu2KtUiwFuGYXBxnlsv2MJHyBgznFrGFdgpBQZOUpa3XDj5k IxhMb2gBmX96fqOSDCLDW4UOha6C2v3R9A0EA8T0yNjFv5AskvE+H2OV1I23cphsJJNq 6o4NAcpG8vojSVWzPTV0vtihtBUfBbjVEf+6I= Received: by 10.114.15.5 with SMTP id 5mr240843wao.83.1278045973832; Thu, 01 Jul 2010 21:46:13 -0700 (PDT) Received: from mailhub.coreip.homeip.net (c-24-6-153-206.hsd1.ca.comcast.net [24.6.153.206]) by mx.google.com with ESMTPS id c10sm4030529wam.13.2010.07.01.21.46.10 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 01 Jul 2010 21:46:11 -0700 (PDT) Date: Thu, 1 Jul 2010 21:46:07 -0700 From: Dmitry Torokhov To: "Pan, Jacob jun" Cc: Randy Dunlap , Stephen Rothwell , "linux-next@vger.kernel.org" , LKML , "linux-input@vger.kernel.org" , akpm , "chuck.lever@oracle.com" , "H. Peter Anvin" , Arjan van de Ven , Thomas Gleixner , kphillisjr@gmail.com Subject: Re: problem: Re: [PATCH] input: fixup X86_MRST selects Message-ID: <20100702044607.GA1203@core.coreip.homeip.net> References: <20100609133443.38f1f957.sfr@canb.auug.org.au> <201006101204.45709.dmitry.torokhov@gmail.com> <4C28F210.7030909@oracle.com> <201006281318.16377.dmitry.torokhov@gmail.com> <4C2904D0.3000409@oracle.com> <43F901BD926A4E43B106BF17856F0755EA339079@orsmsx508.amr.corp.intel.com> <20100628224440.GA19087@core.coreip.homeip.net> <43F901BD926A4E43B106BF17856F0755EA339200@orsmsx508.amr.corp.intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <43F901BD926A4E43B106BF17856F0755EA339200@orsmsx508.amr.corp.intel.com> User-Agent: Mutt/1.5.20 (2009-12-10) 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]); Fri, 02 Jul 2010 04:46:17 +0000 (UTC) diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index d3a99de..b25917b 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -69,11 +69,11 @@ config KEYBOARD_ATARI module will be called atakbd. config KEYBOARD_ATKBD - tristate "AT keyboard" if EMBEDDED || !X86 || X86_MRST + tristate "AT keyboard" if EMBEDDED || !X86 default y select SERIO select SERIO_LIBPS2 - select SERIO_I8042 if X86 && !X86_MRST + select SERIO_I8042 if X86 select SERIO_GSCPS2 if GSC help Say Y here if you want to use a standard AT or PS/2 keyboard. Usually diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig index eeb58c1..c714ca2 100644 --- a/drivers/input/mouse/Kconfig +++ b/drivers/input/mouse/Kconfig @@ -17,7 +17,7 @@ config MOUSE_PS2 default y select SERIO select SERIO_LIBPS2 - select SERIO_I8042 if X86 && !X86_MRST + select SERIO_I8042 if X86 select SERIO_GSCPS2 if GSC help Say Y here if you have a PS/2 mouse connected to your system. This diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig index 256b9e9..3bfe8fa 100644 --- a/drivers/input/serio/Kconfig +++ b/drivers/input/serio/Kconfig @@ -22,7 +22,7 @@ config SERIO_I8042 tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86 default y depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \ - (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN && !X86_MRST + (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN help i8042 is the chip over which the standard AT keyboard and PS/2 mouse are connected to the computer. If you use these devices, diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index 723106c..a6a4a2f 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -844,10 +844,28 @@ static inline int i8042_pnp_init(void) { return 0; } static inline void i8042_pnp_exit(void) { } #endif +#if CONFIG_X86 +#include +static bool i8042_legacy_free_platform(void) +{ + /* + * Moorestown platform does not have i8042 nor does it + * have other legacy devices, such as i8259. Use ths fact + * to detect that we are running on a legacy-free platform. + */ + return legacy_pic == &null_legacy_pic; +} +#else +static bool i8042_legacy_free_platform(void) { } +#endif + static int __init i8042_platform_init(void) { int retval; + if (i8042_legacy_free_platform()) + return -ENXIO; + /* * On ix86 platforms touching the i8042 data register region can do really * bad things. Because of this the region is always reserved on ix86 boxes.