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

Commit 1c211849 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: gpio-keys - use IRQF_SHARED
  Input: winbond-cir - select LEDS_TRIGGERS
  Input: i8042 - try to get stable CTR value when initializing
  Input: atkbd - add a quirk for OQO 01+ multimedia keys
parents fcef24d3 558a5e29

drivers/input/keyboard/atkbd.c

+36 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ struct atkbd { 
 */

static void (*atkbd_platform_fixup)(struct atkbd *, const void *data);

static void *atkbd_platform_fixup_data;

static unsigned int (*atkbd_platform_scancode_fixup)(struct atkbd *, unsigned int);



static ssize_t atkbd_attr_show_helper(struct device *dev, char *buf,

				ssize_t (*handler)(struct atkbd *, char *));
@@ -393,6 +394,9 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data, 


	input_event(dev, EV_MSC, MSC_RAW, code);



	if (atkbd_platform_scancode_fixup)

		code = atkbd_platform_scancode_fixup(atkbd, code);



	if (atkbd->translated) {



		if (atkbd->emul || atkbd_need_xlate(atkbd->xl_bit, code)) {
@@ -922,6 +926,22 @@ static unsigned int atkbd_volume_forced_release_keys[] = { 
	0xae, 0xb0, -1U

};



/*

 * OQO 01+ multimedia keys (64--66) generate e0 6x upon release whereas

 * they should be generating e4-e6 (0x80 | code).

 */

static unsigned int atkbd_oqo_01plus_scancode_fixup(struct atkbd *atkbd,

						    unsigned int code)

{

	if (atkbd->translated && atkbd->emul == 1 &&

	    (code == 0x64 || code == 0x65 || code == 0x66)) {

		atkbd->emul = 0;

		code |= 0x80;

	}



	return code;

}



/*

 * atkbd_set_keycode_table() initializes keyboard's keycode table

 * according to the selected scancode set
@@ -1527,6 +1547,13 @@ static int __init atkbd_setup_forced_release(const struct dmi_system_id *id) 
	return 0;

}



static int __init atkbd_setup_scancode_fixup(const struct dmi_system_id *id)

{

	atkbd_platform_scancode_fixup = id->driver_data;



	return 0;

}



static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {

	{

		.ident = "Dell Laptop",
@@ -1663,6 +1690,15 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = { 
		.callback = atkbd_setup_forced_release,

		.driver_data = atkdb_soltech_ta12_forced_release_keys,

	},

	{

		.ident = "OQO Model 01+",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "OQO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "ZEPTO"),

		},

		.callback = atkbd_setup_scancode_fixup,

		.driver_data = atkbd_oqo_01plus_scancode_fixup,

	},

	{ }

};

drivers/input/keyboard/gpio_keys.c

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) 
		}



		error = request_irq(irq, gpio_keys_isr,

				    IRQF_SHARED |

				    IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,

				    button->desc ? button->desc : "gpio_keys",

				    bdata);

drivers/input/misc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ config INPUT_WINBOND_CIR 
	depends on X86 && PNP

	select NEW_LEDS

	select LEDS_CLASS

	select LEDS_TRIGGERS

	select BITREVERSE

	help

	  Say Y here if you want to use the IR remote functionality found

drivers/input/serio/i8042.c

+28 −7
Original line number Diff line number Diff line
@@ -836,17 +836,32 @@ static int i8042_controller_selftest(void) 
static int i8042_controller_init(void)

{

	unsigned long flags;

	int n = 0;

	unsigned char ctr[2];



/*

 * Save the CTR for restoral on unload / reboot.

 * Save the CTR for restore on unload / reboot.

 */



	if (i8042_command(&i8042_ctr, I8042_CMD_CTL_RCTR)) {

		printk(KERN_ERR "i8042.c: Can't read CTR while initializing i8042.\n");

	do {

		if (n >= 10) {

			printk(KERN_ERR

				"i8042.c: Unable to get stable CTR read.\n");

			return -EIO;

		}



	i8042_initial_ctr = i8042_ctr;

		if (n != 0)

			udelay(50);



		if (i8042_command(&ctr[n++ % 2], I8042_CMD_CTL_RCTR)) {

			printk(KERN_ERR

				"i8042.c: Can't read CTR while initializing i8042.\n");

			return -EIO;

		}



	} while (n < 2 || ctr[0] != ctr[1]);



	i8042_initial_ctr = i8042_ctr = ctr[0];



/*

 * Disable the keyboard interface and interrupt.
@@ -895,6 +910,12 @@ static int i8042_controller_init(void) 
		return -EIO;

	}



/*

 * Flush whatever accumulated while we were disabling keyboard port.

 */



	i8042_flush();



	return 0;

}
@@ -914,7 +935,7 @@ static void i8042_controller_reset(void) 
	i8042_ctr |= I8042_CTR_KBDDIS | I8042_CTR_AUXDIS;

	i8042_ctr &= ~(I8042_CTR_KBDINT | I8042_CTR_AUXINT);



	if (i8042_command(&i8042_initial_ctr, I8042_CMD_CTL_WCTR))

	if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR))

		printk(KERN_WARNING "i8042.c: Can't write CTR while resetting.\n");



/*