Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input (be8db0b8) · Commits · e / devices / android_kernel_teracube_2e

drivers/input/input.c

+48 −17

Original line number	Original line	Diff line number	Diff line
	@@ -782,10 +782,29 @@ static unsigned int input_proc_devices_poll(struct file file, poll_table wait)
	return 0;		return 0;
	}		}

			union input_seq_state {
			struct {
			unsigned short pos;
			bool mutex_acquired;
			};
			void *p;
			};

	static void input_devices_seq_start(struct seq_file seq, loff_t *pos)		static void input_devices_seq_start(struct seq_file seq, loff_t *pos)
	{		{
	if (mutex_lock_interruptible(&input_mutex))		union input_seq_state state = (union input_seq_state )&seq->private;
	return NULL;		int error;

			/* We need to fit into seq->private pointer */
			BUILD_BUG_ON(sizeof(union input_seq_state) != sizeof(seq->private));

			error = mutex_lock_interruptible(&input_mutex);
			if (error) {
			state->mutex_acquired = false;
			return ERR_PTR(error);
			}

			state->mutex_acquired = true;

	return seq_list_start(&input_dev_list, *pos);		return seq_list_start(&input_dev_list, *pos);
	}		}
	@@ -795,8 +814,11 @@ static void input_devices_seq_next(struct seq_file seq, void v, loff_t pos)
	return seq_list_next(v, &input_dev_list, pos);		return seq_list_next(v, &input_dev_list, pos);
	}		}

	static void input_devices_seq_stop(struct seq_file seq, void v)		static void input_seq_stop(struct seq_file seq, void v)
	{		{
			union input_seq_state state = (union input_seq_state )&seq->private;

			if (state->mutex_acquired)
	mutex_unlock(&input_mutex);		mutex_unlock(&input_mutex);
	}		}

	@@ -861,7 +883,7 @@ static int input_devices_seq_show(struct seq_file seq, void v)
	static const struct seq_operations input_devices_seq_ops = {		static const struct seq_operations input_devices_seq_ops = {
	.start = input_devices_seq_start,		.start = input_devices_seq_start,
	.next = input_devices_seq_next,		.next = input_devices_seq_next,
	.stop = input_devices_seq_stop,		.stop = input_seq_stop,
	.show = input_devices_seq_show,		.show = input_devices_seq_show,
	};		};

	@@ -881,40 +903,49 @@ static const struct file_operations input_devices_fileops = {

	static void input_handlers_seq_start(struct seq_file seq, loff_t *pos)		static void input_handlers_seq_start(struct seq_file seq, loff_t *pos)
	{		{
	if (mutex_lock_interruptible(&input_mutex))		union input_seq_state state = (union input_seq_state )&seq->private;
	return NULL;		int error;

			/* We need to fit into seq->private pointer */
			BUILD_BUG_ON(sizeof(union input_seq_state) != sizeof(seq->private));

			error = mutex_lock_interruptible(&input_mutex);
			if (error) {
			state->mutex_acquired = false;
			return ERR_PTR(error);
			}

			state->mutex_acquired = true;
			state->pos = *pos;

	seq->private = (void )(unsigned long)pos;
	return seq_list_start(&input_handler_list, *pos);		return seq_list_start(&input_handler_list, *pos);
	}		}

	static void input_handlers_seq_next(struct seq_file seq, void v, loff_t pos)		static void input_handlers_seq_next(struct seq_file seq, void v, loff_t pos)
	{		{
	seq->private = (void )(unsigned long)(pos + 1);		union input_seq_state state = (union input_seq_state )&seq->private;
	return seq_list_next(v, &input_handler_list, pos);
	}

	static void input_handlers_seq_stop(struct seq_file seq, void v)		state->pos = *pos + 1;
	{		return seq_list_next(v, &input_handler_list, pos);
	mutex_unlock(&input_mutex);
	}		}

	static int input_handlers_seq_show(struct seq_file seq, void v)		static int input_handlers_seq_show(struct seq_file seq, void v)
	{		{
	struct input_handler *handler = container_of(v, struct input_handler, node);		struct input_handler *handler = container_of(v, struct input_handler, node);
			union input_seq_state state = (union input_seq_state )&seq->private;

	seq_printf(seq, "N: Number=%ld Name=%s",		seq_printf(seq, "N: Number=%u Name=%s", state->pos, handler->name);
	(unsigned long)seq->private, handler->name);
	if (handler->fops)		if (handler->fops)
	seq_printf(seq, " Minor=%d", handler->minor);		seq_printf(seq, " Minor=%d", handler->minor);
	seq_putc(seq, '\n');		seq_putc(seq, '\n');

	return 0;		return 0;
	}		}

	static const struct seq_operations input_handlers_seq_ops = {		static const struct seq_operations input_handlers_seq_ops = {
	.start = input_handlers_seq_start,		.start = input_handlers_seq_start,
	.next = input_handlers_seq_next,		.next = input_handlers_seq_next,
	.stop = input_handlers_seq_stop,		.stop = input_seq_stop,
	.show = input_handlers_seq_show,		.show = input_handlers_seq_show,
	};		};

drivers/input/keyboard/atkbd.c

+55 −41

Original line number	Original line	Diff line number	Diff line
	@@ -574,11 +574,22 @@ static void atkbd_event_work(struct work_struct *work)

	mutex_lock(&atkbd->event_mutex);		mutex_lock(&atkbd->event_mutex);

			if (!atkbd->enabled) {
			/*
			* Serio ports are resumed asynchronously so while driver core
			* thinks that device is already fully operational in reality
			* it may not be ready yet. In this case we need to keep
			* rescheduling till reconnect completes.
			*/
			schedule_delayed_work(&atkbd->event_work,
			msecs_to_jiffies(100));
			} else {
	if (test_and_clear_bit(ATKBD_LED_EVENT_BIT, &atkbd->event_mask))		if (test_and_clear_bit(ATKBD_LED_EVENT_BIT, &atkbd->event_mask))
	atkbd_set_leds(atkbd);		atkbd_set_leds(atkbd);

	if (test_and_clear_bit(ATKBD_REP_EVENT_BIT, &atkbd->event_mask))		if (test_and_clear_bit(ATKBD_REP_EVENT_BIT, &atkbd->event_mask))
	atkbd_set_repeat_rate(atkbd);		atkbd_set_repeat_rate(atkbd);
			}

	mutex_unlock(&atkbd->event_mutex);		mutex_unlock(&atkbd->event_mutex);
	}		}
	@@ -770,6 +781,30 @@ static int atkbd_select_set(struct atkbd *atkbd, int target_set, int allow_extra
	return 3;		return 3;
	}		}

			static int atkbd_reset_state(struct atkbd *atkbd)
			{
			struct ps2dev *ps2dev = &atkbd->ps2dev;
			unsigned char param[1];

			/*
			* Set the LEDs to a predefined state (all off).
			*/

			param[0] = 0;
			if (ps2_command(ps2dev, param, ATKBD_CMD_SETLEDS))
			return -1;

			/*
			* Set autorepeat to fastest possible.
			*/

			param[0] = 0;
			if (ps2_command(ps2dev, param, ATKBD_CMD_SETREP))
			return -1;

			return 0;
			}

	static int atkbd_activate(struct atkbd *atkbd)		static int atkbd_activate(struct atkbd *atkbd)
	{		{
	struct ps2dev *ps2dev = &atkbd->ps2dev;		struct ps2dev *ps2dev = &atkbd->ps2dev;
	@@ -851,29 +886,6 @@ static unsigned int atkbd_hp_forced_release_keys[] = {
	0x94, -1U		0x94, -1U
	};		};

	/*
	* Inventec system with broken key release on volume keys
	*/
	static unsigned int atkbd_inventec_forced_release_keys[] = {
	0xae, 0xb0, -1U
	};

	/*
	* Perform fixup for HP Pavilion ZV6100 laptop that doesn't generate release
	* for its volume buttons
	*/
	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		* Samsung NC10,NC20 with Fn+F? key release not working
	*/		*/
	@@ -881,14 +893,6 @@ static unsigned int atkbd_samsung_forced_release_keys[] = {
	0x82, 0x83, 0x84, 0x86, 0x88, 0x89, 0xb3, 0xf7, 0xf9, -1U		0x82, 0x83, 0x84, 0x86, 0x88, 0x89, 0xb3, 0xf7, 0xf9, -1U
	};		};

	/*
	* The volume up and volume down special keys on a Fujitsu Amilo PA 1510 laptop
	* do not generate release events so we have to do it ourselves.
	*/
	static unsigned int atkbd_amilo_pa1510_forced_release_keys[] = {
	0xb0, 0xae, -1U
	};

	/*		/*
	* Amilo Pi 3525 key release for Fn+Volume keys not working		* Amilo Pi 3525 key release for Fn+Volume keys not working
	*/		*/
	@@ -910,6 +914,14 @@ static unsigned int atkdb_soltech_ta12_forced_release_keys[] = {
	0xa0, 0xae, 0xb0, -1U		0xa0, 0xae, 0xb0, -1U
	};		};

			/*
			* Many notebooks don't send key release event for volume up/down
			* keys, with key list below common among them
			*/
			static unsigned int atkbd_volume_forced_release_keys[] = {
			0xae, 0xb0, -1U
			};

	/*		/*
	* atkbd_set_keycode_table() initializes keyboard's keycode table		* atkbd_set_keycode_table() initializes keyboard's keycode table
	* according to the selected scancode set		* according to the selected scancode set
	@@ -1087,6 +1099,7 @@ static int atkbd_connect(struct serio serio, struct serio_driver drv)
	}		}

	atkbd->set = atkbd_select_set(atkbd, atkbd_set, atkbd_extra);		atkbd->set = atkbd_select_set(atkbd, atkbd_set, atkbd_extra);
			atkbd_reset_state(atkbd);
	atkbd_activate(atkbd);		atkbd_activate(atkbd);

	} else {		} else {
	@@ -1267,6 +1280,7 @@ static ssize_t atkbd_set_extra(struct atkbd atkbd, const char buf, size_t coun

	atkbd->dev = new_dev;		atkbd->dev = new_dev;
	atkbd->set = atkbd_select_set(atkbd, atkbd->set, value);		atkbd->set = atkbd_select_set(atkbd, atkbd->set, value);
			atkbd_reset_state(atkbd);
	atkbd_activate(atkbd);		atkbd_activate(atkbd);
	atkbd_set_keycode_table(atkbd);		atkbd_set_keycode_table(atkbd);
	atkbd_set_device_attrs(atkbd);		atkbd_set_device_attrs(atkbd);
	@@ -1548,7 +1562,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
	DMI_MATCH(DMI_PRODUCT_NAME, "Pavilion ZV6100"),		DMI_MATCH(DMI_PRODUCT_NAME, "Pavilion ZV6100"),
	},		},
	.callback = atkbd_setup_forced_release,		.callback = atkbd_setup_forced_release,
	.driver_data = atkbd_hp_zv6100_forced_release_keys,		.driver_data = atkbd_volume_forced_release_keys,
	},		},
	{		{
	.ident = "HP Presario R4000",		.ident = "HP Presario R4000",
	@@ -1557,7 +1571,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
	DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4000"),		DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4000"),
	},		},
	.callback = atkbd_setup_forced_release,		.callback = atkbd_setup_forced_release,
	.driver_data = atkbd_hp_r4000_forced_release_keys,		.driver_data = atkbd_volume_forced_release_keys,
	},		},
	{		{
	.ident = "HP Presario R4100",		.ident = "HP Presario R4100",
	@@ -1566,7 +1580,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
	DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4100"),		DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4100"),
	},		},
	.callback = atkbd_setup_forced_release,		.callback = atkbd_setup_forced_release,
	.driver_data = atkbd_hp_r4000_forced_release_keys,		.driver_data = atkbd_volume_forced_release_keys,
	},		},
	{		{
	.ident = "HP Presario R4200",		.ident = "HP Presario R4200",
	@@ -1575,7 +1589,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
	DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4200"),		DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4200"),
	},		},
	.callback = atkbd_setup_forced_release,		.callback = atkbd_setup_forced_release,
	.driver_data = atkbd_hp_r4000_forced_release_keys,		.driver_data = atkbd_volume_forced_release_keys,
	},		},
	{		{
	.ident = "Inventec Symphony",		.ident = "Inventec Symphony",
	@@ -1584,7 +1598,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
	DMI_MATCH(DMI_PRODUCT_NAME, "SYMPHONY 6.0/7.0"),		DMI_MATCH(DMI_PRODUCT_NAME, "SYMPHONY 6.0/7.0"),
	},		},
	.callback = atkbd_setup_forced_release,		.callback = atkbd_setup_forced_release,
	.driver_data = atkbd_inventec_forced_release_keys,		.driver_data = atkbd_volume_forced_release_keys,
	},		},
	{		{
	.ident = "Samsung NC10",		.ident = "Samsung NC10",
	@@ -1620,7 +1634,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
	DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pa 1510"),		DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pa 1510"),
	},		},
	.callback = atkbd_setup_forced_release,		.callback = atkbd_setup_forced_release,
	.driver_data = atkbd_amilo_pa1510_forced_release_keys,		.driver_data = atkbd_volume_forced_release_keys,
	},		},
	{		{
	.ident = "Fujitsu Amilo Pi 3525",		.ident = "Fujitsu Amilo Pi 3525",

drivers/input/misc/hp_sdc_rtc.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -209,7 +209,7 @@ static inline int hp_sdc_rtc_read_rt(struct timeval *res) {

	/* Read the i8042 fast handshake timer */		/* Read the i8042 fast handshake timer */
	static inline int hp_sdc_rtc_read_fhs(struct timeval *res) {		static inline int hp_sdc_rtc_read_fhs(struct timeval *res) {
	uint64_t raw;		int64_t raw;
	unsigned int tenms;		unsigned int tenms;

	raw = hp_sdc_rtc_read_i8042timer(HP_SDC_CMD_LOAD_FHS, 2);		raw = hp_sdc_rtc_read_i8042timer(HP_SDC_CMD_LOAD_FHS, 2);

drivers/input/mouse/logips2pp.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -219,7 +219,7 @@ static const struct ps2pp_info *get_model_info(unsigned char model)
	PS2PP_WHEEL \| PS2PP_SIDE_BTN \| PS2PP_TASK_BTN \|		PS2PP_WHEEL \| PS2PP_SIDE_BTN \| PS2PP_TASK_BTN \|
	PS2PP_EXTRA_BTN \| PS2PP_NAV_BTN \| PS2PP_HWHEEL },		PS2PP_EXTRA_BTN \| PS2PP_NAV_BTN \| PS2PP_HWHEEL },
	{ 72, PS2PP_KIND_TRACKMAN, 0 }, /* T-CH11: TrackMan Marble */		{ 72, PS2PP_KIND_TRACKMAN, 0 }, /* T-CH11: TrackMan Marble */
	{ 73, 0, PS2PP_SIDE_BTN },		{ 73, PS2PP_KIND_TRACKMAN, PS2PP_SIDE_BTN }, /* TrackMan FX */
	{ 75, PS2PP_KIND_WHEEL, PS2PP_WHEEL },		{ 75, PS2PP_KIND_WHEEL, PS2PP_WHEEL },
	{ 76, PS2PP_KIND_WHEEL, PS2PP_WHEEL },		{ 76, PS2PP_KIND_WHEEL, PS2PP_WHEEL },
	{ 79, PS2PP_KIND_TRACKMAN, PS2PP_WHEEL }, /* TrackMan with wheel */		{ 79, PS2PP_KIND_TRACKMAN, PS2PP_WHEEL }, /* TrackMan with wheel */

drivers/input/mouse/synaptics.c

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -652,6 +652,16 @@ static const struct dmi_system_id toshiba_dmi_table[] = {
	DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),		DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
	DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M300"),		DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M300"),
	},		},

			},
			{
			.ident = "Toshiba Portege M300",
			.matches = {
			DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
			DMI_MATCH(DMI_PRODUCT_NAME, "Portable PC"),
			DMI_MATCH(DMI_PRODUCT_VERSION, "Version 1.0"),
			},

	},		},
	{ }		{ }
	};		};