Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 279b1e0f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://github.com/dtor/input 

* 'for-linus' of git://github.com/dtor/input:
  Input: wacom - fix touch parsing on newer Bamboos
  Input: bcm5974 - add MacBookAir4,1 trackpad support
  Input: wacom - add POINTER and DIRECT device properties
  Input: adp5588-keys - remove incorrect modalias
  Input: cm109 - fix checking return value of usb_control_msg
  Input: wacom - advertise BTN_TOOL_PEN and BTN_STYLUS for PenPartner
  Input: wacom - remove pressure for touch devices
parents abbe0d3c 8f906860

drivers/hid/hid-wacom.c

+2 −0
Original line number Diff line number Diff line
@@ -373,6 +373,8 @@ static int wacom_probe(struct hid_device *hdev, 
	hidinput = list_entry(hdev->inputs.next, struct hid_input, list);

	input = hidinput->input;



	__set_bit(INPUT_PROP_POINTER, input->propbit);



	/* Basics */

	input->evbit[0] |= BIT(EV_KEY) | BIT(EV_ABS) | BIT(EV_REL);

drivers/input/keyboard/adp5588-keys.c

+0 −1
Original line number Diff line number Diff line
@@ -668,4 +668,3 @@ module_exit(adp5588_exit); 
MODULE_LICENSE("GPL");

MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");

MODULE_DESCRIPTION("ADP5588/87 Keypad driver");
 
MODULE_ALIAS("platform:adp5588-keys");

drivers/input/misc/cm109.c

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ static void cm109_toggle_buzzer_sync(struct cm109_dev *dev, int on) 
				le16_to_cpu(dev->ctl_req->wIndex),

				dev->ctl_data,

				USB_PKT_LEN, USB_CTRL_SET_TIMEOUT);

	if (error && error != EINTR)

	if (error < 0 && error != -EINTR)

		err("%s: usb_control_msg() failed %d", __func__, error);

}

drivers/input/mouse/bcm5974.c

+20 −0
Original line number Diff line number Diff line
@@ -67,6 +67,10 @@ 
#define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI	0x0245

#define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO	0x0246

#define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS	0x0247

/* MacbookAir4,1 (unibody, July 2011) */

#define USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI	0x0249

#define USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO	0x024a

#define USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS	0x024b

/* MacbookAir4,2 (unibody, July 2011) */

#define USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI	0x024c

#define USB_DEVICE_ID_APPLE_WELLSPRING6_ISO	0x024d
@@ -112,6 +116,10 @@ static const struct usb_device_id bcm5974_table[] = { 
	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI),

	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_ISO),

	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_JIS),

	/* MacbookAir4,1 */

	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI),

	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO),

	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS),

	/* MacbookAir4,2 */

	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI),

	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING6_ISO),
@@ -334,6 +342,18 @@ static const struct bcm5974_config bcm5974_config_table[] = { 
		{ DIM_X, DIM_X / SN_COORD, -4750, 5280 },

		{ DIM_Y, DIM_Y / SN_COORD, -150, 6730 }

	},

	{

		USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI,

		USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO,

		USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS,

		HAS_INTEGRATED_BUTTON,

		0x84, sizeof(struct bt_data),

		0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS,

		{ DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 300 },

		{ DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 },

		{ DIM_X, DIM_X / SN_COORD, -4620, 5140 },

		{ DIM_Y, DIM_Y / SN_COORD, -150, 6600 }

	},

	{}

};

drivers/input/tablet/wacom_sys.c

+0 −14
Original line number Diff line number Diff line
@@ -229,13 +229,6 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi 
							get_unaligned_le16(&report[i + 3]);

						i += 4;

					}

				} else if (usage == WCM_DIGITIZER) {

					/* max pressure isn't reported

					features->pressure_max = (unsigned short)

							(report[i+4] << 8  | report[i + 3]);

					*/

					features->pressure_max = 255;

					i += 4;

				}

				break;
@@ -291,13 +284,6 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi 
				pen = 1;

				i++;

				break;



			case HID_USAGE_UNDEFINED:

				if (usage == WCM_DESKTOP && finger) /* capacity */

					features->pressure_max =

						get_unaligned_le16(&report[i + 3]);

				i += 4;

				break;

			}

			break;