Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input (b292d6b5) · Commits · 戴 / test

Documentation/input/event-codes.txt

+13 −0

Original line number	Diff line number	Diff line
		@@ -281,6 +281,19 @@ gestures can normally be extracted from it.
		If INPUT_PROP_SEMI_MT is not set, the device is assumed to be a true MT
		device.

		INPUT_PROP_TOPBUTTONPAD:
		-----------------------
		Some laptops, most notably the Lenovo *40 series provide a trackstick
		device but do not have physical buttons associated with the trackstick
		device. Instead, the top area of the touchpad is marked to show
		visual/haptic areas for left, middle, right buttons intended to be used
		with the trackstick.

		If INPUT_PROP_TOPBUTTONPAD is set, userspace should emulate buttons
		accordingly. This property does not affect kernel behavior.
		The kernel does not provide button emulation for such devices but treats
		them as any other INPUT_PROP_BUTTONPAD device.

		Guidelines:
		==========
		The guidelines below ensure proper single-touch and multi-finger functionality.

+4 −2

Original line number	Diff line number	Diff line
		@@ -257,9 +257,10 @@ static int input_handle_abs_event(struct input_dev *dev,
		}

		static int input_get_disposition(struct input_dev *dev,
		unsigned int type, unsigned int code, int value)
		unsigned int type, unsigned int code, int *pval)
		{
		int disposition = INPUT_IGNORE_EVENT;
		int value = *pval;

		switch (type) {

		@@ -357,6 +358,7 @@ static int input_get_disposition(struct input_dev *dev,
		break;
		}

		*pval = value;
		return disposition;
		}

		@@ -365,7 +367,7 @@ static void input_handle_event(struct input_dev *dev,
		{
		int disposition;

		disposition = input_get_disposition(dev, type, code, value);
		disposition = input_get_disposition(dev, type, code, &value);

		if ((disposition & INPUT_PASS_TO_DEVICE) && dev->event)
		dev->event(dev, type, code, value);

+2 −0

Original line number	Diff line number	Diff line
		@@ -215,6 +215,7 @@ static int keyscan_probe(struct platform_device *pdev)
		return 0;
		}

		#ifdef CONFIG_PM_SLEEP
		static int keyscan_suspend(struct device *dev)
		{
		struct platform_device *pdev = to_platform_device(dev);
		@@ -249,6 +250,7 @@ static int keyscan_resume(struct device *dev)
		mutex_unlock(&input->mutex);
		return retval;
		}
		#endif

		static SIMPLE_DEV_PM_OPS(keyscan_dev_pm_ops, keyscan_suspend, keyscan_resume);

+3 −2

Original line number	Diff line number	Diff line
		@@ -132,7 +132,8 @@ static const struct min_max_quirk min_max_pnpid_table[] = {
		1232, 5710, 1156, 4696
		},
		{
		(const char * const []){"LEN0034", "LEN0036", "LEN2004", NULL},
		(const char * const []){"LEN0034", "LEN0036", "LEN2002",
		"LEN2004", NULL},
		1024, 5112, 2024, 4832
		},
		{
		@@ -168,7 +169,7 @@ static const char * const topbuttonpad_pnp_ids[] = {
		"LEN0049",
		"LEN2000",
		"LEN2001", /* Edge E431 */
		"LEN2002",
		"LEN2002", /* Edge E531 */
		"LEN2003",
		"LEN2004", /* L440 */
		"LEN2005",

+7 −0

Original line number	Diff line number	Diff line
		@@ -401,6 +401,13 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = {
		DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 1360"),
		},
		},
		{
		/* Acer Aspire 5710 */
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
		DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5710"),
		},
		},
		{
		/* Gericom Bellagio */
		.matches = {