Messages in this thread Patch in this message | | | Date | Tue, 31 Mar 2009 22:47:49 +0100 | From | Matthew Garrett <> | Subject | [PATCH 2/2] toshiba-acpi: Support TOS1900-type devices |
| |
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 <mjg@redhat.com> --- 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; -- Matthew Garrett | mjg59@srcf.ucam.org
| |