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

Commit 63995344 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: atkbd - add Compaq Presario R4000-series repeat quirk
  Input: i8042 - add Acer Aspire 5536 to the nomux list
parents 9de6886e 2bcaa6a4

drivers/input/keyboard/atkbd.c

+35 −0
Original line number Diff line number Diff line
@@ -879,6 +879,14 @@ static unsigned int atkbd_hp_zv6100_forced_release_keys[] = { 
	0xae, 0xb0, -1U

};



/*

 * Perform fixup for HP (Compaq) Presario R4000 R4100 R4200 that don't generate

 * release for their volume buttons

 */

static unsigned int atkbd_hp_r4000_forced_release_keys[] = {

	0xae, 0xb0, -1U

};



/*

 * Samsung NC10,NC20 with Fn+F? key release not working

 */
@@ -1536,6 +1544,33 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = { 
		.callback = atkbd_setup_forced_release,

		.driver_data = atkbd_hp_zv6100_forced_release_keys,

	},

	{

		.ident = "HP Presario R4000",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4000"),

		},

		.callback = atkbd_setup_forced_release,

		.driver_data = atkbd_hp_r4000_forced_release_keys,

	},

	{

		.ident = "HP Presario R4100",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4100"),

		},

		.callback = atkbd_setup_forced_release,

		.driver_data = atkbd_hp_r4000_forced_release_keys,

	},

	{

		.ident = "HP Presario R4200",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4200"),

		},

		.callback = atkbd_setup_forced_release,

		.driver_data = atkbd_hp_r4000_forced_release_keys,

	},

	{

		.ident = "Inventec Symphony",

		.matches = {

drivers/input/serio/i8042-x86ia64io.h

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

		},

	},

	{

		.ident = "Acer Aspire 5536",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5536"),

			DMI_MATCH(DMI_PRODUCT_VERSION, "0100"),

		},

	},

	{ }

};