| From bjorn@mork.no Wed Nov 2 14:11:41 2011 |
| From: Manoj Iyer <manoj.iyer@canonical.com> |
| Date: Thu, 20 Oct 2011 20:50:25 +0200 |
| Subject: thinkpad-acpi: module autoloading for newer Lenovo ThinkPads. |
| To: stable@vger.kernel.org |
| Cc: Manoj Iyer <manoj.iyer@canonical.com>, Andy Lutomirski <luto@mit.edu>, Matthew Garrett <mjg@redhat.com> |
| Message-ID: <1319136625-29820-1-git-send-email-bjorn@mork.no> |
| |
| From: Manoj Iyer <manoj.iyer@canonical.com> |
| |
| commit 9fbdaeb4f4dd14a0caa9fc35c496d5440c251a3a upstream. |
| |
| The newer Lenovo ThinkPads have HKEY HID of LEN0068 instead |
| of IBM0068. Added new HID so that thinkpad_acpi module will |
| auto load on these newer Lenovo ThinkPads. |
| |
| Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com> |
| Signed-off-by: Andy Lutomirski <luto@mit.edu> |
| Signed-off-by: Matthew Garrett <mjg@redhat.com> |
| Signed-off-by: BjΓΈrn Mork <bjorn@mork.no> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/platform/x86/thinkpad_acpi.c | 7 +++++-- |
| 1 file changed, 5 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/platform/x86/thinkpad_acpi.c |
| +++ b/drivers/platform/x86/thinkpad_acpi.c |
| @@ -122,7 +122,9 @@ enum { |
| }; |
| |
| /* ACPI HIDs */ |
| -#define TPACPI_ACPI_HKEY_HID "IBM0068" |
| +#define TPACPI_ACPI_IBM_HKEY_HID "IBM0068" |
| +#define TPACPI_ACPI_LENOVO_HKEY_HID "LEN0068" |
| +#define TPACPI_ACPI_EC_HID "PNP0C09" |
| |
| /* Input IDs */ |
| #define TPACPI_HKEY_INPUT_PRODUCT 0x5054 /* "TP" */ |
| @@ -3849,7 +3851,8 @@ errexit: |
| } |
| |
| static const struct acpi_device_id ibm_htk_device_ids[] = { |
| - {TPACPI_ACPI_HKEY_HID, 0}, |
| + {TPACPI_ACPI_IBM_HKEY_HID, 0}, |
| + {TPACPI_ACPI_LENOVO_HKEY_HID, 0}, |
| {"", 0}, |
| }; |
| |
