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

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

Input: wacom - add support for 0x300 and 0x301 



Tested-by: default avatarArjuna Rao Chavala <arjunaraoc@gmail.com>
Signed-off-by: default avatarPing Cheng <pingc@wacom.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 88ce3c3c

drivers/input/tablet/wacom_wac.c

+9 −1
Original line number Diff line number Diff line
@@ -2112,7 +2112,7 @@ static const struct wacom_features wacom_features_0xDA = 
	{ "Wacom Bamboo 2FG 4x5 SE", WACOM_PKGLEN_BBFUN,  14720,  9200, 1023,

	  31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,

	  .touch_max = 2 };

static struct wacom_features wacom_features_0xDB =

static const struct wacom_features wacom_features_0xDB =

	{ "Wacom Bamboo 2FG 6x8 SE", WACOM_PKGLEN_BBFUN,  21648, 13700, 1023,

	  31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,

	  .touch_max = 2 };
@@ -2127,6 +2127,12 @@ static const struct wacom_features wacom_features_0xDF = 
        { "Wacom Bamboo 16FG 6x8", WACOM_PKGLEN_BBPEN,    21648, 13700, 1023,

	  31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,

	  .touch_max = 16 };

static const struct wacom_features wacom_features_0x300 =

	{ "Wacom Bamboo One S",    WACOM_PKGLEN_BBPEN,    14720,  9225, 1023,

	  31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };

static const struct wacom_features wacom_features_0x301 =

	{ "Wacom Bamboo One M",    WACOM_PKGLEN_BBPEN,    21648, 13530, 1023,

	  31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };

static const struct wacom_features wacom_features_0x6004 =

	{ "ISD-V4",               WACOM_PKGLEN_GRAPHIRE,  12800,  8000,  255,

	  0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
@@ -2253,6 +2259,8 @@ const struct usb_device_id wacom_ids[] = { 
	{ USB_DEVICE_WACOM(0x100) },

	{ USB_DEVICE_WACOM(0x101) },

	{ USB_DEVICE_WACOM(0x10D) },

	{ USB_DEVICE_WACOM(0x300) },

	{ USB_DEVICE_WACOM(0x301) },

	{ USB_DEVICE_WACOM(0x304) },

	{ USB_DEVICE_WACOM(0x4001) },

	{ USB_DEVICE_WACOM(0x47) },