The patch titled misc: add dell-wmi driver for hotkey control has been added to the -mm tree. Its filename is misc-add-dell-wmi-driver-for-hotkey-control.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: misc: add dell-wmi driver for hotkey control From: Matthew Garrett <mjg59@xxxxxxxxxxxxx> Add a WMI driver for Dell laptops. Currently it does nothing but send a generic input event when a button with a picture of a battery on it is pressed, but maybe other uses will appear over time. Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx> Cc: Len Brown <lenb@xxxxxxxxxx> Cc: Dmitry Torokhov <dtor@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- MAINTAINERS | 5 drivers/misc/Kconfig | 10 + drivers/misc/Makefile | 1 drivers/misc/dell-wmi.c | 210 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 226 insertions(+) diff -puN MAINTAINERS~misc-add-dell-wmi-driver-for-hotkey-control MAINTAINERS --- a/MAINTAINERS~misc-add-dell-wmi-driver-for-hotkey-control +++ a/MAINTAINERS @@ -1372,6 +1372,11 @@ P: Doug Warzecha M: Douglas_Warzecha@xxxxxxxx S: Maintained +DELL WMI EXTRAS DRIVER +P: Matthew Garrett +M: mjg59@xxxxxxxxxxxxx +S: Maintained + DEVICE NUMBER REGISTRY P: Torben Mathiasen M: device@xxxxxxxxxx diff -puN drivers/misc/Kconfig~misc-add-dell-wmi-driver-for-hotkey-control drivers/misc/Kconfig --- a/drivers/misc/Kconfig~misc-add-dell-wmi-driver-for-hotkey-control +++ a/drivers/misc/Kconfig @@ -136,6 +136,16 @@ config TIFM_7XX1 To compile this driver as a module, choose M here: the module will be called tifm_7xx1. +config DELL_WMI + tristate "Dell WMI extras" + depends on ACPI_WMI + depends on INPUT + help + Say Y here if you want to support WMI-based hotkeys on Dell laptops. + + To compile this driver as a module, choose M here: the module will + be called dell-wmi. + config ICS932S401 tristate "Integrated Circuits ICS932S401" depends on I2C && EXPERIMENTAL diff -puN drivers/misc/Makefile~misc-add-dell-wmi-driver-for-hotkey-control drivers/misc/Makefile --- a/drivers/misc/Makefile~misc-add-dell-wmi-driver-for-hotkey-control +++ a/drivers/misc/Makefile @@ -19,4 +19,5 @@ obj-$(CONFIG_KGDB_TESTS) += kgdbts.o obj-$(CONFIG_SGI_XP) += sgi-xp/ obj-$(CONFIG_SGI_GRU) += sgi-gru/ obj-$(CONFIG_HP_ILO) += hpilo.o +obj-$(CONFIG_DELL_WMI) += dell-wmi.o obj-$(CONFIG_C2PORT) += c2port/ diff -puN /dev/null drivers/misc/dell-wmi.c --- /dev/null +++ a/drivers/misc/dell-wmi.c @@ -0,0 +1,210 @@ +/* + * Dell WMI hotkeys + * + * Copyright (C) 2008 Red Hat <mjg@xxxxxxxxxx> + * + * Portions based on wistron_btns.c: + * Copyright (C) 2005 Miloslav Trmac <mitr@xxxxxxxx> + * Copyright (C) 2005 Bernhard Rosenkraenzer <bero@xxxxxxxxxxxx> + * Copyright (C) 2005 Dmitry Torokhov <dtor@xxxxxxx> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/init.h> +#include <linux/types.h> +#include <linux/input.h> +#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> +#include <linux/string.h> + +MODULE_AUTHOR("Matthew Garrett <mjg@xxxxxxxxxx>"); +MODULE_DESCRIPTION("Dell laptop WMI hotkeys driver"); +MODULE_LICENSE("GPL"); + +#define DELL_EVENT_GUID "9DBB5994-A997-11DA-B012-B622A1EF5492" + +MODULE_ALIAS("wmi:"DELL_EVENT_GUID); + +struct key_entry { + char type; /* See KE_* below */ + u16 code; + u16 keycode; +}; + +enum { KE_KEY, KE_SW, KE_END }; + +static struct key_entry dell_wmi_keymap[] = { + {KE_KEY, 0xe045, KEY_PROG1}, + {KE_END, 0} +}; + +static struct input_dev *dell_wmi_input_dev; + +static struct key_entry *dell_wmi_get_entry_by_scancode(int code) +{ + struct key_entry *key; + + for (key = dell_wmi_keymap; key->type != KE_END; key++) + if (code == key->code) + return key; + + return NULL; +} + +static struct key_entry *dell_wmi_get_entry_by_keycode(int keycode) +{ + struct key_entry *key; + + for (key = dell_wmi_keymap; key->type != KE_END; key++) + if (key->type == KE_KEY && keycode == key->keycode) + return key; + + return NULL; +} + +static int dell_wmi_getkeycode(struct input_dev *dev, int scancode, + int *keycode) +{ + struct key_entry *key = dell_wmi_get_entry_by_scancode(scancode); + + if (key && key->type == KE_KEY) { + *keycode = key->keycode; + return 0; + } + + return -EINVAL; +} + +static int dell_wmi_setkeycode(struct input_dev *dev, int scancode, int keycode) +{ + struct key_entry *key; + int old_keycode; + + if (keycode < 0 || keycode > KEY_MAX) + return -EINVAL; + + key = dell_wmi_get_entry_by_scancode(scancode); + if (key && key->type == KE_KEY) { + old_keycode = key->keycode; + key->keycode = keycode; + set_bit(keycode, dev->keybit); + if (!dell_wmi_get_entry_by_keycode(old_keycode)) + clear_bit(old_keycode, dev->keybit); + return 0; + } + return -EINVAL; +} + +static void dell_wmi_notify(u32 value, void *context) +{ + struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL }; + static struct key_entry *key; + union acpi_object *obj; + + wmi_get_event_data(value, &response); + + obj = (union acpi_object *)response.pointer; + + if (obj && obj->type == ACPI_TYPE_BUFFER) { + int *buffer = (int *)obj->buffer.pointer; + key = dell_wmi_get_entry_by_scancode(buffer[1]); + if (key) { + input_report_key(dell_wmi_input_dev, key->keycode, 1); + input_sync(dell_wmi_input_dev); + input_report_key(dell_wmi_input_dev, key->keycode, 0); + input_sync(dell_wmi_input_dev); + } else + printk(KERN_INFO "dell-wmi: Unknown key %x pressed\n", + buffer[1]); + } +} + +static int __init dell_wmi_input_setup(void) +{ + struct key_entry *key; + int err; + + dell_wmi_input_dev = input_allocate_device(); + + if (!dell_wmi_input_dev) + return -ENOMEM; + + dell_wmi_input_dev->name = "Dell WMI hotkeys"; + dell_wmi_input_dev->phys = "wmi/input0"; + dell_wmi_input_dev->id.bustype = BUS_HOST; + dell_wmi_input_dev->getkeycode = dell_wmi_getkeycode; + dell_wmi_input_dev->setkeycode = dell_wmi_setkeycode; + + for (key = dell_wmi_keymap; key->type != KE_END; key++) { + switch (key->type) { + case KE_KEY: + set_bit(EV_KEY, dell_wmi_input_dev->evbit); + set_bit(key->keycode, dell_wmi_input_dev->keybit); + break; + case KE_SW: + set_bit(EV_SW, dell_wmi_input_dev->evbit); + set_bit(key->keycode, dell_wmi_input_dev->swbit); + break; + } + } + + err = input_register_device(dell_wmi_input_dev); + + if (err) { + input_free_device(dell_wmi_input_dev); + return err; + } + + return 0; +} + +static int __init dell_wmi_init(void) +{ + int err; + + if (wmi_has_guid(DELL_EVENT_GUID)) { + err = dell_wmi_input_setup(); + + if (err) + return err; + + err = wmi_install_notify_handler(DELL_EVENT_GUID, + dell_wmi_notify, NULL); + if (err) { + input_unregister_device(dell_wmi_input_dev); + printk(KERN_ERR "dell-wmi: Unable to register" + " notify handler - %d\n", err); + return err; + } + + } else + printk(KERN_WARNING "dell-wmi: No known WMI GUID found\n"); + + return 0; +} + +static void __exit dell_wmi_exit(void) +{ + if (wmi_has_guid(DELL_EVENT_GUID)) { + wmi_remove_notify_handler(DELL_EVENT_GUID); + input_unregister_device(dell_wmi_input_dev); + } +} + +module_init(dell_wmi_init); +module_exit(dell_wmi_exit); _ Patches currently in -mm which might be from mjg59@xxxxxxxxxxxxx are origin.patch linux-next.patch eeepc-laptop-enable-bluetooth-for-asus-eee-901.patch misc-add-dell-wmi-driver-for-hotkey-control.patch video-mbp_nvidia_bl-add-support-for-macbook-5-macbook-air-2-and-macbook-pro-5.patch video-mbp_nvidia_bl-add-support-for-macbook-5-macbook-air-2-and-macbook-pro-5-fix.patch video-mbp_nvidia_bl-add-a-debug-switch.patch hp-wmi-handle-rfkill_register-failure.patch misc-add-dell-laptop-driver.patch dcdbas-export-functionality-for-use-in-other-drivers.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html