Commit e3d183c0 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'platform-drivers-x86-v4.9-3' of...

Merge tag 'platform-drivers-x86-v4.9-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86

Pull x86 platform driver fixes from Darren Hart:
 "Minor doc fix, a DMI match for ideapad and a fix to toshiba-wmi to
  avoid loading on non-toshiba systems.

  Documentation/ABI:
   - ibm_rtl: The "What:" fields are incomplete

  toshiba-wmi:
   - Fix loading the driver on non Toshiba laptops

  ideapad-laptop:
   - Add another DMI entry for Yoga 900"

* tag 'platform-drivers-x86-v4.9-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
  Documentation/ABI: ibm_rtl: The "What:" fields are incomplete
  toshiba-wmi: Fix loading the driver on non Toshiba laptops
  ideapad-laptop: Add another DMI entry for Yoga 900
parents 5f3a5cb8 8ec4b736
What: state What: /sys/devices/system/ibm_rtl/state
Date: Sep 2010 Date: Sep 2010
KernelVersion: 2.6.37 KernelVersion: 2.6.37
Contact: Vernon Mauery <vernux@us.ibm.com> Contact: Vernon Mauery <vernux@us.ibm.com>
...@@ -10,7 +10,7 @@ Description: The state file allows a means by which to change in and ...@@ -10,7 +10,7 @@ Description: The state file allows a means by which to change in and
Users: The ibm-prtm userspace daemon uses this interface. Users: The ibm-prtm userspace daemon uses this interface.
What: version What: /sys/devices/system/ibm_rtl/version
Date: Sep 2010 Date: Sep 2010
KernelVersion: 2.6.37 KernelVersion: 2.6.37
Contact: Vernon Mauery <vernux@us.ibm.com> Contact: Vernon Mauery <vernux@us.ibm.com>
......
...@@ -933,6 +933,13 @@ static const struct dmi_system_id no_hw_rfkill_list[] = { ...@@ -933,6 +933,13 @@ static const struct dmi_system_id no_hw_rfkill_list[] = {
DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 900"), DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 900"),
}, },
}, },
{
.ident = "Lenovo Yoga 900",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
DMI_MATCH(DMI_BOARD_NAME, "VIUU4"),
},
},
{ {
.ident = "Lenovo YOGA 910-13IKB", .ident = "Lenovo YOGA 910-13IKB",
.matches = { .matches = {
......
...@@ -24,14 +24,15 @@ ...@@ -24,14 +24,15 @@
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/input/sparse-keymap.h> #include <linux/input/sparse-keymap.h>
#include <linux/dmi.h>
MODULE_AUTHOR("Azael Avalos"); MODULE_AUTHOR("Azael Avalos");
MODULE_DESCRIPTION("Toshiba WMI Hotkey Driver"); MODULE_DESCRIPTION("Toshiba WMI Hotkey Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
#define TOSHIBA_WMI_EVENT_GUID "59142400-C6A3-40FA-BADB-8A2652834100" #define WMI_EVENT_GUID "59142400-C6A3-40FA-BADB-8A2652834100"
MODULE_ALIAS("wmi:"TOSHIBA_WMI_EVENT_GUID); MODULE_ALIAS("wmi:"WMI_EVENT_GUID);
static struct input_dev *toshiba_wmi_input_dev; static struct input_dev *toshiba_wmi_input_dev;
...@@ -63,6 +64,16 @@ static void toshiba_wmi_notify(u32 value, void *context) ...@@ -63,6 +64,16 @@ static void toshiba_wmi_notify(u32 value, void *context)
kfree(response.pointer); kfree(response.pointer);
} }
static struct dmi_system_id toshiba_wmi_dmi_table[] __initdata = {
{
.ident = "Toshiba laptop",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
},
},
{}
};
static int __init toshiba_wmi_input_setup(void) static int __init toshiba_wmi_input_setup(void)
{ {
acpi_status status; acpi_status status;
...@@ -81,7 +92,7 @@ static int __init toshiba_wmi_input_setup(void) ...@@ -81,7 +92,7 @@ static int __init toshiba_wmi_input_setup(void)
if (err) if (err)
goto err_free_dev; goto err_free_dev;
status = wmi_install_notify_handler(TOSHIBA_WMI_EVENT_GUID, status = wmi_install_notify_handler(WMI_EVENT_GUID,
toshiba_wmi_notify, NULL); toshiba_wmi_notify, NULL);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
err = -EIO; err = -EIO;
...@@ -95,7 +106,7 @@ static int __init toshiba_wmi_input_setup(void) ...@@ -95,7 +106,7 @@ static int __init toshiba_wmi_input_setup(void)
return 0; return 0;
err_remove_notifier: err_remove_notifier:
wmi_remove_notify_handler(TOSHIBA_WMI_EVENT_GUID); wmi_remove_notify_handler(WMI_EVENT_GUID);
err_free_keymap: err_free_keymap:
sparse_keymap_free(toshiba_wmi_input_dev); sparse_keymap_free(toshiba_wmi_input_dev);
err_free_dev: err_free_dev:
...@@ -105,7 +116,7 @@ static int __init toshiba_wmi_input_setup(void) ...@@ -105,7 +116,7 @@ static int __init toshiba_wmi_input_setup(void)
static void toshiba_wmi_input_destroy(void) static void toshiba_wmi_input_destroy(void)
{ {
wmi_remove_notify_handler(TOSHIBA_WMI_EVENT_GUID); wmi_remove_notify_handler(WMI_EVENT_GUID);
sparse_keymap_free(toshiba_wmi_input_dev); sparse_keymap_free(toshiba_wmi_input_dev);
input_unregister_device(toshiba_wmi_input_dev); input_unregister_device(toshiba_wmi_input_dev);
} }
...@@ -114,7 +125,8 @@ static int __init toshiba_wmi_init(void) ...@@ -114,7 +125,8 @@ static int __init toshiba_wmi_init(void)
{ {
int ret; int ret;
if (!wmi_has_guid(TOSHIBA_WMI_EVENT_GUID)) if (!wmi_has_guid(WMI_EVENT_GUID) ||
!dmi_check_system(toshiba_wmi_dmi_table))
return -ENODEV; return -ENODEV;
ret = toshiba_wmi_input_setup(); ret = toshiba_wmi_input_setup();
...@@ -130,7 +142,7 @@ static int __init toshiba_wmi_init(void) ...@@ -130,7 +142,7 @@ static int __init toshiba_wmi_init(void)
static void __exit toshiba_wmi_exit(void) static void __exit toshiba_wmi_exit(void)
{ {
if (wmi_has_guid(TOSHIBA_WMI_EVENT_GUID)) if (wmi_has_guid(WMI_EVENT_GUID))
toshiba_wmi_input_destroy(); toshiba_wmi_input_destroy();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment