Commit 2f39691f 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 

Pull input layer fixes from Dmitry Torokhov:
 "Second round of updates for the input subsystem.  Mostly small fixups
  to the code merged in the first round (atmel_mxt_ts, wacom) but also a
  smallish patch to xbox driver to support Xbox One controllers and a
  patch to better handle Synaptics profile sensors found in Cr-48
  Chromebooks that should not affect any other devices"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: edt-ft5x06 - remove superfluous assignment
  Input: xpad - add support for Xbox One controllers
  Input: atmel_mxt_ts - fix a few issues reported by Coverity
  Input: atmel_mxt_ts - split config update a bit
  Input: atmel_mxt_ts - simplify mxt_initialize a bit
  Input: joystick - use get_cycles on ARMv8
  Input: wacom - fix compiler warning if !CONFIG_PM
  Input: cap1106 - allow changing key mapping from userspace
  Input: synaptics - use firmware data for Cr-48
  Input: synaptics - properly initialize slots for semi-MT
  Input: MT - make slot cleanup callable outside mt_sync_frame()
  Input: atmel_mxt_ts - mXT224 DMA quirk was fixed in firmware v2.0.AA
parents ffb29b42 91167e19

drivers/hid/wacom_sys.c

+2 −0
Original line number Diff line number Diff line
@@ -1416,6 +1416,7 @@ static void wacom_remove(struct hid_device *hdev) 
	kfree(wacom);

}



#ifdef CONFIG_PM

static int wacom_resume(struct hid_device *hdev)

