Commit 70a3eff5 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: (53 commits)
  Input: synaptics - fix reporting of min coordinates
  Input: tegra-kbc - enable key autorepeat
  Input: kxtj9 - fix locking typo in kxtj9_set_poll()
  Input: kxtj9 - fix bug in probe()
  Input: intel-mid-touch - remove pointless checking for variable 'found'
  Input: hp_sdc - staticize hp_sdc_kicker()
  Input: pmic8xxx-keypad - fix a leak of the IRQ during init failure
  Input: cy8ctmg110_ts - set reset_pin and irq_pin from platform data
  Input: cy8ctmg110_ts - constify i2c_device_id table
  Input: cy8ctmg110_ts - fix checking return value of i2c_master_send
  Input: lifebook - make dmi callback functions return 1
  Input: atkbd - make dmi callback functions return 1
  Input: gpio_keys - switch to using SIMPLE_DEV_PM_OPS
  Input: gpio_keys - add support for device-tree platform data
  Input: aiptek - remove double define
  Input: synaptics - set minimum coordinates as reported by firmware
  Input: synaptics - process button bits in AGM packets
  Input: synaptics - rename set_slot to be more descriptive
  Input: synaptics - fuzz position for touchpad with reduced filtering
  Input: synaptics - set resolution for MT_POSITION_X/Y axes
  ...
parents 9ed3689b aa7eb8e7

Documentation/devicetree/bindings/gpio/gpio_keys.txt

0 → 100644
+36 −0
Original line number Diff line number Diff line 
Device-Tree bindings for input/gpio_keys.c keyboard driver



Required properties:

	- compatible = "gpio-keys";



Optional properties:

	- autorepeat: Boolean, Enable auto repeat feature of Linux input

	  subsystem.



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

Subnode properties:



	- gpios: OF devcie-tree gpio specificatin.

	- label: Descriptive name of the key.

	- linux,code: Keycode to emit.



Optional subnode-properties:

	- linux,input-type: Specify event type this button/key generates.

	  If not specified defaults to <1> == EV_KEY.

	- debounce-interval: Debouncing interval time in milliseconds.

	  If not specified defaults to 5.

	- gpio-key,wakeup: Boolean, button can wake-up the system.



