[PATCH] HID: wacom: Add new Intuos BT (CTL-4100WL/CTL-6100WL) support Added the new PID's to wacom_wac.c to support the new models in the Intuos series

[PATCH] HID: wacom: Add new Intuos BT (CTL-4100WL/CTL-6100WL) support Added the new PID's to wacom_wac.c to support the new models in the Intuos series

[Joshua Dickens]

From: Joshua-Dickens <Joshua@Joshua-Dickens.com>

Signed-off-by: Joshua Dickens <joshua.dickens@wacom.com>
---
 drivers/hid/wacom_wac.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index fd51769d0994..33a6908995b1 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -4746,6 +4746,12 @@ static const struct wacom_features wacom_features_0x393 =
 	{ "Wacom Intuos Pro S", 31920, 19950, 8191, 63,
 	  INTUOSP2S_BT, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 7,
 	  .touch_max = 10 };
+static const struct wacom_features wacom_features_0x3c6 =
+	{ "Wacom Intuos BT S", 15200, 9500, 4095, 63,
+	  INTUOSHT3_BT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, 4 };
+static const struct wacom_features wacom_features_0x3c8 =
+	{ "Wacom Intuos BT M", 21600, 13500, 4095, 63,
+	  INTUOSHT3_BT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, 4 };
 
 static const struct wacom_features wacom_features_HID_ANY_ID =
 	{ "Wacom HID", .type = HID_GENERIC, .oVid = HID_ANY_ID, .oPid = HID_ANY_ID };
@@ -4919,6 +4925,8 @@ const struct hid_device_id wacom_ids[] = {
 	{ USB_DEVICE_WACOM(0x37A) },
 	{ USB_DEVICE_WACOM(0x37B) },
 	{ BT_DEVICE_WACOM(0x393) },
+	{ BT_DEVICE_WACOM(0x3c6) },
+	{ BT_DEVICE_WACOM(0x3c8) },
 	{ USB_DEVICE_WACOM(0x4001) },
 	{ USB_DEVICE_WACOM(0x4004) },
 	{ USB_DEVICE_WACOM(0x5000) },
-- 
2.31.1

Re: [PATCH] HID: wacom: Add new Intuos BT (CTL-4100WL/CTL-6100WL) support Added the new PID's to wacom_wac.c to support the new models in the Intuos series

[Jiri Kosina]

On Tue, 14 Sep 2021, Joshua Dickens wrote:

> From: Joshua-Dickens <Joshua@Joshua-Dickens.com>

Thanks for the patch. Seems like you did put too much into your subject 
line and too little into actual changelog :) I can fix that on my part 
when applying, but let me first CC our Wacom maintainers for Review/Ack.

> Signed-off-by: Joshua Dickens <joshua.dickens@wacom.com>
> ---
>  drivers/hid/wacom_wac.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
> index fd51769d0994..33a6908995b1 100644
> --- a/drivers/hid/wacom_wac.c
> +++ b/drivers/hid/wacom_wac.c
> @@ -4746,6 +4746,12 @@ static const struct wacom_features wacom_features_0x393 =
>  	{ "Wacom Intuos Pro S", 31920, 19950, 8191, 63,
>  	  INTUOSP2S_BT, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 7,
>  	  .touch_max = 10 };
> +static const struct wacom_features wacom_features_0x3c6 =
> +	{ "Wacom Intuos BT S", 15200, 9500, 4095, 63,
> +	  INTUOSHT3_BT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, 4 };
> +static const struct wacom_features wacom_features_0x3c8 =
> +	{ "Wacom Intuos BT M", 21600, 13500, 4095, 63,
> +	  INTUOSHT3_BT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, 4 };
>  
>  static const struct wacom_features wacom_features_HID_ANY_ID =
>  	{ "Wacom HID", .type = HID_GENERIC, .oVid = HID_ANY_ID, .oPid = HID_ANY_ID };
> @@ -4919,6 +4925,8 @@ const struct hid_device_id wacom_ids[] = {
>  	{ USB_DEVICE_WACOM(0x37A) },
>  	{ USB_DEVICE_WACOM(0x37B) },
>  	{ BT_DEVICE_WACOM(0x393) },
> +	{ BT_DEVICE_WACOM(0x3c6) },
> +	{ BT_DEVICE_WACOM(0x3c8) },
>  	{ USB_DEVICE_WACOM(0x4001) },
>  	{ USB_DEVICE_WACOM(0x4004) },
>  	{ USB_DEVICE_WACOM(0x5000) },
> -- 
> 2.31.1
> 

-- 
Jiri Kosina
SUSE Labs

RE: [PATCH] HID: wacom: Add new Intuos BT (CTL-4100WL/CTL-6100WL) support Added the new PID's to wacom_wac.c to support the new models in the Intuos series

[Cheng, Ping]

Hi Jiri,

Thank you for your comments and for fixing the Subject line. I am sure Josh will learn from your fix ;). With that said, the patch is:

