Message ID | 20190305183900.11158-1-jason.gerecke@wacom.com (mailing list archive) |
---|---|
State | Mainlined |
Commit | 44fc95e218a09d7966a9d448941fdb003f6bb69f |
Headers | show |
Series | Input: wacom_serial4 - Support for Wacom ArtPad II tablet | expand |
On Tue, Mar 05, 2019 at 10:39:00AM -0800, Gerecke, Jason wrote: > From: Jason Gerecke <jason.gerecke@wacom.com> > > Tablet initially begins communicating at 9600 baud, so this command > should be used to connect to the device: > > $ inputattach --daemon --baud 9600 --wacom_iv /dev/ttyS0 > > https://github.com/linuxwacom/xf86-input-wacom/issues/40 > > Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com> Applied, thank you. > --- > drivers/input/tablet/wacom_serial4.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/input/tablet/wacom_serial4.c b/drivers/input/tablet/wacom_serial4.c > index 38bfaca48eab..150f9eecaca7 100644 > --- a/drivers/input/tablet/wacom_serial4.c > +++ b/drivers/input/tablet/wacom_serial4.c > @@ -187,6 +187,7 @@ enum { > MODEL_DIGITIZER_II = 0x5544, /* UD */ > MODEL_GRAPHIRE = 0x4554, /* ET */ > MODEL_PENPARTNER = 0x4354, /* CT */ > + MODEL_ARTPAD_II = 0x4B54, /* KT */ > }; > > static void wacom_handle_model_response(struct wacom *wacom) > @@ -245,6 +246,7 @@ static void wacom_handle_model_response(struct wacom *wacom) > wacom->flags = F_HAS_STYLUS2 | F_HAS_SCROLLWHEEL; > break; > > + case MODEL_ARTPAD_II: > case MODEL_DIGITIZER_II: > wacom->dev->name = "Wacom Digitizer II"; > wacom->dev->id.version = MODEL_DIGITIZER_II; > -- > 2.20.1 >
diff --git a/drivers/input/tablet/wacom_serial4.c b/drivers/input/tablet/wacom_serial4.c index 38bfaca48eab..150f9eecaca7 100644 --- a/drivers/input/tablet/wacom_serial4.c +++ b/drivers/input/tablet/wacom_serial4.c @@ -187,6 +187,7 @@ enum { MODEL_DIGITIZER_II = 0x5544, /* UD */ MODEL_GRAPHIRE = 0x4554, /* ET */ MODEL_PENPARTNER = 0x4354, /* CT */ + MODEL_ARTPAD_II = 0x4B54, /* KT */ }; static void wacom_handle_model_response(struct wacom *wacom) @@ -245,6 +246,7 @@ static void wacom_handle_model_response(struct wacom *wacom) wacom->flags = F_HAS_STYLUS2 | F_HAS_SCROLLWHEEL; break; + case MODEL_ARTPAD_II: case MODEL_DIGITIZER_II: wacom->dev->name = "Wacom Digitizer II"; wacom->dev->id.version = MODEL_DIGITIZER_II;