{

	struct wacom *wacom = hid_get_drvdata(hdev);
@@ -1436,6 +1437,7 @@ static int wacom_reset_resume(struct hid_device *hdev) 
{

	return wacom_resume(hdev);

}

#endif /* CONFIG_PM */



static struct hid_driver wacom_driver = {

	.name =		"wacom",

drivers/input/input-mt.c

+27 −11
Original line number Diff line number Diff line
@@ -236,6 +236,31 @@ void input_mt_report_pointer_emulation(struct input_dev *dev, bool use_count) 
}

EXPORT_SYMBOL(input_mt_report_pointer_emulation);



/**

 * input_mt_drop_unused() - Inactivate slots not seen in this frame

 * @dev: input device with allocated MT slots

 *

 * Lift all slots not seen since the last call to this function.

 */

void input_mt_drop_unused(struct input_dev *dev)

{

	struct input_mt *mt = dev->mt;

	int i;



	if (!mt)

		return;



	for (i = 0; i < mt->num_slots; i++) {

		if (!input_mt_is_used(mt, &mt->slots[i])) {

			input_mt_slot(dev, i);

			input_event(dev, EV_ABS, ABS_MT_TRACKING_ID, -1);

		}

	}



	mt->frame++;

}

EXPORT_SYMBOL(input_mt_drop_unused);



/**

 * input_mt_sync_frame() - synchronize mt frame

 * @dev: input device with allocated MT slots
@@ -247,27 +272,18 @@ EXPORT_SYMBOL(input_mt_report_pointer_emulation); 
void input_mt_sync_frame(struct input_dev *dev)

{

	struct input_mt *mt = dev->mt;

	struct input_mt_slot *s;

	bool use_count = false;



	if (!mt)

		return;



	if (mt->flags & INPUT_MT_DROP_UNUSED) {

		for (s = mt->slots; s != mt->slots + mt->num_slots; s++) {

			if (input_mt_is_used(mt, s))

				continue;

			input_mt_slot(dev, s - mt->slots);

			input_event(dev, EV_ABS, ABS_MT_TRACKING_ID, -1);

		}

	}

	if (mt->flags & INPUT_MT_DROP_UNUSED)

		input_mt_drop_unused(dev);



	if ((mt->flags & INPUT_MT_POINTER) && !(mt->flags & INPUT_MT_SEMI_MT))

		use_count = true;



	input_mt_report_pointer_emulation(dev, use_count);



	mt->frame++;

}

EXPORT_SYMBOL(input_mt_sync_frame);

drivers/input/joystick/analog.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static unsigned int get_time_pit(void) 
#define GET_TIME(x)	rdtscl(x)

#define DELTA(x,y)	((y)-(x))

#define TIME_NAME	"TSC"

#elif defined(__alpha__) || defined(CONFIG_MN10300) || defined(CONFIG_ARM) || defined(CONFIG_TILE)

#elif defined(__alpha__) || defined(CONFIG_MN10300) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_TILE)

#define GET_TIME(x)	do { x = get_cycles(); } while (0)

#define DELTA(x,y)	((y)-(x))

#define TIME_NAME	"get_cycles"

drivers/input/joystick/xpad.c

+157 −17
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ 
#define XTYPE_XBOX        0

#define XTYPE_XBOX360     1

#define XTYPE_XBOX360W    2

#define XTYPE_UNKNOWN     3

#define XTYPE_XBOXONE     3

#define XTYPE_UNKNOWN     4



static bool dpad_to_buttons;

module_param(dpad_to_buttons, bool, S_IRUGO);
@@ -121,6 +122,7 @@ static const struct xpad_device { 
	{ 0x045e, 0x0287, "Microsoft Xbox Controller S", 0, XTYPE_XBOX },

	{ 0x045e, 0x0289, "Microsoft X-Box pad v2 (US)", 0, XTYPE_XBOX },

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

	{ 0x045e, 0x02d1, "Microsoft X-Box One pad", 0, XTYPE_XBOXONE },

	{ 0x045e, 0x0291, "Xbox 360 Wireless Receiver (XBOX)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W },

	{ 0x045e, 0x0719, "Xbox 360 Wireless Receiver", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W },

	{ 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX },
@@ -231,10 +233,12 @@ static const signed short xpad_abs_triggers[] = { 
	-1

};



/* Xbox 360 has a vendor-specific class, so we cannot match it with only

/*

 * Xbox 360 has a vendor-specific class, so we cannot match it with only

 * USB_INTERFACE_INFO (also specifically refused by USB subsystem), so we

 * match against vendor id as well. Wired Xbox 360 devices have protocol 1,

 * wireless controllers have protocol 129. */

 * wireless controllers have protocol 129.

 */

#define XPAD_XBOX360_VENDOR_PROTOCOL(vend,pr) \

	.match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_INT_INFO, \

	.idVendor = (vend), \
@@ -245,9 +249,20 @@ static const signed short xpad_abs_triggers[] = { 
	{ XPAD_XBOX360_VENDOR_PROTOCOL(vend,1) }, \

	{ XPAD_XBOX360_VENDOR_PROTOCOL(vend,129) }



/* The Xbox One controller uses subclass 71 and protocol 208. */

#define XPAD_XBOXONE_VENDOR_PROTOCOL(vend, pr) \

	.match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_INT_INFO, \

	.idVendor = (vend), \

	.bInterfaceClass = USB_CLASS_VENDOR_SPEC, \

	.bInterfaceSubClass = 71, \

	.bInterfaceProtocol = (pr)

#define XPAD_XBOXONE_VENDOR(vend) \

	{ XPAD_XBOXONE_VENDOR_PROTOCOL(vend, 208) }



static struct usb_device_id xpad_table[] = {

	{ USB_INTERFACE_INFO('X', 'B', 0) },	/* X-Box USB-IF not approved class */

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

	XPAD_XBOXONE_VENDOR(0x045e),		/* Microsoft X-Box One controllers */

	XPAD_XBOX360_VENDOR(0x046d),		/* Logitech X-Box 360 style controllers */

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

	{ USB_DEVICE(0x0738, 0x4540) },		/* Mad Catz Beat Pad */
@@ -278,12 +293,10 @@ struct usb_xpad { 
	struct urb *bulk_out;

	unsigned char *bdata;



#if defined(CONFIG_JOYSTICK_XPAD_FF) || defined(CONFIG_JOYSTICK_XPAD_LEDS)

	struct urb *irq_out;		/* urb for interrupt out report */

	unsigned char *odata;		/* output data */

	dma_addr_t odata_dma;

	struct mutex odata_mutex;

#endif



#if defined(CONFIG_JOYSTICK_XPAD_LEDS)

	struct xpad_led *led;
@@ -470,6 +483,105 @@ static void xpad360w_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned cha 
	xpad360_process_packet(xpad, cmd, &data[4]);

}



/*

 *	xpadone_process_buttons

 *

 *	Process a button update packet from an Xbox one controller.

 */

static void xpadone_process_buttons(struct usb_xpad *xpad,

				struct input_dev *dev,

				unsigned char *data)

{

	/* menu/view buttons */

	input_report_key(dev, BTN_START,  data[4] & 0x04);

	input_report_key(dev, BTN_SELECT, data[4] & 0x08);



	/* buttons A,B,X,Y */

	input_report_key(dev, BTN_A,	data[4] & 0x10);

	input_report_key(dev, BTN_B,	data[4] & 0x20);

	input_report_key(dev, BTN_X,	data[4] & 0x40);

	input_report_key(dev, BTN_Y,	data[4] & 0x80);



	/* digital pad */

	if (xpad->mapping & MAP_DPAD_TO_BUTTONS) {

		/* dpad as buttons (left, right, up, down) */

		input_report_key(dev, BTN_TRIGGER_HAPPY1, data[5] & 0x04);

		input_report_key(dev, BTN_TRIGGER_HAPPY2, data[5] & 0x08);

		input_report_key(dev, BTN_TRIGGER_HAPPY3, data[5] & 0x01);

		input_report_key(dev, BTN_TRIGGER_HAPPY4, data[5] & 0x02);

	} else {

		input_report_abs(dev, ABS_HAT0X,

				 !!(data[5] & 0x08) - !!(data[5] & 0x04));

		input_report_abs(dev, ABS_HAT0Y,

				 !!(data[5] & 0x02) - !!(data[5] & 0x01));

	}



	/* TL/TR */

	input_report_key(dev, BTN_TL,	data[5] & 0x10);

	input_report_key(dev, BTN_TR,	data[5] & 0x20);



	/* stick press left/right */

	input_report_key(dev, BTN_THUMBL, data[5] & 0x40);

	input_report_key(dev, BTN_THUMBR, data[5] & 0x80);



	if (!(xpad->mapping & MAP_STICKS_TO_NULL)) {

		/* left stick */

		input_report_abs(dev, ABS_X,

				 (__s16) le16_to_cpup((__le16 *)(data + 10)));

		input_report_abs(dev, ABS_Y,

				 ~(__s16) le16_to_cpup((__le16 *)(data + 12)));



		/* right stick */

		input_report_abs(dev, ABS_RX,

				 (__s16) le16_to_cpup((__le16 *)(data + 14)));

		input_report_abs(dev, ABS_RY,

				 ~(__s16) le16_to_cpup((__le16 *)(data + 16)));

	}



	/* triggers left/right */

	if (xpad->mapping & MAP_TRIGGERS_TO_BUTTONS) {

		input_report_key(dev, BTN_TL2,

				 (__u16) le16_to_cpup((__le16 *)(data + 6)));

		input_report_key(dev, BTN_TR2,

				 (__u16) le16_to_cpup((__le16 *)(data + 8)));

	} else {

		input_report_abs(dev, ABS_Z,

				 (__u16) le16_to_cpup((__le16 *)(data + 6)));

		input_report_abs(dev, ABS_RZ,

				 (__u16) le16_to_cpup((__le16 *)(data + 8)));

	}



	input_sync(dev);

}



/*

 *	xpadone_process_packet

 *

 *	Completes a request by converting the data into events for the

 *	input subsystem. This version is for the Xbox One controller.

 *

 *	The report format was gleaned from

 *	https://github.com/kylelemons/xbox/blob/master/xbox.go

 */



static void xpadone_process_packet(struct usb_xpad *xpad,

				u16 cmd, unsigned char *data)

{

	struct input_dev *dev = xpad->dev;



	switch (data[0]) {

	case 0x20:

		xpadone_process_buttons(xpad, dev, data);

		break;



	case 0x07:

		/* the xbox button has its own special report */

		input_report_key(dev, BTN_MODE, data[4] & 0x01);

		input_sync(dev);

		break;

	}

}



static void xpad_irq_in(struct urb *urb)

{

	struct usb_xpad *xpad = urb->context;
@@ -502,6 +614,9 @@ static void xpad_irq_in(struct urb *urb) 
	case XTYPE_XBOX360W:

		xpad360w_process_packet(xpad, 0, xpad->idata);

		break;

	case XTYPE_XBOXONE:

		xpadone_process_packet(xpad, 0, xpad->idata);

		break;

	default:

		xpad_process_packet(xpad, 0, xpad->idata);

	}
@@ -535,7 +650,6 @@ static void xpad_bulk_out(struct urb *urb) 
	}

}



#if defined(CONFIG_JOYSTICK_XPAD_FF) || defined(CONFIG_JOYSTICK_XPAD_LEDS)

static void xpad_irq_out(struct urb *urb)

{

	struct usb_xpad *xpad = urb->context;
@@ -573,6 +687,7 @@ exit: 
static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad)

{

	struct usb_endpoint_descriptor *ep_irq_out;

	int ep_irq_out_idx;

	int error;



	if (xpad->xtype == XTYPE_UNKNOWN)
@@ -593,7 +708,10 @@ static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad) 
		goto fail2;

	}



	ep_irq_out = &intf->cur_altsetting->endpoint[1].desc;

	/* Xbox One controller has in/out endpoints swapped. */

	ep_irq_out_idx = xpad->xtype == XTYPE_XBOXONE ? 0 : 1;

	ep_irq_out = &intf->cur_altsetting->endpoint[ep_irq_out_idx].desc;



	usb_fill_int_urb(xpad->irq_out, xpad->udev,

			 usb_sndintpipe(xpad->udev, ep_irq_out->bEndpointAddress),

			 xpad->odata, XPAD_PKT_LEN,
@@ -621,11 +739,6 @@ static void xpad_deinit_output(struct usb_xpad *xpad) 
				xpad->odata, xpad->odata_dma);

	}

}

