From patchwork Tue Mar 31 21:47:49 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Garrett X-Patchwork-Id: 15507 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2VLmpr5017946 for ; Tue, 31 Mar 2009 21:48:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763716AbZCaVr5 (ORCPT ); Tue, 31 Mar 2009 17:47:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1763452AbZCaVr5 (ORCPT ); Tue, 31 Mar 2009 17:47:57 -0400 Received: from cavan.codon.org.uk ([93.93.128.6]:46152 "EHLO vavatch.codon.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1763050AbZCaVrz (ORCPT ); Tue, 31 Mar 2009 17:47:55 -0400 Received: from mjg59 by vavatch.codon.org.uk with local (Exim 4.69) (envelope-from ) id 1LoloD-0007nD-Dx; Tue, 31 Mar 2009 22:47:49 +0100 Date: Tue, 31 Mar 2009 22:47:49 +0100 From: Matthew Garrett To: linux-acpi@vger.kernel.org Cc: dsilvers@simtec.co.uk, toshiba_acpi@memebeam.org, linux-kernel@vger.kernel.org, lenb@intel.com Subject: [PATCH 2/2] toshiba-acpi: Support TOS1900-type devices Message-ID: <20090331214749.GD29489@srcf.ucam.org> References: <20090331214501.GC29489@srcf.ucam.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20090331214501.GC29489@srcf.ucam.org> User-Agent: Mutt/1.5.12-2006-07-14 X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: mjg59@codon.org.uk X-SA-Exim-Scanned: No (on vavatch.codon.org.uk); SAEximRunCond expanded to false Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Despite toshiba_acpi exporting TOS1900 as a modalias, it doesn't appear to support these machines. They have their HCI method implemented in a different but compatible manner and so need a different method address. Signed-off-by: Matthew Garrett --- drivers/platform/x86/toshiba_acpi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index fb87b57..9fb4873 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c @@ -67,6 +67,7 @@ MODULE_LICENSE("GPL"); #define TOSH_INTERFACE_2 "\\_SB_.VALZ" #define METHOD_VIDEO_OUT "\\_SB_.VALX.DSSX" #define GHCI_METHOD ".GHCI" +#define SPFC_METHOD ".SPFC" /* Toshiba HCI interface definitions * @@ -935,6 +936,10 @@ static int __init toshiba_acpi_init(void) method_hci = TOSH_INTERFACE_2 GHCI_METHOD; if (toshiba_acpi_setup_keyboard(TOSH_INTERFACE_2)) printk(MY_INFO "Unable to activate hotkeys\n"); + } else if (is_valid_acpi_path(TOSH_INTERFACE_2 SPFC_METHOD)) { + method_hci = TOSH_INTERFACE_2 SPFC_METHOD; + if (toshiba_acpi_setup_keyboard(TOSH_INTERFACE_2)) + printk(MY_INFO "Unable to activate hotkeys\n"); } else return -ENODEV;