Reviewed-by: Ping Cheng <ping.cheng@wacom.com>

Cheers,
Ping

-----Original Message-----
From: Jiri Kosina [mailto:jikos@kernel.org] 
Sent: Wednesday, September 15, 2021 7:53 AM
To: Joshua Dickens <joshua@joshua-dickens.com>
Cc: linux-input@vger.kernel.org; Cheng, Ping <Ping.Cheng@wacom.com>; Dickens, Joshua <joshua.dickens@wacom.com>; Gerecke, Jason <Jason.Gerecke@wacom.com>; Cheng, Ping <Ping.Cheng@wacom.com>
Subject: Re: [PATCH] HID: wacom: Add new Intuos BT (CTL-4100WL/CTL-6100WL) support Added the new PID's to wacom_wac.c to support the new models in the Intuos series

[EXTERNAL]

On Tue, 14 Sep 2021, Joshua Dickens wrote:

> From: Joshua-Dickens <mailto:Joshua@Joshua-Dickens.com>

Thanks for the patch. Seems like you did put too much into your subject line and too little into actual changelog :) I can fix that on my part when applying, but let me first CC our Wacom maintainers for Review/Ack.

> Signed-off-by: Joshua Dickens <mailto:joshua.dickens@wacom.com>
> ---
>  drivers/hid/wacom_wac.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
>
> diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 
> fd51769d0994..33a6908995b1 100644
> --- a/drivers/hid/wacom_wac.c
> +++ b/drivers/hid/wacom_wac.c
> @@ -4746,6 +4746,12 @@ static const struct wacom_features wacom_features_0x393 =
>       { "Wacom Intuos Pro S", 31920, 19950, 8191, 63,
>         INTUOSP2S_BT, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 7,
>         .touch_max = 10 };
> +static const struct wacom_features wacom_features_0x3c6 =
> +     { "Wacom Intuos BT S", 15200, 9500, 4095, 63,
> +       INTUOSHT3_BT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, 4 }; static 
> +const struct wacom_features wacom_features_0x3c8 =
> +     { "Wacom Intuos BT M", 21600, 13500, 4095, 63,
> +       INTUOSHT3_BT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, 4 };
>
>  static const struct wacom_features wacom_features_HID_ANY_ID =
>       { "Wacom HID", .type = HID_GENERIC, .oVid = HID_ANY_ID, .oPid = 
> HID_ANY_ID }; @@ -4919,6 +4925,8 @@ const struct hid_device_id wacom_ids[] = {
>       { USB_DEVICE_WACOM(0x37A) },
>       { USB_DEVICE_WACOM(0x37B) },
>       { BT_DEVICE_WACOM(0x393) },
> +     { BT_DEVICE_WACOM(0x3c6) },
> +     { BT_DEVICE_WACOM(0x3c8) },
>       { USB_DEVICE_WACOM(0x4001) },
>       { USB_DEVICE_WACOM(0x4004) },
>       { USB_DEVICE_WACOM(0x5000) },
> --
> 2.31.1
>

--
Jiri Kosina
SUSE Labs

RE: [PATCH] HID: wacom: Add new Intuos BT (CTL-4100WL/CTL-6100WL) support Added the new PID's to wacom_wac.c to support the new models in the Intuos series

[Jiri Kosina]

On Wed, 15 Sep 2021, Cheng, Ping wrote:

> Hi Jiri,
> 
> Thank you for your comments and for fixing the Subject line. I am sure 
> Josh will learn from your fix ;). With that said, the patch is:
> 
> Reviewed-by: Ping Cheng <ping.cheng@wacom.com>

Thanks to both of you. Now applied.

-- 
Jiri Kosina
SUSE Labs