#else

static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad) { return 0; }

static void xpad_deinit_output(struct usb_xpad *xpad) {}

static void xpad_stop_output(struct usb_xpad *xpad) {}

#endif



#ifdef CONFIG_JOYSTICK_XPAD_FF

static int xpad_play_effect(struct input_dev *dev, void *data, struct ff_effect *effect)
@@ -692,7 +805,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_UNKNOWN)

	if (xpad->xtype == XTYPE_UNKNOWN || xpad->xtype == XTYPE_XBOXONE)

		return 0;



	input_set_capability(xpad->dev, EV_FF, FF_RUMBLE);
@@ -801,6 +914,14 @@ static int xpad_open(struct input_dev *dev) 
	if (usb_submit_urb(xpad->irq_in, GFP_KERNEL))

		return -EIO;



	if (xpad->xtype == XTYPE_XBOXONE) {

		/* Xbox one controller needs to be initialized. */

		xpad->odata[0] = 0x05;

		xpad->odata[1] = 0x20;

		xpad->irq_out->transfer_buffer_length = 2;

		return usb_submit_urb(xpad->irq_out, GFP_KERNEL);

	}



	return 0;

}
@@ -816,6 +937,7 @@ static void xpad_close(struct input_dev *dev) 


static void xpad_set_up_abs(struct input_dev *input_dev, signed short abs)

