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

Commit 11d0cf88 authored by Ping Cheng's avatar Ping Cheng Committed by Dmitry Torokhov
Browse files

Input: wacom - add 3 new models - 6A, 6B, and 97 



Tested-by: Alex Tervoort <alex.tervoort@gmail.com> for 6A
Signed-off-by: default avatarDavid Foley <favux.is@gmail.com>
Signed-off-by: default avatarPing Cheng <pingc@wacom.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent a001a8f3

drivers/input/tablet/wacom_wac.c

+12 −0
Original line number Diff line number Diff line
@@ -1299,6 +1299,12 @@ static const struct wacom_features wacom_features_0x65 = 
static const struct wacom_features wacom_features_0x69 =

	{ "Wacom Bamboo1",        WACOM_PKGLEN_GRAPHIRE,   5104,  3712,  511,

	  63, GRAPHIRE, WACOM_PENPRTN_RES, WACOM_PENPRTN_RES };

static const struct wacom_features wacom_features_0x6A =

	{ "Wacom Bamboo1 4x6",    WACOM_PKGLEN_GRAPHIRE,  14760,  9225, 1023,

	  63, GRAPHIRE, WACOM_INTUOS_RES, WACOM_INTUOS_RES };

static const struct wacom_features wacom_features_0x6B =

	{ "Wacom Bamboo1 5x8",    WACOM_PKGLEN_GRAPHIRE,  21648, 13530, 1023,

	  63, GRAPHIRE, WACOM_INTUOS_RES, WACOM_INTUOS_RES };

static const struct wacom_features wacom_features_0x20 =

	{ "Wacom Intuos 4x5",     WACOM_PKGLEN_INTUOS,    12700, 10600, 1023,

	  31, INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
@@ -1431,6 +1437,9 @@ static const struct wacom_features wacom_features_0x90 = 
static const struct wacom_features wacom_features_0x93 =

	{ "Wacom ISDv4 93",       WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  255,

	  0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };

static const struct wacom_features wacom_features_0x97 =

	{ "Wacom ISDv4 97",       WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  511,

	  0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };

static const struct wacom_features wacom_features_0x9A =

	{ "Wacom ISDv4 9A",       WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  255,

	  0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
@@ -1515,6 +1524,8 @@ const struct usb_device_id wacom_ids[] = { 
	{ USB_DEVICE_WACOM(0x64) },

	{ USB_DEVICE_WACOM(0x65) },

	{ USB_DEVICE_WACOM(0x69) },

	{ USB_DEVICE_WACOM(0x6A) },

	{ USB_DEVICE_WACOM(0x6B) },

	{ USB_DEVICE_WACOM(0x20) },

	{ USB_DEVICE_WACOM(0x21) },

	{ USB_DEVICE_WACOM(0x22) },
@@ -1575,6 +1586,7 @@ const struct usb_device_id wacom_ids[] = { 
	{ USB_DEVICE_WACOM(0xCC) },

	{ USB_DEVICE_WACOM(0x90) },

	{ USB_DEVICE_WACOM(0x93) },

	{ USB_DEVICE_WACOM(0x97) },

	{ USB_DEVICE_WACOM(0x9A) },

	{ USB_DEVICE_WACOM(0x9F) },

	{ USB_DEVICE_WACOM(0xE2) },