Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f5d1cd6 authored by Henrique de Moraes Holschuh's avatar Henrique de Moraes Holschuh Committed by Len Brown
Browse files

ACPI: thinkpad-acpi: register input device 



Register an input device to send input events to userspace.

This patch is based on a patch by Richard Hughes <hughsient@gmail.com>.

Signed-off-by: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Cc: Richard Hughes <hughsient@gmail.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent d54b7d7f

drivers/misc/thinkpad_acpi.c

+31 −1
Original line number Diff line number Diff line
@@ -510,13 +510,14 @@ static char *next_cmd(char **cmds) 
/****************************************************************************

 ****************************************************************************

 *

 * Device model: hwmon and platform

 * Device model: input, hwmon and platform

 *

 ****************************************************************************

 ****************************************************************************/



static struct platform_device *tpacpi_pdev;

static struct class_device *tpacpi_hwmon;

static struct input_dev *tpacpi_inputdev;



static struct platform_driver tpacpi_pdriver = {

	.driver = {
@@ -4363,6 +4364,20 @@ static int __init thinkpad_acpi_module_init(void) 
		thinkpad_acpi_module_exit();

		return ret;

	}

	tpacpi_inputdev = input_allocate_device();

	if (!tpacpi_inputdev) {

		printk(IBM_ERR "unable to allocate input device\n");

		thinkpad_acpi_module_exit();

		return -ENOMEM;

	} else {

		/* Prepare input device, but don't register */

		tpacpi_inputdev->name = "ThinkPad Extra Buttons";

		tpacpi_inputdev->phys = IBM_DRVR_NAME "/input0";

		tpacpi_inputdev->id.bustype = BUS_HOST;

		tpacpi_inputdev->id.vendor = TPACPI_HKEY_INPUT_VENDOR;

		tpacpi_inputdev->id.product = TPACPI_HKEY_INPUT_PRODUCT;

		tpacpi_inputdev->id.version = TPACPI_HKEY_INPUT_VERSION;

	}

	for (i = 0; i < ARRAY_SIZE(ibms_init); i++) {

		ret = ibm_init(&ibms_init[i]);

		if (ret >= 0 && *ibms_init[i].param)
@@ -4372,6 +4387,14 @@ static int __init thinkpad_acpi_module_init(void) 
			return ret;

		}

	}

	ret = input_register_device(tpacpi_inputdev);

	if (ret < 0) {

		printk(IBM_ERR "unable to register input device\n");

		thinkpad_acpi_module_exit();

		return ret;

	} else {

		tp_features.input_device_registered = 1;

	}



	return 0;

}
@@ -4388,6 +4411,13 @@ static void thinkpad_acpi_module_exit(void) 


	dbg_printk(TPACPI_DBG_INIT, "finished subdriver exit path...\n");



	if (tpacpi_inputdev) {

		if (tp_features.input_device_registered)

			input_unregister_device(tpacpi_inputdev);

		else

			input_free_device(tpacpi_inputdev);

	}



	if (tpacpi_hwmon)

		hwmon_device_unregister(tpacpi_hwmon);

drivers/misc/thinkpad_acpi.h

+9 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <linux/platform_device.h>

#include <linux/hwmon.h>

#include <linux/hwmon-sysfs.h>

#include <linux/input.h>

#include <asm/uaccess.h>



#include <linux/dmi.h>
@@ -48,6 +49,7 @@ 
#include <acpi/acpi_drivers.h>

#include <acpi/acnamesp.h>



#include <linux/pci_ids.h>



/****************************************************************************

 * Main driver
@@ -98,6 +100,11 @@ static const char *str_supported(int is_supported); 
#define vdbg_printk(a_dbg_level, format, arg...)

#endif



/* Input IDs */

#define TPACPI_HKEY_INPUT_VENDOR	PCI_VENDOR_ID_IBM

#define TPACPI_HKEY_INPUT_PRODUCT	0x5054 /* "TP" */

#define TPACPI_HKEY_INPUT_VERSION	0x4101



/* ACPI HIDs */

#define IBM_HKEY_HID    "IBM0068"

#define IBM_PCI_HID     "PNP0A03"
@@ -161,6 +168,7 @@ static int parse_strtoul(const char *buf, unsigned long max, 
static struct platform_device *tpacpi_pdev;

static struct class_device *tpacpi_hwmon;

static struct platform_driver tpacpi_pdriver;

static struct input_dev *tpacpi_inputdev;

static int tpacpi_create_driver_attributes(struct device_driver *drv);

static void tpacpi_remove_driver_attributes(struct device_driver *drv);
@@ -233,6 +241,7 @@ static struct { 
	u16 light_status:1;

	u16 wan:1;

	u16 fan_ctrl_status_undef:1;

	u16 input_device_registered:1;

} tp_features;



static struct list_head tpacpi_all_drivers;