Example nodes:



	gpio_keys {

			compatible = "gpio-keys";

			#address-cells = <1>;

			#size-cells = <0>;

			autorepeat;

			button@21 {

				label = "GPIO Key UP";

				linux,code = <103>;

				gpios = <&gpio1 0 1>;

			};

			...

drivers/input/joystick/xpad.c

+26 −5
Original line number Diff line number Diff line
@@ -154,10 +154,13 @@ static const struct xpad_device { 
	{ 0x0f30, 0x8888, "BigBen XBMiniPad Controller", 0, XTYPE_XBOX },

	{ 0x102c, 0xff0c, "Joytech Wireless Advanced Controller", 0, XTYPE_XBOX },

	{ 0x12ab, 0x8809, "Xbox DDR dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },

	{ 0x12ab, 0x0004, "Honey Bee Xbox360 dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },

	{ 0x0e6f, 0x0105, "HSM3 Xbox360 dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },

	{ 0x1430, 0x4748, "RedOctane Guitar Hero X-plorer", 0, XTYPE_XBOX360 },

	{ 0x1430, 0x8888, "TX6500+ Dance Pad (first generation)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },

	{ 0x146b, 0x0601, "BigBen Interactive XBOX 360 Controller", 0, XTYPE_XBOX360 },

	{ 0x045e, 0x028e, "Microsoft X-Box 360 pad", 0, XTYPE_XBOX360 },

	{ 0x1bad, 0x0002, "Harmonix Rock Band Guitar", 0, XTYPE_XBOX360 },

	{ 0x1bad, 0x0003, "Harmonix Rock Band Drumkit", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },

	{ 0x0f0d, 0x0016, "Hori Real Arcade Pro.EX", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },

	{ 0x0f0d, 0x000d, "Hori Fighting Stick EX2", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
@@ -236,9 +239,10 @@ static struct usb_device_id xpad_table [] = { 
	XPAD_XBOX360_VENDOR(0x046d),		/* Logitech X-Box 360 style controllers */

	XPAD_XBOX360_VENDOR(0x0738),		/* Mad Catz X-Box 360 controllers */

	XPAD_XBOX360_VENDOR(0x0e6f),		/* 0x0e6f X-Box 360 controllers */

	XPAD_XBOX360_VENDOR(0x12ab),		/* X-Box 360 dance pads */

	XPAD_XBOX360_VENDOR(0x1430),		/* RedOctane X-Box 360 controllers */

	XPAD_XBOX360_VENDOR(0x146b),		/* BigBen Interactive Controllers */

	XPAD_XBOX360_VENDOR(0x1bad),		/* Rock Band Drums */

	XPAD_XBOX360_VENDOR(0x1bad),		/* Harminix Rock Band Guitar and Drums */

	XPAD_XBOX360_VENDOR(0x0f0d),            /* Hori Controllers */

	{ }

};
@@ -545,7 +549,7 @@ static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad) 
	struct usb_endpoint_descriptor *ep_irq_out;

	int error;



	if (xpad->xtype != XTYPE_XBOX360 && xpad->xtype != XTYPE_XBOX)

	if (xpad->xtype == XTYPE_UNKNOWN)

		return 0;



	xpad->odata = usb_alloc_coherent(xpad->udev, XPAD_PKT_LEN,
@@ -579,13 +583,13 @@ static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad) 


static void xpad_stop_output(struct usb_xpad *xpad)

{

	if (xpad->xtype == XTYPE_XBOX360 || xpad->xtype == XTYPE_XBOX)

	if (xpad->xtype != XTYPE_UNKNOWN)

		usb_kill_urb(xpad->irq_out);

}



static void xpad_deinit_output(struct usb_xpad *xpad)

{

	if (xpad->xtype == XTYPE_XBOX360 || xpad->xtype == XTYPE_XBOX) {

	if (xpad->xtype != XTYPE_UNKNOWN) {

		usb_free_urb(xpad->irq_out);

		usb_free_coherent(xpad->udev, XPAD_PKT_LEN,

				xpad->odata, xpad->odata_dma);
@@ -632,6 +636,23 @@ static int xpad_play_effect(struct input_dev *dev, void *data, struct ff_effect 


			return usb_submit_urb(xpad->irq_out, GFP_ATOMIC);



		case XTYPE_XBOX360W:

			xpad->odata[0] = 0x00;

			xpad->odata[1] = 0x01;

			xpad->odata[2] = 0x0F;

			xpad->odata[3] = 0xC0;

			xpad->odata[4] = 0x00;

			xpad->odata[5] = strong / 256;

			xpad->odata[6] = weak / 256;

			xpad->odata[7] = 0x00;

			xpad->odata[8] = 0x00;

			xpad->odata[9] = 0x00;

			xpad->odata[10] = 0x00;

			xpad->odata[11] = 0x00;

			xpad->irq_out->transfer_buffer_length = 12;



			return usb_submit_urb(xpad->irq_out, GFP_ATOMIC);



		default:

			dbg("%s - rumble command sent to unsupported xpad type: %d",

				__func__, xpad->xtype);
@@ -644,7 +665,7 @@ static int xpad_play_effect(struct input_dev *dev, void *data, struct ff_effect 


static int xpad_init_ff(struct usb_xpad *xpad)

{

	if (xpad->xtype != XTYPE_XBOX360 && xpad->xtype != XTYPE_XBOX)

	if (xpad->xtype == XTYPE_UNKNOWN)

		return 0;



	input_set_capability(xpad->dev, EV_FF, FF_RUMBLE);

drivers/input/keyboard/adp5588-keys.c

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
 */



#include <linux/module.h>

#include <linux/version.h>

#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

drivers/input/keyboard/adp5589-keys.c

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
 */



#include <linux/module.h>

#include <linux/version.h>

#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

drivers/input/keyboard/atkbd.c

+2 −2
Original line number Diff line number Diff line
@@ -1578,14 +1578,14 @@ static int __init atkbd_setup_forced_release(const struct dmi_system_id *id) 
	atkbd_platform_fixup = atkbd_apply_forced_release_keylist;

	atkbd_platform_fixup_data = id->driver_data;



	return 0;

	return 1;

}



static int __init atkbd_setup_scancode_fixup(const struct dmi_system_id *id)

{

	atkbd_platform_scancode_fixup = id->driver_data;



	return 0;

	return 1;

}



static const struct dmi_system_id atkbd_dmi_quirk_table[] __initconst = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE