Commit 8ce655e7 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:
  Input: wacom - add Cintiq 21UX2 and Intuos4 WL
  Input: ads7846 - fix compiler warning in ads7846_probe()
  Input: tps6507x-ts - a couple work queue cleanups
  Input: s3c2410_ts - tone down logging
  Input: s3c2410_ts - fix build error due to ADC Kconfig rename
parents 999fd1ab 3a4b4aaa

drivers/input/tablet/wacom_sys.c

+0 −1
Original line number Diff line number Diff line
@@ -507,7 +507,6 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i 
			goto fail3;

	}



	input_dev->name = wacom_wac->name;

	input_dev->name = wacom_wac->name;

	input_dev->dev.parent = &intf->dev;

	input_dev->open = wacom_open;

drivers/input/tablet/wacom_wac.c

+59 −14
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom) 
		case 0x823: /* Intuos3 Grip Pen */

		case 0x813: /* Intuos3 Classic Pen */

		case 0x885: /* Intuos3 Marker Pen */

		case 0x802: /* Intuos4 Grip Pen Eraser */

		case 0x802: /* Intuos4 General Pen */

		case 0x804: /* Intuos4 Marker Pen */

		case 0x40802: /* Intuos4 Classic Pen */

		case 0x022:
@@ -335,7 +335,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom) 
		case 0x81b: /* Intuos3 Classic Pen Eraser */

		case 0x91b: /* Intuos3 Airbrush Eraser */

		case 0x80c: /* Intuos4 Marker Pen Eraser */

		case 0x80a: /* Intuos4 Grip Pen Eraser */

		case 0x80a: /* Intuos4 General Pen Eraser */

		case 0x4080a: /* Intuos4 Classic Pen Eraser */

		case 0x90a: /* Intuos4 Airbrush Eraser */

			wacom->tool[idx] = BTN_TOOL_RUBBER;
