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

Commit 8ca06d6f authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-5.4/wacom' into for-linus 



- MobileStudio Pro 13 support, from Ping Cheng

- a few other assorted fixes

Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parents 7af0f839 bbbe3ac8

drivers/hid/wacom_sys.c

+9 −16
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static void wacom_wac_queue_flush(struct hid_device *hdev, 
}



static int wacom_wac_pen_serial_enforce(struct hid_device *hdev,

		struct hid_report *report, u8 *raw_data, int size)

		struct hid_report *report, u8 *raw_data, int report_size)

{

	struct wacom *wacom = hid_get_drvdata(hdev);

	struct wacom_wac *wacom_wac = &wacom->wacom_wac;
@@ -149,7 +149,8 @@ static int wacom_wac_pen_serial_enforce(struct hid_device *hdev, 
	if (flush)

		wacom_wac_queue_flush(hdev, &wacom_wac->pen_fifo);

	else if (insert)

		wacom_wac_queue_insert(hdev, &wacom_wac->pen_fifo, raw_data, size);

		wacom_wac_queue_insert(hdev, &wacom_wac->pen_fifo,

				       raw_data, report_size);



	return insert && !flush;

}
@@ -2176,7 +2177,7 @@ static void wacom_update_name(struct wacom *wacom, const char *suffix) 
{

	struct wacom_wac *wacom_wac = &wacom->wacom_wac;

	struct wacom_features *features = &wacom_wac->features;

	char name[WACOM_NAME_MAX];

	char name[WACOM_NAME_MAX - 20]; /* Leave some room for suffixes */



	/* Generic devices name unspecified */

	if ((features->type == HID_GENERIC) && !strcmp("Wacom HID", features->name)) {
@@ -2718,14 +2719,12 @@ static int wacom_probe(struct hid_device *hdev, 
	wacom_wac->features = *((struct wacom_features *)id->driver_data);

	features = &wacom_wac->features;



	if (features->check_for_hid_type && features->hid_type != hdev->type) {

		error = -ENODEV;

		goto fail;

	}

	if (features->check_for_hid_type && features->hid_type != hdev->type)

		return -ENODEV;



	error = kfifo_alloc(&wacom_wac->pen_fifo, WACOM_PKGLEN_MAX, GFP_KERNEL);

	if (error)

		goto fail;

		return error;



	wacom_wac->hid_data.inputmode = -1;

	wacom_wac->mode_report = -1;
@@ -2743,12 +2742,12 @@ static int wacom_probe(struct hid_device *hdev, 
	error = hid_parse(hdev);

	if (error) {

		hid_err(hdev, "parse failed\n");

		goto fail;

		return error;

	}



	error = wacom_parse_and_register(wacom, false);

	if (error)

		goto fail;

		return error;



	if (hdev->bus == BUS_BLUETOOTH) {

		error = device_create_file(&hdev->dev, &dev_attr_speed);
@@ -2759,10 +2758,6 @@ static int wacom_probe(struct hid_device *hdev, 
	}



	return 0;



fail:

	hid_set_drvdata(hdev, NULL);

	return error;

}



static void wacom_remove(struct hid_device *hdev)
@@ -2791,8 +2786,6 @@ static void wacom_remove(struct hid_device *hdev) 
		wacom_release_resources(wacom);



	kfifo_free(&wacom_wac->pen_fifo);



	hid_set_drvdata(hdev, NULL);

}



#ifdef CONFIG_PM

drivers/hid/wacom_wac.c

+72 −4
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static int wacom_dtu_irq(struct wacom_wac *wacom) 


static int wacom_dtus_irq(struct wacom_wac *wacom)

{

	char *data = wacom->data;

	unsigned char *data = wacom->data;

	struct input_dev *input = wacom->pen_input;

	unsigned short prox, pressure = 0;
@@ -483,6 +483,8 @@ static int wacom_intuos_pad(struct wacom_wac *wacom) 
	int ring1 = 0, ring2 = 0;

	int strip1 = 0, strip2 = 0;

	bool prox = false;

	bool wrench = false, keyboard = false, mute_touch = false, menu = false,

	     info = false;



	/* pad packets. Works as a second tool and is always in prox */

	if (!(data[0] == WACOM_REPORT_INTUOSPAD || data[0] == WACOM_REPORT_INTUOS5PAD ||
@@ -512,10 +514,32 @@ static int wacom_intuos_pad(struct wacom_wac *wacom) 
		keys = ((data[3] & 0x1C) ? 1<<2 : 0) |

		       ((data[4] & 0xE0) ? 1<<1 : 0) |

		       ((data[4] & 0x07) ? 1<<0 : 0);

		keyboard = !!(data[4] & 0xE0);

		info = !!(data[3] & 0x1C);



		if (features->oPid) {

			mute_touch = !!(data[4] & 0x07);

			if (mute_touch)

				wacom->shared->is_touch_on =

					!wacom->shared->is_touch_on;

		} else {

			wrench = !!(data[4] & 0x07);

		}

	} else if (features->type == WACOM_27QHD) {

		nkeys = 3;

		keys = data[2] & 0x07;



		wrench = !!(data[2] & 0x01);

		keyboard = !!(data[2] & 0x02);



		if (features->oPid) {

			mute_touch = !!(data[2] & 0x04);

			if (mute_touch)

				wacom->shared->is_touch_on =

					!wacom->shared->is_touch_on;

		} else {

			menu = !!(data[2] & 0x04);

		}

		input_report_abs(input, ABS_X, be16_to_cpup((__be16 *)&data[4]));

		input_report_abs(input, ABS_Y, be16_to_cpup((__be16 *)&data[6]));

		input_report_abs(input, ABS_Z, be16_to_cpup((__be16 *)&data[8]));
@@ -561,6 +585,9 @@ static int wacom_intuos_pad(struct wacom_wac *wacom) 
			if (features->type == WACOM_22HD) {

				nkeys = 3;

				keys = data[9] & 0x07;



				info = !!(data[9] & 0x01);

				wrench = !!(data[9] & 0x02);

			}

		} else {

			buttons = ((data[6] & 0x10) << 5)  |
@@ -572,7 +599,7 @@ static int wacom_intuos_pad(struct wacom_wac *wacom) 
		strip2 = ((data[3] & 0x1f) << 8) | data[4];

	}



	prox = (buttons & ~(~0 << nbuttons)) | (keys & ~(~0 << nkeys)) |

	prox = (buttons & ~(~0U << nbuttons)) | (keys & ~(~0U << nkeys)) |

	       (ring1 & 0x80) | (ring2 & 0x80) | strip1 | strip2;



	wacom_report_numbered_buttons(input, nbuttons, buttons);
@@ -580,6 +607,18 @@ static int wacom_intuos_pad(struct wacom_wac *wacom) 
	for (i = 0; i < nkeys; i++)

		input_report_key(input, KEY_PROG1 + i, keys & (1 << i));



	input_report_key(input, KEY_BUTTONCONFIG, wrench);

	input_report_key(input, KEY_ONSCREEN_KEYBOARD, keyboard);

	input_report_key(input, KEY_CONTROLPANEL, menu);

	input_report_key(input, KEY_INFO, info);



	if (wacom->shared && wacom->shared->touch_input) {

		input_report_switch(wacom->shared->touch_input,

				    SW_MUTE_DEVICE,

				    !wacom->shared->is_touch_on);

		input_sync(wacom->shared->touch_input);

	}



	input_report_abs(input, ABS_RX, strip1);

	input_report_abs(input, ABS_RY, strip2);
@@ -1483,6 +1522,12 @@ static int wacom_24hdt_irq(struct wacom_wac *wacom) 
	int byte_per_packet = WACOM_BYTES_PER_24HDT_PACKET;

	int y_offset = 2;



	if (wacom->shared->has_mute_touch_switch &&

	    !wacom->shared->is_touch_on) {

		if (!wacom->shared->touch_down)

			return 0;

	}



	if (wacom->features.type == WACOM_27QHDT) {

		current_num_contacts = data[63];

		num_contacts_left = 10;
@@ -2051,14 +2096,14 @@ static void wacom_wac_pad_event(struct hid_device *hdev, struct hid_field *field 
		    (hdev->product == 0x34d || hdev->product == 0x34e ||  /* MobileStudio Pro */

		     hdev->product == 0x357 || hdev->product == 0x358 ||  /* Intuos Pro 2 */

		     hdev->product == 0x392 ||				  /* Intuos Pro 2 */

		     hdev->product == 0x399)) {				  /* MobileStudio Pro */

		     hdev->product == 0x398 || hdev->product == 0x399)) { /* MobileStudio Pro */

			value = (field->logical_maximum - value);



			if (hdev->product == 0x357 || hdev->product == 0x358 ||

			    hdev->product == 0x392)

				value = wacom_offset_rotation(input, usage, value, 3, 16);

			else if (hdev->product == 0x34d || hdev->product == 0x34e ||

				 hdev->product == 0x399)

				 hdev->product == 0x398 || hdev->product == 0x399)

				value = wacom_offset_rotation(input, usage, value, 1, 2);

		}

		else {
@@ -3815,6 +3860,14 @@ int wacom_setup_touch_input_capabilities(struct input_dev *input_dev, 
		/* fall through */



	case WACOM_27QHDT:

		if (wacom_wac->shared->touch->product == 0x32C ||

		    wacom_wac->shared->touch->product == 0xF6) {

			input_dev->evbit[0] |= BIT_MASK(EV_SW);

			__set_bit(SW_MUTE_DEVICE, input_dev->swbit);

			wacom_wac->shared->has_mute_touch_switch = true;

		}

		/* fall through */



	case MTSCREEN:

	case MTTPC:

	case MTTPC_B:
@@ -4050,6 +4103,12 @@ int wacom_setup_pad_input_capabilities(struct input_dev *input_dev, 
		__set_bit(KEY_PROG2, input_dev->keybit);

		__set_bit(KEY_PROG3, input_dev->keybit);



		__set_bit(KEY_ONSCREEN_KEYBOARD, input_dev->keybit);

		__set_bit(KEY_INFO, input_dev->keybit);



		if (!features->oPid)

			__set_bit(KEY_BUTTONCONFIG, input_dev->keybit);



		input_set_abs_params(input_dev, ABS_WHEEL, 0, 71, 0, 0);

		input_set_abs_params(input_dev, ABS_THROTTLE, 0, 71, 0, 0);

		break;
@@ -4058,6 +4117,12 @@ int wacom_setup_pad_input_capabilities(struct input_dev *input_dev, 
		__set_bit(KEY_PROG1, input_dev->keybit);

		__set_bit(KEY_PROG2, input_dev->keybit);

		__set_bit(KEY_PROG3, input_dev->keybit);



		__set_bit(KEY_ONSCREEN_KEYBOARD, input_dev->keybit);

		__set_bit(KEY_BUTTONCONFIG, input_dev->keybit);



		if (!features->oPid)

			__set_bit(KEY_CONTROLPANEL, input_dev->keybit);

		input_set_abs_params(input_dev, ABS_X, -2048, 2048, 0, 0);

		input_abs_set_res(input_dev, ABS_X, 1024); /* points/g */

		input_set_abs_params(input_dev, ABS_Y, -2048, 2048, 0, 0);
@@ -4071,6 +4136,9 @@ int wacom_setup_pad_input_capabilities(struct input_dev *input_dev, 
		__set_bit(KEY_PROG1, input_dev->keybit);

		__set_bit(KEY_PROG2, input_dev->keybit);

		__set_bit(KEY_PROG3, input_dev->keybit);



		__set_bit(KEY_BUTTONCONFIG, input_dev->keybit);

		__set_bit(KEY_INFO, input_dev->keybit);

		/* fall through */



	case WACOM_21UX2: