Commit b26a95d4 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'next' into for-linus 

Prepare second round of input updates for 4.5 merge window.
parents 009f7738 809d9516

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.