@@ -356,6 +356,11 @@ static int wacom_intuos_inout(struct wacom_wac *wacom) 
		return 1;

	}



	/* older I4 styli don't work with new Cintiqs */

	if (!((wacom->id[idx] >> 20) & 0x01) &&

			(features->type == WACOM_21UX2))

		return 1;



	/* Exit report */

	if ((data[1] & 0xfe) == 0x80) {

		/*
@@ -473,6 +478,26 @@ static int wacom_intuos_irq(struct wacom_wac *wacom) 
				input_report_key(input, wacom->tool[1], 0);

				input_report_abs(input, ABS_MISC, 0);

			}

		} else {

			if (features->type == WACOM_21UX2) {

				input_report_key(input, BTN_0, (data[5] & 0x01));

				input_report_key(input, BTN_1, (data[6] & 0x01));

				input_report_key(input, BTN_2, (data[6] & 0x02));

				input_report_key(input, BTN_3, (data[6] & 0x04));

				input_report_key(input, BTN_4, (data[6] & 0x08));

				input_report_key(input, BTN_5, (data[6] & 0x10));

				input_report_key(input, BTN_6, (data[6] & 0x20));

				input_report_key(input, BTN_7, (data[6] & 0x40));

				input_report_key(input, BTN_8, (data[6] & 0x80));

				input_report_key(input, BTN_9, (data[7] & 0x01));

				input_report_key(input, BTN_A, (data[8] & 0x01));

				input_report_key(input, BTN_B, (data[8] & 0x02));

				input_report_key(input, BTN_C, (data[8] & 0x04));

				input_report_key(input, BTN_X, (data[8] & 0x08));

				input_report_key(input, BTN_Y, (data[8] & 0x10));

				input_report_key(input, BTN_Z, (data[8] & 0x20));

				input_report_key(input, BTN_BASE, (data[8] & 0x40));

				input_report_key(input, BTN_BASE2, (data[8] & 0x80));

			} else {

				input_report_key(input, BTN_0, (data[5] & 0x01));

				input_report_key(input, BTN_1, (data[5] & 0x02));
@@ -484,11 +509,13 @@ static int wacom_intuos_irq(struct wacom_wac *wacom) 
				input_report_key(input, BTN_7, (data[6] & 0x08));

				input_report_key(input, BTN_8, (data[5] & 0x10));

				input_report_key(input, BTN_9, (data[6] & 0x10));

			}

			input_report_abs(input, ABS_RX, ((data[1] & 0x1f) << 8) | data[2]);

			input_report_abs(input, ABS_RY, ((data[3] & 0x1f) << 8) | data[4]);



			if ((data[5] & 0x1f) | (data[6] & 0x1f) | (data[1] & 0x1f) |

				data[2] | (data[3] & 0x1f) | data[4]) {

				data[2] | (data[3] & 0x1f) | data[4] | data[8] |

				(data[7] & 0x01)) {

				input_report_key(input, wacom->tool[1], 1);

				input_report_abs(input, ABS_MISC, PAD_DEVICE_ID);

			} else {
@@ -640,7 +667,7 @@ static void wacom_tpc_finger_in(struct wacom_wac *wacom, char *data, int idx) 
	if (!idx)

		input_report_key(input, BTN_TOUCH, 1);

	input_event(input, EV_MSC, MSC_SERIAL, finger);

	input_sync(wacom->input);

	input_sync(input);



	wacom->last_finger = finger;

}
@@ -826,6 +853,7 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len) 
	case INTUOS4L:

	case CINTIQ:

	case WACOM_BEE:

	case WACOM_21UX2:

		sync = wacom_intuos_irq(wacom_wac);

		break;
@@ -921,6 +949,17 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev, 
		__set_bit(BTN_STYLUS2, input_dev->keybit);

		break;



	case WACOM_21UX2:

		__set_bit(BTN_A, input_dev->keybit);

		__set_bit(BTN_B, input_dev->keybit);

		__set_bit(BTN_C, input_dev->keybit);

		__set_bit(BTN_X, input_dev->keybit);

		__set_bit(BTN_Y, input_dev->keybit);

		__set_bit(BTN_Z, input_dev->keybit);

		__set_bit(BTN_BASE, input_dev->keybit);

		__set_bit(BTN_BASE2, input_dev->keybit);

		/* fall through */



	case WACOM_BEE:

		__set_bit(BTN_8, input_dev->keybit);

		__set_bit(BTN_9, input_dev->keybit);
@@ -1105,6 +1144,8 @@ static const struct wacom_features wacom_features_0xBA = 
	{ "Wacom Intuos4 8x13",   WACOM_PKGLEN_INTUOS,    65024, 40640, 2047, 63, INTUOS4L };

static const struct wacom_features wacom_features_0xBB =

	{ "Wacom Intuos4 12x19",  WACOM_PKGLEN_INTUOS,    97536, 60960, 2047, 63, INTUOS4L };

static const struct wacom_features wacom_features_0xBC =

	{ "Wacom Intuos4 WL",     WACOM_PKGLEN_INTUOS,    40840, 25400, 2047, 63, INTUOS4 };

static const struct wacom_features wacom_features_0x3F =

	{ "Wacom Cintiq 21UX",    WACOM_PKGLEN_INTUOS,    87200, 65600, 1023, 63, CINTIQ };

static const struct wacom_features wacom_features_0xC5 =
@@ -1113,6 +1154,8 @@ static const struct wacom_features wacom_features_0xC6 = 
	{ "Wacom Cintiq 12WX",    WACOM_PKGLEN_INTUOS,    53020, 33440, 1023, 63, WACOM_BEE };

static const struct wacom_features wacom_features_0xC7 =

	{ "Wacom DTU1931",        WACOM_PKGLEN_GRAPHIRE,  37832, 30305,  511,  0, PL };

static const struct wacom_features wacom_features_0xCC =

	{ "Wacom Cintiq 21UX2",   WACOM_PKGLEN_INTUOS,    87200, 65600, 2047, 63, WACOM_21UX2 };

static const struct wacom_features wacom_features_0x90 =

	{ "Wacom ISDv4 90",       WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  255,  0, TABLETPC };

static const struct wacom_features wacom_features_0x93 =
@@ -1185,10 +1228,12 @@ const struct usb_device_id wacom_ids[] = { 
	{ USB_DEVICE_WACOM(0xB9) },

	{ USB_DEVICE_WACOM(0xBA) },

	{ USB_DEVICE_WACOM(0xBB) },

	{ USB_DEVICE_WACOM(0xBC) },

	{ USB_DEVICE_WACOM(0x3F) },

	{ USB_DEVICE_WACOM(0xC5) },

	{ USB_DEVICE_WACOM(0xC6) },

	{ USB_DEVICE_WACOM(0xC7) },

	{ USB_DEVICE_WACOM(0xCC) },

	{ USB_DEVICE_WACOM(0x90) },

	{ USB_DEVICE_WACOM(0x93) },

	{ USB_DEVICE_WACOM(0x9A) },

drivers/input/tablet/wacom_wac.h

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ enum { 
	INTUOS4S,

	INTUOS4,

	INTUOS4L,

	WACOM_21UX2,

	CINTIQ,

	WACOM_BEE,

	WACOM_MO,

drivers/input/touchscreen/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ config TOUCHSCREEN_FUJITSU 
config TOUCHSCREEN_S3C2410

	tristate "Samsung S3C2410/generic touchscreen input driver"

	depends on ARCH_S3C2410 || SAMSUNG_DEV_TS

	select S3C24XX_ADC

	select S3C_ADC

	help

	  Say Y here if you have the s3c2410 touchscreen.

drivers/input/touchscreen/ads7846.c

+1 −1
Original line number Diff line number Diff line
@@ -1164,7 +1164,7 @@ static int __devinit ads7846_probe(struct spi_device *spi) 
	ts->reg = regulator_get(&spi->dev, "vcc");

	if (IS_ERR(ts->reg)) {

		err = PTR_ERR(ts->reg);

		dev_err(&spi->dev, "unable to get regulator: %ld\n", err);

		dev_err(&spi->dev, "unable to get regulator: %d\n", err);

		goto err_free_gpio;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE