Merge branch 'for_linus' of... (c7681f46) · Commits · e / devices / android_kernel_teracube_2e

drivers/platform/x86/Kconfig

+10 −0

Original line number	Diff line number	Diff line
		@@ -385,6 +385,16 @@ config EEEPC_LAPTOP

		If you have an Eee PC laptop, say Y or M here.

		config EEEPC_WMI
		tristate "Eee PC WMI Hotkey Driver (EXPERIMENTAL)"
		depends on ACPI_WMI
		depends on INPUT
		depends on EXPERIMENTAL
		---help---
		Say Y here if you want to support WMI-based hotkeys on Eee PC laptops.

		To compile this driver as a module, choose M here: the module will
		be called eeepc-wmi.

		config ACPI_WMI
		tristate "WMI"

drivers/platform/x86/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@
		#
		obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o
		obj-$(CONFIG_EEEPC_LAPTOP) += eeepc-laptop.o
		obj-$(CONFIG_EEEPC_WMI) += eeepc-wmi.o
		obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o
		obj-$(CONFIG_ACPI_CMPC) += classmate-laptop.o
		obj-$(CONFIG_COMPAL_LAPTOP) += compal-laptop.o

drivers/platform/x86/asus-laptop.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -139,7 +139,7 @@ MODULE_PARM_DESC(bluetooth_status, "Set the wireless status on boot "

		/* Backlight */
		static acpi_handle lcd_switch_handle;
		static const char *lcd_switch_paths[] = {
		static char *lcd_switch_paths[] = {
		"\\_SB.PCI0.SBRG.EC0._Q10", /* All new models */
		"\\_SB.PCI0.ISA.EC0._Q10", /* A1x */
		"\\_SB.PCI0.PX40.ECD0._Q10", /* L3C */
		@@ -153,7 +153,7 @@ static const char *lcd_switch_paths[] = {
		#define METHOD_SWITCH_DISPLAY "SDSP"

		static acpi_handle display_get_handle;
		static const char *display_get_paths[] = {
		static char *display_get_paths[] = {
		/* A6B, A6K A6R A7D F3JM L4R M6R A3G M6A M6V VX-1 V6J V6V W3Z */
		"\\_SB.PCI0.P0P1.VGA.GETD",
		/* A3E A4K, A4D A4L A6J A7J A8J Z71V M9V S5A M5A z33A W1Jc W2V G1 */

drivers/platform/x86/eeepc-wmi.c

0 → 100644

+157 −0

Original line number	Diff line number	Diff line
		/*
		* Eee PC WMI hotkey driver
		*
		* Copyright(C) 2010 Intel Corporation.
		*
		* Portions based on wistron_btns.c:
		* Copyright (C) 2005 Miloslav Trmac <mitr@volny.cz>
		* Copyright (C) 2005 Bernhard Rosenkraenzer <bero@arklinux.org>
		* Copyright (C) 2005 Dmitry Torokhov <dtor@mail.ru>
		*
		* 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 <linux/input/sparse-keymap.h>
		#include <acpi/acpi_bus.h>
		#include <acpi/acpi_drivers.h>

		MODULE_AUTHOR("Yong Wang <yong.y.wang@intel.com>");
		MODULE_DESCRIPTION("Eee PC WMI Hotkey Driver");
		MODULE_LICENSE("GPL");

		#define EEEPC_WMI_EVENT_GUID "ABBC0F72-8EA1-11D1-00A0-C90629100000"

		MODULE_ALIAS("wmi:"EEEPC_WMI_EVENT_GUID);

		#define NOTIFY_BRNUP_MIN 0x11
		#define NOTIFY_BRNUP_MAX 0x1f
		#define NOTIFY_BRNDOWN_MIN 0x20
		#define NOTIFY_BRNDOWN_MAX 0x2e

		static const struct key_entry eeepc_wmi_keymap[] = {
		/* Sleep already handled via generic ACPI code */
		{ KE_KEY, 0x5d, { KEY_WLAN } },
		{ KE_KEY, 0x32, { KEY_MUTE } },
		{ KE_KEY, 0x31, { KEY_VOLUMEDOWN } },
		{ KE_KEY, 0x30, { KEY_VOLUMEUP } },
		{ KE_IGNORE, NOTIFY_BRNDOWN_MIN, { KEY_BRIGHTNESSDOWN } },
		{ KE_IGNORE, NOTIFY_BRNUP_MIN, { KEY_BRIGHTNESSUP } },
		{ KE_KEY, 0xcc, { KEY_SWITCHVIDEOMODE } },
		{ KE_END, 0},
		};

		static struct input_dev *eeepc_wmi_input_dev;

		static void eeepc_wmi_notify(u32 value, void *context)
		{
		struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
		union acpi_object *obj;
		acpi_status status;
		int code;

		status = wmi_get_event_data(value, &response);
		if (status != AE_OK) {
		pr_err("EEEPC WMI: bad event status 0x%x\n", status);
		return;
		}

		obj = (union acpi_object *)response.pointer;

		if (obj && obj->type == ACPI_TYPE_INTEGER) {
		code = obj->integer.value;

		if (code >= NOTIFY_BRNUP_MIN && code <= NOTIFY_BRNUP_MAX)
		code = NOTIFY_BRNUP_MIN;
		else if (code >= NOTIFY_BRNDOWN_MIN && code <= NOTIFY_BRNDOWN_MAX)
		code = NOTIFY_BRNDOWN_MIN;

		if (!sparse_keymap_report_event(eeepc_wmi_input_dev,
		code, 1, true))
		pr_info("EEEPC WMI: Unknown key %x pressed\n", code);
		}

		kfree(obj);
		}

		static int eeepc_wmi_input_setup(void)
		{
		int err;

		eeepc_wmi_input_dev = input_allocate_device();
		if (!eeepc_wmi_input_dev)
		return -ENOMEM;

		eeepc_wmi_input_dev->name = "Eee PC WMI hotkeys";
		eeepc_wmi_input_dev->phys = "wmi/input0";
		eeepc_wmi_input_dev->id.bustype = BUS_HOST;

		err = sparse_keymap_setup(eeepc_wmi_input_dev, eeepc_wmi_keymap, NULL);
		if (err)
		goto err_free_dev;

		err = input_register_device(eeepc_wmi_input_dev);
		if (err)
		goto err_free_keymap;

		return 0;

		err_free_keymap:
		sparse_keymap_free(eeepc_wmi_input_dev);
		err_free_dev:
		input_free_device(eeepc_wmi_input_dev);
		return err;
		}

		static int __init eeepc_wmi_init(void)
		{
		int err;
		acpi_status status;

		if (!wmi_has_guid(EEEPC_WMI_EVENT_GUID)) {
		pr_warning("EEEPC WMI: No known WMI GUID found\n");
		return -ENODEV;
		}

		err = eeepc_wmi_input_setup();
		if (err)
		return err;

		status = wmi_install_notify_handler(EEEPC_WMI_EVENT_GUID,
		eeepc_wmi_notify, NULL);
		if (ACPI_FAILURE(status)) {
		sparse_keymap_free(eeepc_wmi_input_dev);
		input_unregister_device(eeepc_wmi_input_dev);
		pr_err("EEEPC WMI: Unable to register notify handler - %d\n",
		status);
		return -ENODEV;
		}

		return 0;
		}

		static void __exit eeepc_wmi_exit(void)
		{
		wmi_remove_notify_handler(EEEPC_WMI_EVENT_GUID);
		sparse_keymap_free(eeepc_wmi_input_dev);
		input_unregister_device(eeepc_wmi_input_dev);
		}

		module_init(eeepc_wmi_init);
		module_exit(eeepc_wmi_exit);