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

Pull more input updates from Dmitry Torokhov: "The second round of updates for the input subsystem, mainly changes to xpad driver to better hanlde Xbox One controllers" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: gpio-keys - allow disabling individual buttons in DT Input: gpio-keys - allow setting input device name in DT Input: xpad - correct xbox one pad device name Input: atmel_mxt_ts - improve touchscreen size/orientation handling Input: xpad - use LED API when identifying wireless controllers Input: xpad - workaround dead irq_out after suspend/ resume Input: xpad - update Xbox One Force Feedback Support Input: xpad - correctly handle concurrent LED and FF requests Input: xpad - handle "present" and "gone" correctly Input: xpad - remove spurious events of wireless xpad 360 controller

Documentation/devicetree/bindings/input/gpio-keys.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ Required properties:
		Optional properties:
		- autorepeat: Boolean, Enable auto repeat feature of Linux input
		subsystem.
		- label: String, name of the input device.

		Each button (key) is represented as a sub-node of "gpio-keys":
		Subnode properties:

drivers/input/joystick/xpad.c

+425 −166

File changed.

Preview size limit exceeded, changes collapsed.

drivers/input/keyboard/gpio_keys.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -630,7 +630,7 @@ gpio_keys_get_devtree_pdata(struct device *dev)
		if (!node)
		return ERR_PTR(-ENODEV);

		nbuttons = of_get_child_count(node);
		nbuttons = of_get_available_child_count(node);
		if (nbuttons == 0)
		return ERR_PTR(-ENODEV);

		@@ -645,8 +645,10 @@ gpio_keys_get_devtree_pdata(struct device *dev)

		pdata->rep = !!of_get_property(node, "autorepeat", NULL);

		of_property_read_string(node, "label", &pdata->name);

		i = 0;
		for_each_child_of_node(node, pp) {
		for_each_available_child_of_node(node, pp) {
		enum of_gpio_flags flags;

		button = &pdata->buttons[i++];

drivers/input/touchscreen/atmel_mxt_ts.c

+26 −42

File changed.

Preview size limit exceeded, changes collapsed.

Admin message