{

	struct usb_xpad *xpad = input_get_drvdata(input_dev);

	set_bit(abs, input_dev->absbit);



	switch (abs) {
@@ -827,6 +949,9 @@ static void xpad_set_up_abs(struct input_dev *input_dev, signed short abs) 
		break;

	case ABS_Z:

	case ABS_RZ:	/* the triggers (if mapped to axes) */

		if (xpad->xtype == XTYPE_XBOXONE)

			input_set_abs_params(input_dev, abs, 0, 1023, 0, 0);

		else

			input_set_abs_params(input_dev, abs, 0, 255, 0, 0);

		break;

	case ABS_HAT0X:
@@ -842,6 +967,7 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id 
	struct usb_xpad *xpad;

	struct input_dev *input_dev;

	struct usb_endpoint_descriptor *ep_irq_in;

	int ep_irq_in_idx;

	int i, error;



	for (i = 0; xpad_device[i].idVendor; i++) {
@@ -850,6 +976,16 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id 
			break;

	}



	if (xpad_device[i].xtype == XTYPE_XBOXONE &&

	    intf->cur_altsetting->desc.bInterfaceNumber != 0) {

		/*

		 * The Xbox One controller lists three interfaces all with the

		 * same interface class, subclass and protocol. Differentiate by

		 * interface number.

		 */

		return -ENODEV;

	}



	xpad = kzalloc(sizeof(struct usb_xpad), GFP_KERNEL);

	input_dev = input_allocate_device();

	if (!xpad || !input_dev) {
@@ -920,7 +1056,8 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id 
		__set_bit(xpad_common_btn[i], input_dev->keybit);



	/* set up model-specific ones */

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

	if (xpad->xtype == XTYPE_XBOX360 || xpad->xtype == XTYPE_XBOX360W ||

	    xpad->xtype == XTYPE_XBOXONE) {

		for (i = 0; xpad360_btn[i] >= 0; i++)

			__set_bit(xpad360_btn[i], input_dev->keybit);

	} else {
@@ -956,7 +1093,10 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id 
	if (error)

		goto fail5;



	ep_irq_in = &intf->cur_altsetting->endpoint[0].desc;

	/* Xbox One controller has in/out endpoints swapped. */

	ep_irq_in_idx = xpad->xtype == XTYPE_XBOXONE ? 1 : 0;

	ep_irq_in = &intf->cur_altsetting->endpoint[ep_irq_in_idx].desc;



	usb_fill_int_urb(xpad->irq_in, udev,

			 usb_rcvintpipe(udev, ep_irq_in->bEndpointAddress),

			 xpad->idata, XPAD_PKT_LEN, xpad_irq_in,

drivers/input/keyboard/cap1106.c

+7 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ struct cap1106_priv { 
	struct input_dev *idev;



	/* config */

	unsigned int keycodes[CAP1106_NUM_CHN];

	unsigned short keycodes[CAP1106_NUM_CHN];

};



static const struct reg_default cap1106_reg_defaults[] = {
@@ -272,6 +272,12 @@ static int cap1106_i2c_probe(struct i2c_client *i2c_client, 
	for (i = 0; i < CAP1106_NUM_CHN; i++)

		__set_bit(priv->keycodes[i], priv->idev->keybit);



	__clear_bit(KEY_RESERVED, priv->idev->keybit);



	priv->idev->keycode = priv->keycodes;

	priv->idev->keycodesize = sizeof(priv->keycodes[0]);

	priv->idev->keycodemax = ARRAY_SIZE(priv->keycodes);



	priv->idev->id.vendor = CAP1106_MANUFACTURER_ID;

	priv->idev->id.product = CAP1106_PRODUCT_ID;

	priv->idev->id.version = rev;

CRA Git | Maintained and supported by SUSTech CRA and CCSE