Commit b31a0fec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: wacom - add support for new USB Tablet PCs
  Input: replace spin_lock_bh with spin_lock_irqsave in ml_ff_playback
  Input: i8042 - add Compal Hel80 laptop to nomux blacklist
  Input: cm109 - add keymap for ATCom AU-100 phone
  Input: fix the example of an input device driver
  Input: psmouse - fix incorrect validate_byte check in OLPC protocol
  Input: atkbd - cancel delayed work before freeing its structure
  Input: atkbd - add keymap quirk for Inventec Symphony systems
  Input: i8042 - add Dell XPS M1530 to nomux list
  Input: elo - fix format string in elo driver
parents 96b8936a 545f4e99

Documentation/input/input-programming.txt

+2 −1
Original line number Diff line number Diff line
@@ -20,10 +20,11 @@ pressed or released a BUTTON_IRQ happens. The driver could look like: 


static struct input_dev *button_dev;



static void button_interrupt(int irq, void *dummy, struct pt_regs *fp)

static irqreturn_t button_interrupt(int irq, void *dummy)

{

	input_report_key(button_dev, BTN_0, inb(BUTTON_PORT) & 1);

	input_sync(button_dev);

	return IRQ_HANDLED;

}



static int __init button_init(void)

drivers/input/keyboard/atkbd.c

+26 −1
Original line number Diff line number Diff line
@@ -824,7 +824,7 @@ static void atkbd_disconnect(struct serio *serio) 
	atkbd_disable(atkbd);



	/* make sure we don't have a command in flight */

	flush_scheduled_work();

	cancel_delayed_work_sync(&atkbd->event_work);



	sysfs_remove_group(&serio->dev.kobj, &atkbd_attribute_group);

	input_unregister_device(atkbd->dev);
@@ -867,6 +867,22 @@ static void atkbd_hp_keymap_fixup(struct atkbd *atkbd) 
					atkbd->force_release_mask);

}



/*

 * Inventec system with broken key release on volume keys

 */

static void atkbd_inventec_keymap_fixup(struct atkbd *atkbd)

{

	const unsigned int forced_release_keys[] = {

		0xae, 0xb0,

	};

	int i;



	if (atkbd->set == 2)

		for (i = 0; i < ARRAY_SIZE(forced_release_keys); i++)

			__set_bit(forced_release_keys[i],

				  atkbd->force_release_mask);

}



/*

 * atkbd_set_keycode_table() initializes keyboard's keycode table

 * according to the selected scancode set
@@ -1468,6 +1484,15 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = { 
		.callback = atkbd_setup_fixup,

		.driver_data = atkbd_hp_keymap_fixup,

	},

	{

		.ident = "Inventec Symphony",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "INVENTEC"),

			DMI_MATCH(DMI_PRODUCT_NAME, "SYMPHONY 6.0/7.0"),

		},

		.callback = atkbd_setup_fixup,

		.driver_data = atkbd_inventec_keymap_fixup,

	},

	{ }

};

drivers/input/misc/cm109.c

+36 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 


static char *phone = "kip1000";

module_param(phone, charp, S_IRUSR);

MODULE_PARM_DESC(phone, "Phone name {kip1000, gtalk, usbph01}");

MODULE_PARM_DESC(phone, "Phone name {kip1000, gtalk, usbph01, atcom}");



enum {

	/* HID Registers */
@@ -258,6 +258,37 @@ static unsigned short keymap_usbph01(int scancode) 
	}

}



/*

 * Keymap for ATCom AU-100

 * http://www.atcom.cn/En_products_AU100.html

 * http://www.packetizer.com/products/au100/

 * http://www.voip-info.org/wiki/view/AU-100

 *

 * Contributed by daniel@gimpelevich.san-francisco.ca.us

 */

static unsigned short keymap_atcom(int scancode)

{

	switch (scancode) {				/* phone key:   */

	case 0x82: return KEY_NUMERIC_0;		/*   0          */

	case 0x11: return KEY_NUMERIC_1;		/*   1          */

	case 0x12: return KEY_NUMERIC_2;		/*   2          */

	case 0x14: return KEY_NUMERIC_3;		/*   3          */

	case 0x21: return KEY_NUMERIC_4;		/*   4          */

	case 0x22: return KEY_NUMERIC_5;		/*   5          */

	case 0x24: return KEY_NUMERIC_6;		/*   6          */

	case 0x41: return KEY_NUMERIC_7;		/*   7          */

	case 0x42: return KEY_NUMERIC_8;		/*   8          */

	case 0x44: return KEY_NUMERIC_9;		/*   9          */

	case 0x84: return KEY_NUMERIC_POUND;		/*   #          */

	case 0x81: return KEY_NUMERIC_STAR;		/*   *          */

	case 0x18: return KEY_ENTER;			/*   pickup     */

	case 0x28: return KEY_ESC;			/*   hangup     */

	case 0x48: return KEY_LEFT;			/* left arrow   */

	case 0x88: return KEY_RIGHT;			/* right arrow  */

	default:   return special_keymap(scancode);

	}

}



static unsigned short (*keymap)(int) = keymap_kip1000;



/*
@@ -840,6 +871,10 @@ static int __init cm109_select_keymap(void) 
		keymap = keymap_usbph01;

		printk(KERN_INFO KBUILD_MODNAME ": "

			"Keymap for Allied-Telesis Corega USBPH01 phone loaded\n");

	} else if (!strcasecmp(phone, "atcom")) {

		keymap = keymap_atcom;

		printk(KERN_INFO KBUILD_MODNAME ": "

			"Keymap for ATCom AU-100 phone loaded\n");

	} else {

		printk(KERN_ERR KBUILD_MODNAME ": "

			"Unsupported phone: %s\n", phone);

drivers/input/mouse/hgpk.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static void hgpk_spewing_hack(struct psmouse *psmouse, 
 */

static int hgpk_validate_byte(unsigned char *packet)

{

	return (packet[0] & 0x0C) == 0x08;

	return (packet[0] & 0x0C) != 0x08;

}



static void hgpk_process_packet(struct psmouse *psmouse)

drivers/input/serio/i8042-x86ia64io.h

+14 −0
Original line number Diff line number Diff line
@@ -337,6 +337,20 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "2656"),

		},

	},

	{

		.ident = "Dell XPS M1530",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

			DMI_MATCH(DMI_PRODUCT_NAME, "XPS M1530"),

		},

	},

	{

		.ident = "Compal HEL80I",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "COMPAL"),

			DMI_MATCH(DMI_PRODUCT_NAME, "HEL80I"),

		},

	},

	{ }

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE